[packages/evolution] - added destdir patch (removes redundant, not DESTDIR aware icons install, which trigger cmake bug l

qboosh qboosh at pld-linux.org
Wed Apr 26 05:35:57 CEST 2017


commit 41112b859b9a58692f2f2c3277755ac803cb8c8a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Apr 26 05:36:14 2017 +0200

    - added destdir patch (removes redundant, not DESTDIR aware icons install, which trigger cmake bug leading to kill(-1, SIGKILL))

 evolution-destdir.patch | 21 +++++++++++++++++++++
 evolution.spec          |  7 +++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
---
diff --git a/evolution.spec b/evolution.spec
index b27f29f..541478a 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -24,6 +24,7 @@ Source5:	%{name}-mail.desktop
 Source6:	%{name}-tasks.desktop
 Patch0:		%{name}-gtkdoc.patch
 Patch1:		%{name}-highlight.patch
+Patch2:		%{name}-destdir.patch
 URL:		http://wiki.gnome.org/Apps/Evolution/
 BuildRequires:	atk-devel
 BuildRequires:	bison
@@ -280,6 +281,7 @@ Dokumentacja API Evolution.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 export BOGOFILTER="/usr/bin/bogofilter"
@@ -292,11 +294,12 @@ export SPAMD="/usr/bin/spamd"
 	-DLIBEXEC_INSTALL_DIR=%{_libdir} \
 	%{!?with_autoar:-DENABLE_AUTOAR=OFF} \
 	%{?with_contact_maps:-DENABLE_CONTACT_MAPS=ON} \
+	-DENABLE_GTK_DOC=ON \
+	-DENABLE_SCHEMAS_COMPILE=OFF \
+	-DGTK_UPDATE_ICON_CACHE=/bin/true \
 	-DWITH_OPENLDAP=%{?with_ldap:ON}%{!?with_ldap:OFF} \
 	-DWITH_STATIC_LDAP=OFF \
 	-DWITH_GLADE_CATALOG=%{?with_glade:ON} \
-	-DENABLE_GTK_DOC=ON \
-	-DENABLE_SCHEMAS_COMPILE=OFF \
 	-DVERSION_SUBSTRING=" PLD Linux"
 
 %{__make}
diff --git a/evolution-destdir.patch b/evolution-destdir.patch
new file mode 100644
index 0000000..c0688d7
--- /dev/null
+++ b/evolution-destdir.patch
@@ -0,0 +1,21 @@
+--- evolution-3.24.1/cmake/modules/IconCache.cmake.orig	2017-04-10 10:02:00.000000000 +0200
++++ evolution-3.24.1/cmake/modules/IconCache.cmake	2017-04-25 22:21:16.309917778 +0200
+@@ -45,9 +45,6 @@
+ 			DESTINATION ${_destdir}/icons/${theme}/${size}/${context}
+ 			RENAME ${iconfile}
+ 		)
+-		set(${_install_codevar} "${${_install_codevar}}
+-			COMMAND ${CMAKE_COMMAND} -E copy_if_different \"${CMAKE_CURRENT_SOURCE_DIR}/${srcfile}\" \"${_destdir}/icons/${theme}/${size}/${context}/${iconfile}\""
+-		)
+ 	endforeach(srcfile)
+ endmacro(process_icons)
+ 
+@@ -60,7 +57,7 @@
+ 
+ 	if(GTK_UPDATE_ICON_CACHE)
+ 		install(CODE
+-			"execute_process(${_install_code}
++			"execute_process(
+ 				COMMAND ${CMAKE_COMMAND} -E chdir . ${_update_icon_cache_cmd}
+ 			)")
+ 	endif(GTK_UPDATE_ICON_CACHE)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/evolution.git/commitdiff/41112b859b9a58692f2f2c3277755ac803cb8c8a



More information about the pld-cvs-commit mailing list