- added fix for compiling with gtk-2.24 (gtk_combo_box_get_active_text is

  deprecated now)

Changed files:
    evolution-data-server.spec -> 1.165
    gtk224.patch -> 1.1

diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 1f250ce8e32d9ba33e360aa6d5c296be64f0f750..9ff95c0ed06c83b06a53955abd5fe68721209792 100644 (file)
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -14,6 +14,7 @@ License:      LGPL v2+
 Group:         X11/Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/2.32/%{name}-%{version}.tar.bz2
 # Source0-md5: 230f9dee68855c8a0ca09f3c3fea8faf
+Patch0:                gtk224.patch
 URL:           http://www.gnome.org/projects/evolution/
 BuildRequires: GConf2-devel >= 2.26.0
 BuildRequires: ORBit2-devel >= 1:2.14.8
@@ -138,6 +139,7 @@ Dokumentacja API e-d-s.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # kill -L$withval/lib
 sed -i -e 's/DB_LIBS="-L[^ "]* /DB_LIBS="/;s/ICONV_LIBS="[^ "]*/ICONV_LIBS="/' configure.ac

diff --git a/gtk224.patch b/gtk224.patch
new file mode 100644 (file)
index 0000000..7fb24e7
--- /dev/null
+++ b/gtk224.patch
@@ -0,0 +1,10 @@
+--- evolution-data-server-2.32.1/configure.ac.orig     2011-02-12 18:08:44.904081656 +0100
++++ evolution-data-server-2.32.1/configure.ac  2011-02-12 18:08:53.630030040 +0100
+@@ -167,7 +167,6 @@ AS_COMPILER_FLAGS(WARNING_FLAGS,
+       "-DG_DISABLE_DEPRECATED
+       -DPANGO_DISABLE_DEPRECATED
+       -DGDK_PIXBUF_DISABLE_DEPRECATED
+-      -DGTK_DISABLE_DEPRECATED
+       -DG_DISABLE_SINGLE_INCLUDES
+       -DGTK_DISABLE_SINGLE_INCLUDES
+       -DGSEAL_ENABLE