[gimp] configure: depend on webkitgtk >= 1.6.1
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] configure: depend on webkitgtk >= 1.6.1
- Date: Thu, 1 Dec 2011 10:26:36 +0000 (UTC)
commit 79a4f71884e49f03ebd6c0e06b6e964fb597717b
Author: Michael Natterer <mitch gimp org>
Date: Thu Dec 1 11:24:18 2011 +0100
configure: depend on webkitgtk >= 1.6.1
because old versions use deprecated GLib stuff in their headers.
Don't #undef G_DISABLE_DEPRECATED in help-browser and web-page.
configure.ac | 2 +-
plug-ins/common/web-page.c | 1 -
plug-ins/help-browser/dialog.c | 1 -
3 files changed, 1 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f388cd0..05f2bee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ m4_define([cairo_pdf_required_version], [1.10.2])
m4_define([pangocairo_required_version], [1.29.4])
m4_define([fontconfig_required_version], [2.2.0])
m4_define([gtkdoc_required_version], [1.0])
-m4_define([webkit_required_version], [1.1.0])
+m4_define([webkit_required_version], [1.6.1])
m4_define([alsa_required_version], [1.0.0])
m4_define([rsvg_required_version], [2.14.0])
m4_define([wmf_required_version], [0.2.8])
diff --git a/plug-ins/common/web-page.c b/plug-ins/common/web-page.c
index 1c7a394..5fe4503 100644
--- a/plug-ins/common/web-page.c
+++ b/plug-ins/common/web-page.c
@@ -23,7 +23,6 @@
#include "config.h"
-#undef G_DISABLE_DEPRECATED /* for G_CONST_RETURN used by webkit */
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
diff --git a/plug-ins/help-browser/dialog.c b/plug-ins/help-browser/dialog.c
index d75f80f..cbefd83 100644
--- a/plug-ins/help-browser/dialog.c
+++ b/plug-ins/help-browser/dialog.c
@@ -27,7 +27,6 @@
#include <stdlib.h>
#include <string.h>
-#undef G_DISABLE_DEPRECATED /* for G_CONST_RETURN used by webkit */
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]