[gimp/metadata-browser] Revert "build: Strip out G/GDK/GTK_DISABLE_DEPRECATED"
- From: Roman Joost <romanofski src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/metadata-browser] Revert "build: Strip out G/GDK/GTK_DISABLE_DEPRECATED"
- Date: Fri, 2 Dec 2011 02:23:37 +0000 (UTC)
commit f0f1558b04ad3f64c0e49c86420bc32a7144cad3
Author: Michael Natterer <mitch gimp org>
Date: Mon Oct 17 18:54:34 2011 +0200
Revert "build: Strip out G/GDK/GTK_DISABLE_DEPRECATED"
We still depend on GTK+ 2.x which doesn't have the warnings, and
don't want deprecated API being used by accident.
This reverts commit f9e61620868ed4c3642a80081ec97ae5e1ac45d5.
configure.ac | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index bb2848a..4ecb31a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1943,6 +1943,26 @@ AC_SUBST(MIME_TYPES)
CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DBABL_DISABLE_DEPRECATED -DGSEAL_ENABLE"
+# Make sure not to disable deprecated APIs for unreleased versions.
+# We must build without problems with future releases of libraries
+# and disabling deprecated API risks breaking the build
+
+if test "x$have_glib_2_30" != "xyes"; then
+ CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
+fi
+
+if test "x$have_gtk_2_26" != "xyes"; then
+ CPPFLAGS="${CPPFLAGS} -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+fi
+
+if test "x$have_gdk_pixbuf_2_26" != "xyes"; then
+ CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED"
+fi
+
+if test "x$have_pango_1_32" != "xyes"; then
+ CPPFLAGS="${CPPFLAGS} -DPANGO_DISABLE_DEPRECATED"
+fi
+
############################
# Require multihead safe API
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]