dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Michael Natterer 2011-12-01 11:24:18 +01:00
parent 2afc3419e5
commit 79a4f71884
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -50,7 +50,7 @@ m4_define([cairo_pdf_required_version], [1.10.2])
m4_define([pangocairo_required_version], [1.29.4]) m4_define([pangocairo_required_version], [1.29.4])
m4_define([fontconfig_required_version], [2.2.0]) m4_define([fontconfig_required_version], [2.2.0])
m4_define([gtkdoc_required_version], [1.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([alsa_required_version], [1.0.0])
m4_define([rsvg_required_version], [2.14.0]) m4_define([rsvg_required_version], [2.14.0])
m4_define([wmf_required_version], [0.2.8]) m4_define([wmf_required_version], [0.2.8])

1
plug-ins/common/web-page.c
View File

@ -23,7 +23,6 @@
#include "config.h" #include "config.h"
#undef G_DISABLE_DEPRECATED /* for G_CONST_RETURN used by webkit */
#include <libgimp/gimp.h> #include <libgimp/gimp.h>
#include <libgimp/gimpui.h> #include <libgimp/gimpui.h>

1
plug-ins/help-browser/dialog.c
View File

@ -27,7 +27,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#undef G_DISABLE_DEPRECATED /* for G_CONST_RETURN used by webkit */
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>