[evolution] Add patch to enable GLib deprecated stuff (due to G_CONST_RETURN deprecation)

Milan Crha mcrha at fedoraproject.org
Tue Jun 14 09:29:36 UTC 2011


commit c0eaaa80b98d0b15fc9762aae236d7051f3acd3d
Author: Milan Crha <mcrha at redhat.com>
Date:   Tue Jun 14 11:29:15 2011 +0200

    Add patch to enable GLib deprecated stuff (due to G_CONST_RETURN deprecation)

 evolution-3.1.2-g_const_return.patch |   13 +++++++++++++
 evolution.spec                       |    3 +++
 2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/evolution-3.1.2-g_const_return.patch b/evolution-3.1.2-g_const_return.patch
new file mode 100644
index 0000000..02d30e8
--- /dev/null
+++ b/evolution-3.1.2-g_const_return.patch
@@ -0,0 +1,13 @@
+diff -up evolution-3.1.2/configure.ac.g_const_return evolution-3.1.2/configure.ac
+--- evolution-3.1.2/configure.ac.g_const_return	2011-06-14 11:25:54.846138278 +0200
++++ evolution-3.1.2/configure.ac	2011-06-14 11:26:20.818433258 +0200
+@@ -67,8 +67,7 @@ dnl ******************************
+ dnl Compiler Warning Flags
+ dnl ******************************
+ AS_COMPILER_FLAGS(WARNING_FLAGS,
+-	"-DG_DISABLE_DEPRECATED
+-	-DPANGO_DISABLE_DEPRECATED
++	"-DPANGO_DISABLE_DEPRECATED
+ 	-DGDK_PIXBUF_DISABLE_DEPRECATED
+ 	-DEDS_DISABLE_DEPRECATED
+ 	-DG_DISABLE_SINGLE_INCLUDES
diff --git a/evolution.spec b/evolution.spec
index 575b841..c26949b 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -48,6 +48,7 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
 Patch13: evolution-2.30.1-help-contents.patch
 
 Patch14: evolution-3.1.2-libgdata_0_9.patch
+Patch15: evolution-3.1.2-g_const_return.patch
 
 ## Dependencies ###
 
@@ -205,6 +206,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %patch10 -p1 -b .ldaphack
 %patch13 -p1 -b .help-contents
 %patch14 -p1 -b .libgdata_0_9
+%patch15 -p1 -b .g_const_return
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -630,6 +632,7 @@ rm -rf $RPM_BUILD_ROOT
 * Tue Jun 14 2011 Milan Crha <mcrha at redhat.com> - 3.1.2-1
 - Update to 3.1.2
 - Add patch by Philip Withnall to build against libgdata-0.9.0
+- Add patch to enable GLib deprecated stuff (due to G_CONST_RETURN deprecation)
 
 * Tue May 17 2011 Milan Crha <mcrha at redhat.com> - 3.1.1-3
 - Keep libevolution-mail-settings.so* from the previous change,


More information about the scm-commits mailing list