diff --git a/0001-Don-t-set-DG_DISABLE_DEPRECATED.patch b/0001-Don-t-set-DG_DISABLE_DEPRECATED.patch new file mode 100644 index 0000000..09587b0 --- /dev/null +++ b/0001-Don-t-set-DG_DISABLE_DEPRECATED.patch @@ -0,0 +1,43 @@ +From 2f2f8e2e8805f67555f012d7e5f0981a4b48b2bb Mon Sep 17 00:00:00 2001 +From: Christophe Fergeau +Date: Fri, 15 Feb 2013 09:39:56 +0100 +Subject: [PATCH] Don't set -DG_DISABLE_DEPRECATED + +This breaks compilation with newer glib as disabling deprecated +features removes them from the default headers rather than just +issueing a deprecation warning, and frogr is using GStaticRecMutex +which is deprecated. +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index e858665..0519fb1 100755 +--- a/configure ++++ b/configure +@@ -4745,7 +4745,7 @@ AM_BACKSLASH='\' + # Extra verbose warning switches + + CFLAGS="$CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES -DGSEAL_ENABLE" +-CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" ++CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" + + # (Platform independent) dependencies for frogr + +diff --git a/configure.ac b/configure.ac +index ab77f66..2e80d39 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -14,7 +14,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + # Extra verbose warning switches + + CFLAGS="$CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES -DGSEAL_ENABLE" +-CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" ++CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" + + # (Platform independent) dependencies for frogr + +-- +1.8.1.2 + diff --git a/frogr.spec b/frogr.spec index 1ed20d2..58c136b 100644 --- a/frogr.spec +++ b/frogr.spec @@ -2,12 +2,13 @@ Name: frogr Version: 0.8 Summary: Flickr Remote Organizer for GNOME Summary(de): Flickr-Verwaltung für GNOME -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Internet License: GPLv3 URL: http://live.gnome.org/Frogr Source0: http://download.gnome.org/sources/%{name}/0.8/%{name}-%{version}.tar.xz +Patch0: 0001-Don-t-set-DG_DISABLE_DEPRECATED.patch BuildRequires: gettext BuildRequires: gtk3-devel @@ -38,6 +39,7 @@ Setzen von Markierungen und Verwalten von Alben. %prep %setup -q +%patch0 -p1 %build %configure @@ -80,6 +82,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Fri Feb 15 2013 Christophe Fergeau 0.8-3 +- Don't set -DG_DISABLE_DEPRECATED as this breaks the build because of + GStaticRecMutex use + * Wed Feb 13 2013 Fedora Release Engineering - 0.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild