From e325b63858b4a6c361304b78ab62ecde3622fba0 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Jun 07 2010 14:14:06 +0000 Subject: Remove gtk+ version check lowering patch and add patch for a GSEAL_ENABLE removal --- diff --git a/evolution-data-server-2.31.3-lower-gtk-version.patch b/evolution-data-server-2.31.3-lower-gtk-version.patch deleted file mode 100644 index 7fb1fe4..0000000 --- a/evolution-data-server-2.31.3-lower-gtk-version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up evolution-data-server-2.31.3/libedataserverui/gtk-compat.h.lower-version evolution-data-server-2.31.3/libedataserverui/gtk-compat.h ---- evolution-data-server-2.31.3/libedataserverui/gtk-compat.h.lower-version 2010-06-07 15:28:43.000000000 +0200 -+++ evolution-data-server-2.31.3/libedataserverui/gtk-compat.h 2010-06-07 15:30:07.000000000 +0200 -@@ -8,7 +8,7 @@ - * That way it is still possible to build with GTK+ 2.20. - */ - --#if !GTK_CHECK_VERSION(2,21,2) -+#if !GTK_CHECK_VERSION(2,21,1) - - #define gdk_drag_context_get_actions(context) (context)->actions - #define gdk_drag_context_get_suggested_action(context) (context)->suggested_action diff --git a/evolution-data-server-2.31.3-no-gseal.patch b/evolution-data-server-2.31.3-no-gseal.patch new file mode 100644 index 0000000..4c24843 --- /dev/null +++ b/evolution-data-server-2.31.3-no-gseal.patch @@ -0,0 +1,11 @@ +diff -up evolution-data-server-2.31.3/configure.ac.no-gseal evolution-data-server-2.31.3/configure.ac +--- evolution-data-server-2.31.3/configure.ac.no-gseal 2010-06-07 16:09:39.000000000 +0200 ++++ evolution-data-server-2.31.3/configure.ac 2010-06-07 16:10:05.000000000 +0200 +@@ -139,7 +139,6 @@ AS_COMPILER_FLAGS(WARNING_FLAGS, + -DGTK_DISABLE_DEPRECATED + -DG_DISABLE_SINGLE_INCLUDES + -DGTK_DISABLE_SINGLE_INCLUDES +- -DGSEAL_ENABLE + -Wall -Wextra + -Wno-missing-field-initializers + -Wno-sign-compare diff --git a/evolution-data-server.spec b/evolution-data-server.spec index 35309a6..5cb0ebc 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -42,8 +42,8 @@ Obsoletes: evolution-webcal < 2.24.0 # RH bug #243296 Patch11: evolution-data-server-1.11.5-fix-64bit-acinclude.patch -# lower gtk+ version requirement for the Gdk sealed properties -Patch12: evolution-data-server-2.31.3-lower-gtk-version.patch +# no-gseal because of gdk functions for now +Patch12: evolution-data-server-2.31.3-no-gseal.patch ### Build Dependencies ### @@ -123,7 +123,7 @@ This package contains developer documentation for %{name}. %setup -q %patch11 -p1 -b .fix-64bit-acinclude -%patch12 -p1 -b .lower-gtk-version +%patch12 -p1 -b .no-gseal mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib