summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Vroon <chainsaw@gentoo.org>2010-06-14 00:46:16 +0000
committerTony Vroon <chainsaw@gentoo.org>2010-06-14 00:46:16 +0000
commit0e0bc6a7983b1badcfce5e4173c33505422f629e (patch)
treec9ce13a38a11f5d654cf1d2f7e49ff2268182ba3 /mail-client/evolution/files
parentTaking over maintainership. Adding Michael (xmw) Weber as proxy (diff)
downloadgentoo-2-0e0bc6a7983b1badcfce5e4173c33505422f629e.tar.gz
gentoo-2-0e0bc6a7983b1badcfce5e4173c33505422f629e.tar.bz2
gentoo-2-0e0bc6a7983b1badcfce5e4173c33505422f629e.zip
Explicitly knock DISABLE_DEPRECATED and DISABLE_SINGLE_INCLUDES out of the compiler flags as this will not work correctly with stable libunique. Herd ack by leio on IRC.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'mail-client/evolution/files')
-rw-r--r--mail-client/evolution/files/evolution-2.30.1.2-configure.patch23
1 files changed, 20 insertions, 3 deletions
diff --git a/mail-client/evolution/files/evolution-2.30.1.2-configure.patch b/mail-client/evolution/files/evolution-2.30.1.2-configure.patch
index 8532f3e3a04c..2d94072c62a0 100644
--- a/mail-client/evolution/files/evolution-2.30.1.2-configure.patch
+++ b/mail-client/evolution/files/evolution-2.30.1.2-configure.patch
@@ -1,5 +1,6 @@
---- configure.ac~ 2010-04-27 14:14:22.000000000 +0200
-+++ configure.ac 2010-06-12 22:24:39.000000000 +0200
+diff -uNr evolution-2.30.1.2.ORIG//configure.ac evolution-2.30.1.2/configure.ac
+--- evolution-2.30.1.2.ORIG//configure.ac 2010-06-14 01:06:50.342000001 +0100
++++ evolution-2.30.1.2/configure.ac 2010-06-14 01:07:42.948000001 +0100
@@ -47,7 +47,6 @@
m4_define([libxml_minimum_version], [2.7.3])
m4_define([shared_mime_info_minimum_version], [0.22])
@@ -8,7 +9,23 @@
m4_define([dbus_glib_minimum_version], [0.74])
dnl Optional Packages
-@@ -224,7 +223,7 @@
+@@ -64,14 +63,7 @@
+ dnl Compiler Warning Flags
+ dnl ******************************
+ AS_COMPILER_FLAGS(WARNING_FLAGS,
+- "-DG_DISABLE_DEPRECATED
+- -DPANGO_DISABLE_DEPRECATED
+- -DGDK_PIXBUF_DISABLE_DEPRECATED
+- -DGDK_DISABLE_DEPRECATED
+- -DGTK_DISABLE_DEPRECATED
+- -DG_DISABLE_SINGLE_INCLUDES
+- -DGTK_DISABLE_SINGLE_INCLUDES
+- -Wall -Wextra
++ "-Wall -Wextra
+ -Wno-missing-field-initializers
+ -Wno-sign-compare
+ -Wno-unused-parameter
+@@ -224,7 +216,7 @@
libxml-2.0 >= libxml_minimum_version
shared-mime-info >= shared_mime_info_minimum_version
gnome-desktop-2.0 >= gnome_desktop_minimum_version