From 1df70fe24aa936ac06223e7b06d830ca956164f3 Mon Sep 17 00:00:00 2001
From: Christophe Fergeau <cfergeau@redhat.com>
Date: Aug 05 2013 19:54:55 +0000
Subject: Don't disable deprecated gtk+ features


We already had a patch not to disable deprecated glib features,
but with newer gtk+, we also need to not disable deprecated gtk+
features as frogr is still using stock icons.

---

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..9dda731
--- /dev/null
+++ b/0001-Don-t-set-DG-_DISABLE_DEPRECATED.patch
@@ -0,0 +1,41 @@
+From 5fd6398ac95acdb630591fae78ead568b0c0cfe7 Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <cfergeau@redhat.com>
+Date: Fri, 15 Feb 2013 09:39:56 +0100
+Subject: [PATCH] Don't set -DG*_DISABLE_DEPRECATED
+
+This breaks compilation with newer glib/gtk+ versions as disabling
+deprecated features removes them from the default headers rather than just
+issueing a deprecation warning, and frogr is using GStaticRecMutex,
+stock icons, ... which are deprecated.
+---
+ configure    | 1 -
+ configure.ac | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/configure b/configure
+index e858665..93e086d 100755
+--- a/configure
++++ b/configure
+@@ -4745,7 +4745,6 @@ 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"
+ 
+ # (Platform independent) dependencies for frogr
+ 
+diff --git a/configure.ac b/configure.ac
+index ab77f66..2a1c9f5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,7 +14,6 @@ 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"
+ 
+ # (Platform independent) dependencies for frogr
+ 
+-- 
+1.8.3.1
+
diff --git a/0001-Don-t-set-DG_DISABLE_DEPRECATED.patch b/0001-Don-t-set-DG_DISABLE_DEPRECATED.patch
deleted file mode 100644
index 09587b0..0000000
--- a/0001-Don-t-set-DG_DISABLE_DEPRECATED.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 2f2f8e2e8805f67555f012d7e5f0981a4b48b2bb Mon Sep 17 00:00:00 2001
-From: Christophe Fergeau <cfergeau@redhat.com>
-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 49eef45..eb2fd9f 100644
--- a/frogr.spec
+++ b/frogr.spec
@@ -8,7 +8,7 @@ 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
+Patch0:         0001-Don-t-set-DG-_DISABLE_DEPRECATED.patch
 
 BuildRequires:  gettext
 BuildRequires:  gtk3-devel