diff --git a/seahorse-allow-deprecated.patch b/seahorse-allow-deprecated.patch new file mode 100644 index 0000000..d73acba --- /dev/null +++ b/seahorse-allow-deprecated.patch @@ -0,0 +1,41 @@ +Index: seahorse-3.12.2/libegg/Makefile.am +=================================================================== +--- seahorse-3.12.2.orig/libegg/Makefile.am ++++ seahorse-3.12.2/libegg/Makefile.am +@@ -2,16 +2,8 @@ noinst_LIBRARIES += \ + libeggdatetime.a \ + libeggtreemultidnd.a + +-libeggdatetime_a_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DG_DISABLE_DEPRECATED +- + libeggdatetime_a_CFLAGS = $(GTK_CFLAGS) + libeggdatetime_a_SOURCES = libegg/egg-datetime.h libegg/egg-datetime.c + +-libeggtreemultidnd_a_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DG_DISABLE_DEPRECATED +- + libeggtreemultidnd_a_CFLAGS = $(GTK_CFLAGS) + libeggtreemultidnd_a_SOURCES = libegg/eggtreemultidnd.c libegg/eggtreemultidnd.h +Index: seahorse-3.12.2/Makefile.in +=================================================================== +--- seahorse-3.12.2.orig/Makefile.in ++++ seahorse-3.12.2/Makefile.in +@@ -860,15 +860,8 @@ common_BUILT = \ + $(common_HEADER) \ + common/common.vapi + +-libeggdatetime_a_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DG_DISABLE_DEPRECATED +- + libeggdatetime_a_CFLAGS = $(GTK_CFLAGS) + libeggdatetime_a_SOURCES = libegg/egg-datetime.h libegg/egg-datetime.c +-libeggtreemultidnd_a_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED \ +- -DG_DISABLE_DEPRECATED + + libeggtreemultidnd_a_CFLAGS = $(GTK_CFLAGS) + libeggtreemultidnd_a_SOURCES = libegg/eggtreemultidnd.c libegg/eggtreemultidnd.h diff --git a/seahorse.changes b/seahorse.changes index 7c0671c..fb559c5 100644 --- a/seahorse.changes +++ b/seahorse.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Jul 15 00:02:29 UTC 2014 - dimstar@opensuse.org + +- Add seahorse-allow-deprecated.patch: Allow the usage of + deprecated GTK+ symbols. +- No longer pass --disable-scrollkeeper to configure: this hasn't + been supported since version 3.5.92 when the switched from + gnome-devel-docs to Mallard happened. + ------------------------------------------------------------------- Sat May 17 08:08:26 UTC 2014 - zaitor@opensuse.org diff --git a/seahorse.spec b/seahorse.spec index d5a56eb..34c99c7 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -24,6 +24,8 @@ License: GPL-2.0+ Group: Productivity/Security Url: http://projects.gnome.org/seahorse/ Source: http://download.gnome.org/sources/seahorse/3.12/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM seahorse-allow-deprecated.patch dimstar@opensuse.org -- Allow the usage of deprecated GTK+ symbols +Patch0: seahorse-allow-deprecated.patch BuildRequires: fdupes BuildRequires: gpg2 BuildRequires: gpgme-devel @@ -66,11 +68,11 @@ search results from seahorse. %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream %build -%configure \ - --disable-scrollkeeper +%configure make %{?_smp_mflags} V=1 %install