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