packages: evolution/evolution.spec, evolution/gtk224.patch (NEW) - added fi...

[sls]

Author: sls                          Date: Sat Feb 12 20:50:25 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added fix for compiling with gtk-2.24

---- Files affected:
packages/evolution:
   evolution.spec (1.282 -> 1.283) , gtk224.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/evolution/evolution.spec
diff -u packages/evolution/evolution.spec:1.282 packages/evolution/evolution.spec:1.283
--- packages/evolution/evolution.spec:1.282	Fri Feb  4 19:23:43 2011
+++ packages/evolution/evolution.spec	Sat Feb 12 21:50:19 2011
@@ -25,6 +25,7 @@
 Source6:	%{name}-tasks.desktop
 Patch0:		%{name}-nolibs.patch
 Patch1:		%{name}-gnome-icon-theme.patch
+Patch2:		gtk224.patch
 URL:		http://www.gnome.org/projects/evolution/
 BuildRequires:	GConf2-devel >= 2.28.0
 BuildRequires:	NetworkManager-devel >= 0.7
@@ -220,6 +221,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %{__sed} -i -e 's/^en at shaw//' po/LINGUAS
 %{__rm} -f po/en at shaw.po
@@ -758,6 +760,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.283  2011/02/12 20:50:19  sls
+- added fix for compiling with gtk-2.24
+
 Revision 1.282  2011/02/04 18:23:43  wiget
 - Requires(post,postun): gtk-update-icon-cache
 

================================================================
Index: packages/evolution/gtk224.patch
diff -u /dev/null packages/evolution/gtk224.patch:1.1
--- /dev/null	Sat Feb 12 21:50:25 2011
+++ packages/evolution/gtk224.patch	Sat Feb 12 21:50:19 2011
@@ -0,0 +1,10 @@
+--- evolution-2.32.1/configure.ac.orig	2011-02-12 21:11:18.862152639 +0100
++++ evolution-2.32.1/configure.ac	2011-02-12 21:11:47.448816546 +0100
+@@ -146,7 +146,6 @@ AS_COMPILER_FLAGS(WARNING_FLAGS,
+ 	"-DG_DISABLE_DEPRECATED
+ 	-DPANGO_DISABLE_DEPRECATED
+ 	-DGDK_PIXBUF_DISABLE_DEPRECATED
+-	-DGTK_DISABLE_DEPRECATED
+ 	-DEDS_DISABLE_DEPRECATED
+ 	-DG_DISABLE_SINGLE_INCLUDES
+ 	-DGTK_DISABLE_SINGLE_INCLUDES
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/evolution/evolution.spec?r1=1.282&r2=1.283&f=u