diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-05-21 10:20:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-05-21 10:20:03 +0100 |
commit | 6f8038813c460b4f0572d5ef595cdfa94af3a94d (patch) | |
tree | 3509e94070265053394b7f2e30a779d7e60c2064 /gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch | |
parent | eccb70a7f91b2d22582587f26d1a28bb31408b45 (diff) |
gentoo resync : 21.05.2019
Diffstat (limited to 'gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch')
-rw-r--r-- | gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch b/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch deleted file mode 100644 index c74df6bce523..000000000000 --- a/gnome-extra/evolution-ews/files/3.24.6-DESTDIR-honoring.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 01974dad6fb73344e2852715ccfe143b3d998cbf Mon Sep 17 00:00:00 2001 -From: Milan Crha <mcrha@redhat.com> -Date: Mon, 2 Oct 2017 19:24:57 +0200 -Subject: [PATCH] Bug 781645 - Skip GSettings schema compile when DESTDIR is - set - -(cherry picked from commit bdc3319e906479e665a9fb30fde084ecf735fa4f) ---- - cmake/modules/GLibTools.cmake | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake -index fc8eb82..f0be558 100644 ---- a/cmake/modules/GLibTools.cmake -+++ b/cmake/modules/GLibTools.cmake -@@ -238,9 +238,11 @@ macro(add_gsettings_schemas _target _schema0) - if(_install_code) - # Compile gsettings schemas and ensure that all of them are in the place. - install(CODE -- "execute_process(${_install_code} -- COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\" -- )") -+ "if(\"\$ENV{DESTDIR}\" STREQUAL \"\") -+ execute_process(${_install_code} -+ COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\" -+ ) -+ endif(\"\$ENV{DESTDIR}\" STREQUAL \"\")") - endif(_install_code) - endmacro(add_gsettings_schemas) - --- -2.15.1 - |