[gimp/gtk3-port-meson: 234/235] Post-merge commit of gtk3-port into gtk3-port-meson
- From: Félix Piédallu <fpiedallu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port-meson: 234/235] Post-merge commit of gtk3-port into gtk3-port-meson
- Date: Mon, 12 Feb 2018 16:17:13 +0000 (UTC)
commit 5a163b451439386d0eeae0bda11cb376d1377da4
Author: Félix Piédallu <felix piedallu me>
Date: Mon Feb 12 17:13:27 2018 +0100
Post-merge commit of gtk3-port into gtk3-port-meson
app/actions/meson.build | 2 +-
app/config/meson.build | 2 +-
app/dialogs/meson.build | 2 +-
app/display/meson.build | 2 +-
app/gui/meson.build | 2 +-
app/menus/meson.build | 2 +-
app/meson.build | 4 +-
app/propgui/meson.build | 2 +-
app/tests/meson.build | 2 +-
app/tools/meson.build | 2 +-
app/widgets/meson.build | 5 +-
devel-docs/app/meson.build | 2 +-
devel-docs/libgimp/meson.build | 2 +-
devel-docs/libgimpbase/meson.build | 2 +-
devel-docs/libgimpcolor/meson.build | 2 +-
devel-docs/libgimpconfig/meson.build | 2 +-
devel-docs/libgimpmath/meson.build | 2 +-
devel-docs/libgimpmodule/meson.build | 2 +-
devel-docs/libgimpthumb/meson.build | 2 +-
devel-docs/libgimpwidgets/meson.build | 2 +-
devel-docs/tools/meson.build | 2 +-
etc/meson.build | 2 +-
libgimp/meson.build | 4 +-
libgimpwidgets/meson.build | 12 +--
m4macros/Makefile.am | 2 +-
m4macros/gimp-3.0.m4 | 180 +++++++++++++++++++++++++++++++
meson.build | 82 ++++++++-------
modules/meson.build | 2 +-
plug-ins/common/meson.build | 182 ++++++++++++++++----------------
plug-ins/file-bmp/meson.build | 2 +-
plug-ins/file-exr/meson.build | 2 +-
plug-ins/file-faxg3/meson.build | 2 +-
plug-ins/file-fits/meson.build | 2 +-
plug-ins/file-fli/meson.build | 2 +-
plug-ins/file-ico/meson.build | 2 +-
plug-ins/file-jpeg/meson.build | 2 +-
plug-ins/file-psd/meson.build | 2 +-
plug-ins/file-raw/meson.build | 2 +-
plug-ins/file-sgi/meson.build | 2 +-
plug-ins/file-tiff/meson.build | 2 +-
plug-ins/file-webp/meson.build | 2 +-
plug-ins/flame/meson.build | 2 +-
plug-ins/fractal-explorer/meson.build | 2 +-
plug-ins/gfig/meson.build | 2 +-
plug-ins/gimpressionist/meson.build | 2 +-
plug-ins/gradient-flare/meson.build | 2 +-
plug-ins/help-browser/meson.build | 2 +-
plug-ins/help/meson.build | 2 +-
plug-ins/ifs-compose/meson.build | 2 +-
plug-ins/imagemap/meson.build | 2 +-
plug-ins/lighting/meson.build | 2 +-
plug-ins/map-object/meson.build | 2 +-
plug-ins/metadata/meson.build | 4 +-
plug-ins/pagecurl/meson.build | 2 +-
plug-ins/print/meson.build | 2 +-
plug-ins/pygimp/meson.build | 6 +-
plug-ins/screenshot/meson.build | 2 +-
plug-ins/script-fu/meson.build | 2 +-
plug-ins/selection-to-path/meson.build | 2 +-
plug-ins/twain/meson.build | 2 +-
tools/meson.build | 24 +----
61 files changed, 379 insertions(+), 226 deletions(-)
---
diff --git a/app/actions/meson.build b/app/actions/meson.build
index 0f81ce1..dd9fe04 100644
--- a/app/actions/meson.build
+++ b/app/actions/meson.build
@@ -102,6 +102,6 @@ libappactions = static_library('appactions',
'-DG_LOG_DOMAIN="Gimp-Actions"',
],
dependencies: [
- gegl, gdk_pixbuf, gtk2,
+ gegl, gdk_pixbuf, gtk3,
],
)
diff --git a/app/config/meson.build b/app/config/meson.build
index cd17f1a..8617e1f 100644
--- a/app/config/meson.build
+++ b/app/config/meson.build
@@ -34,7 +34,7 @@ libappconfig = static_library('appconfig',
mypaint_args,
],
dependencies: [
- cairo, gegl, gdk_pixbuf, gio, gio_specific, gtk2, libmypaint, mypaint_brushes,
+ cairo, gegl, gdk_pixbuf, gio, gio_specific, gtk3, libmypaint, mypaint_brushes,
],
)
diff --git a/app/dialogs/meson.build b/app/dialogs/meson.build
index 00e52f0..04a7bba 100644
--- a/app/dialogs/meson.build
+++ b/app/dialogs/meson.build
@@ -62,6 +62,6 @@ libappdialogs = static_library('appdialogs',
'-DG_LOG_DOMAIN="Gimp-Dialogs"',
],
dependencies: [
- gegl, gtk2,
+ gegl, gtk3,
],
)
diff --git a/app/display/meson.build b/app/display/meson.build
index bc8f763..32dcf4d 100644
--- a/app/display/meson.build
+++ b/app/display/meson.build
@@ -102,6 +102,6 @@ libappdisplay = static_library('appdisplay',
'-DG_LOG_DOMAIN="Gimp-Display"',
],
dependencies: [
- gegl, gtk2,
+ gegl, gtk3,
],
)
diff --git a/app/gui/meson.build b/app/gui/meson.build
index bab8c8b..4079365 100644
--- a/app/gui/meson.build
+++ b/app/gui/meson.build
@@ -31,7 +31,7 @@ libappgui = static_library('appgui',
'-DG_LOG_DOMAIN="Gimp-GUI"',
],
dependencies: [
- cairo, dbus_glib, gegl, gdk_pixbuf, gio_specific, gtk2
+ cairo, dbus_glib, gegl, gdk_pixbuf, gio_specific, gtk3
],
install: false,
)
diff --git a/app/menus/meson.build b/app/menus/meson.build
index bd5ee74..2b107ef 100644
--- a/app/menus/meson.build
+++ b/app/menus/meson.build
@@ -17,6 +17,6 @@ libappmenus = static_library('appmenus',
'-DG_LOG_DOMAIN="Gimp-Menus"',
],
dependencies: [
- gegl, gtk2
+ gegl, gtk3
],
)
diff --git a/app/meson.build b/app/meson.build
index dd78045..31097b7 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -62,7 +62,7 @@ libapp = static_library('app',
include_directories: [ rootInclude, rootAppInclude, configInclude, ],
c_args: app_cflags,
dependencies: [
- gegl, gdk_pixbuf, gtk2,
+ gegl, gdk_pixbuf, gtk3,
],
)
@@ -109,7 +109,7 @@ app_gui_links = [
]
app_deps = [
- gio, gtk2, pangocairo, pangoft2, gegl, lcms, gexiv2,
+ gio, gtk3, pangocairo, pangoft2, gegl, lcms, gexiv2,
]
# Executables
diff --git a/app/propgui/meson.build b/app/propgui/meson.build
index 1c64c73..4454f8e 100644
--- a/app/propgui/meson.build
+++ b/app/propgui/meson.build
@@ -22,6 +22,6 @@ libapppropgui = static_library('apppropgui',
'-DG_LOG_DOMAIN="Gimp-PropGUI"',
],
dependencies: [
- gegl, gtk2,
+ gegl, gtk3,
],
)
diff --git a/app/tests/meson.build b/app/tests/meson.build
index 6002304..ce2df82 100644
--- a/app/tests/meson.build
+++ b/app/tests/meson.build
@@ -3,7 +3,7 @@ apptests_includes = [
rootInclude, rootAppInclude
]
apptests_deps = [
- pangocairo, pangoft2, gtk2, dbus_glib, gegl,
+ pangocairo, pangoft2, gtk3, dbus_glib, gegl,
]
apptests_links = [
libapp,
diff --git a/app/tools/meson.build b/app/tools/meson.build
index 5e5110b..dba98be 100644
--- a/app/tools/meson.build
+++ b/app/tools/meson.build
@@ -120,6 +120,6 @@ libapptools = static_library('apptools',
'-DG_LOG_DOMAIN="Gimp-Tools"',
],
dependencies: [
- gegl, gtk2,
+ gegl, gtk3,
],
)
diff --git a/app/widgets/meson.build b/app/widgets/meson.build
index 1a910d6..4724c09 100644
--- a/app/widgets/meson.build
+++ b/app/widgets/meson.build
@@ -42,7 +42,6 @@ libappwidgets_sources = [
'gimpcontainercombobox.c',
'gimpcontainereditor.c',
'gimpcontainerentry.c',
- 'gimpcontainergridview.c',
'gimpcontainericonview.c',
'gimpcontainerpopup.c',
'gimpcontainertreestore.c',
@@ -220,8 +219,6 @@ libappwidgets_sources = [
'gimpwidgets-utils.c',
'gimpwindow.c',
'gimpwindowstrategy.c',
- 'gtkhwrapbox.c',
- 'gtkwrapbox.c',
appwidgetsenums,
appcoremarshal,
]
@@ -234,6 +231,6 @@ libappwidgets = static_library('appwidgets',
'-DG_LOG_DOMAIN="Gimp-Widgets"',
],
dependencies: [
- gegl, gtk2,
+ gegl, gtk3,
],
)
diff --git a/devel-docs/app/meson.build b/devel-docs/app/meson.build
index f09f546..6911f48 100644
--- a/devel-docs/app/meson.build
+++ b/devel-docs/app/meson.build
@@ -11,7 +11,7 @@ configure_file(
gnome.gtkdoc(module_name,
content_files: [],
dependencies: [
- fontconfig, freetype2, gtk2, harfbuzz, pangocairo,
+ fontconfig, freetype2, gtk3, harfbuzz, pangocairo,
],
fixxref_args: [
'--extra-dir=' + join_paths(meson.current_build_dir(), '..', 'libgimpbase', 'html'),
diff --git a/devel-docs/libgimp/meson.build b/devel-docs/libgimp/meson.build
index 72ee9e6..c0b34f6 100644
--- a/devel-docs/libgimp/meson.build
+++ b/devel-docs/libgimp/meson.build
@@ -38,7 +38,7 @@ gnome.gtkdoc(module_name,
],
dependencies: [
- fontconfig, freetype2, gtk2, harfbuzz, pangocairo,
+ fontconfig, freetype2, gtk3, harfbuzz, pangocairo,
gimp_dep,
],
scanobjs_args: [
diff --git a/devel-docs/libgimpbase/meson.build b/devel-docs/libgimpbase/meson.build
index 0eeed60..75fda51 100644
--- a/devel-docs/libgimpbase/meson.build
+++ b/devel-docs/libgimpbase/meson.build
@@ -26,7 +26,7 @@ gnome.gtkdoc(module_name,
],
dependencies: [
- fontconfig, freetype2, gtk2, harfbuzz, pangocairo,
+ fontconfig, freetype2, gtk3, harfbuzz, pangocairo,
],
scanobjs_args: [
],
diff --git a/devel-docs/libgimpcolor/meson.build b/devel-docs/libgimpcolor/meson.build
index c5bf87f..8ea535a 100644
--- a/devel-docs/libgimpcolor/meson.build
+++ b/devel-docs/libgimpcolor/meson.build
@@ -19,7 +19,7 @@ gnome.gtkdoc(module_name,
],
dependencies: [
- fontconfig, freetype2, gtk2, harfbuzz, pangocairo,
+ fontconfig, freetype2, gtk3, harfbuzz, pangocairo,
],
scanobjs_args: [
],
diff --git a/devel-docs/libgimpconfig/meson.build b/devel-docs/libgimpconfig/meson.build
index 015f48b..b2b1841 100644
--- a/devel-docs/libgimpconfig/meson.build
+++ b/devel-docs/libgimpconfig/meson.build
@@ -19,7 +19,7 @@ gnome.gtkdoc(module_name,
],
dependencies: [
- fontconfig, freetype2, gtk2, harfbuzz, pangocairo,
+ fontconfig, freetype2, gtk3, harfbuzz, pangocairo,
],
scanobjs_args: [
],
diff --git a/devel-docs/libgimpmath/meson.build b/devel-docs/libgimpmath/meson.build
index 5361d40..a8217a3 100644
--- a/devel-docs/libgimpmath/meson.build
+++ b/devel-docs/libgimpmath/meson.build
@@ -19,7 +19,7 @@ gnome.gtkdoc(module_name,
],
dependencies: [
- fontconfig, freetype2, gtk2, harfbuzz, pangocairo,
+ fontconfig, freetype2, gtk3, harfbuzz, pangocairo,
],
scanobjs_args: [
],
diff --git a/devel-docs/libgimpmodule/meson.build b/devel-docs/libgimpmodule/meson.build
index 4ac636b..43cff5a 100644
--- a/devel-docs/libgimpmodule/meson.build
+++ b/devel-docs/libgimpmodule/meson.build
@@ -19,7 +19,7 @@ gnome.gtkdoc(module_name,
],
dependencies: [
- fontconfig, freetype2, gtk2, harfbuzz, pangocairo,
+ fontconfig, freetype2, gtk3, harfbuzz, pangocairo,
],
scanobjs_args: [
],
diff --git a/devel-docs/libgimpthumb/meson.build b/devel-docs/libgimpthumb/meson.build
index f25ae75..c7e6ee9 100644
--- a/devel-docs/libgimpthumb/meson.build
+++ b/devel-docs/libgimpthumb/meson.build
@@ -20,7 +20,7 @@ gnome.gtkdoc(module_name,
],
dependencies: [
- fontconfig, freetype2, gtk2, harfbuzz, pangocairo,
+ fontconfig, freetype2, gtk3, harfbuzz, pangocairo,
],
scanobjs_args: [
],
diff --git a/devel-docs/libgimpwidgets/meson.build b/devel-docs/libgimpwidgets/meson.build
index 3f23f35..a32e0fa 100644
--- a/devel-docs/libgimpwidgets/meson.build
+++ b/devel-docs/libgimpwidgets/meson.build
@@ -23,7 +23,7 @@ gnome.gtkdoc(module_name,
],
dependencies: [
- fontconfig, freetype2, gtk2, harfbuzz, pangocairo,
+ fontconfig, freetype2, gtk3, harfbuzz, pangocairo,
],
scanobjs_args: [
'--type-init-func="do { void babl_init (void); babl_init (); } while (0)"',
diff --git a/devel-docs/tools/meson.build b/devel-docs/tools/meson.build
index 818b806..456af3b 100644
--- a/devel-docs/tools/meson.build
+++ b/devel-docs/tools/meson.build
@@ -9,7 +9,7 @@ doc_shooter = executable('doc-shooter',
doc_shooter_sources,
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gdk_pixbuf, gegl, math, x11, xext,
+ gtk3, gdk_pixbuf, gegl, math, x11, xext,
],
c_args: [
'-DTOP_SRCDIR="' + meson.source_root() + '"',
diff --git a/etc/meson.build b/etc/meson.build
index fb21c5a..ca599aa 100644
--- a/etc/meson.build
+++ b/etc/meson.build
@@ -2,7 +2,7 @@ install_data(
[
'controllerrc',
'gimprc',
- 'gtkrc',
+ 'gimp.css',
'menurc',
'sessionrc',
'templaterc',
diff --git a/libgimp/meson.build b/libgimp/meson.build
index 74298d5..54f2af3 100644
--- a/libgimp/meson.build
+++ b/libgimp/meson.build
@@ -276,7 +276,7 @@ libgimp = library('gimp-'+ api_version,
libgimp_top_sources,
include_directories: rootInclude,
dependencies: [
- gegl, gexiv2, gtk2,
+ gegl, gexiv2, gtk3,
],
c_args: [ libgimp_top_cflags, ],
link_with: [
@@ -294,7 +294,7 @@ libgimpui = library('gimpui-'+ api_version,
libgimpui_sources,
include_directories: rootInclude,
dependencies: [
- gegl, gexiv2, gtk2,
+ gegl, gexiv2, gtk3,
],
c_args: [ libgimp_top_cflags, ],
link_with: [
diff --git a/libgimpwidgets/meson.build b/libgimpwidgets/meson.build
index dea0001..8cea53c 100644
--- a/libgimpwidgets/meson.build
+++ b/libgimpwidgets/meson.build
@@ -60,11 +60,9 @@ libgimpwidgets_sources = [
'gimpmemsizeentry.c',
'gimpnumberpairentry.c',
'gimpoffsetarea.c',
- 'gimpoldwidgets.c',
'gimppageselector.c',
'gimppatheditor.c',
'gimppickbutton.c',
- 'gimppixmap.c',
'gimppreview.c',
'gimppreviewarea.c',
'gimppropwidgets.c',
@@ -75,7 +73,6 @@ libgimpwidgets_sources = [
'gimpsizeentry.c',
'gimpstringcombobox.c',
'gimpunitcombobox.c',
- 'gimpunitmenu.c',
'gimpunitstore.c',
'gimpwidgets-error.c',
'gimpwidgets-private.c',
@@ -126,11 +123,9 @@ libgimpwidgets_headers = [
'gimpmemsizeentry.h',
'gimpnumberpairentry.h',
'gimpoffsetarea.h',
- 'gimpoldwidgets.h',
'gimppageselector.h',
'gimppatheditor.h',
'gimppickbutton.h',
- 'gimppixmap.h',
'gimppreview.h',
'gimppreviewarea.h',
'gimppropwidgets.h',
@@ -141,7 +136,6 @@ libgimpwidgets_headers = [
'gimpsizeentry.h',
'gimpstringcombobox.h',
'gimpunitcombobox.h',
- 'gimpunitmenu.h',
'gimpunitstore.h',
'gimpwidgets-error.h',
'gimpwidgets.h',
@@ -173,7 +167,7 @@ libgimpwidgets = library('gimpwidgets-'+ api_version,
libgimpwidgets_sources,
include_directories: rootInclude,
dependencies: [
- gegl, gtk2, lcms, math
+ gegl, gtk3, lcms, math
],
c_args: [ libgimpwidgets_cflags, ],
link_with: [
@@ -198,7 +192,7 @@ test_preview_area = executable('test-preview-area',
'test-preview-area.c',
include_directories: rootInclude,
dependencies: [
- gtk2,
+ gtk3,
],
c_args: [ libgimpwidgets_cflags, ],
link_with: [ libgimpwidgets, ],
@@ -210,7 +204,7 @@ test_eevl = executable('test-eevl',
'test-eevl.c',
include_directories: rootInclude,
dependencies: [
- glib, gtk2,
+ glib, gtk3,
],
c_args: [ libgimpwidgets_cflags, ],
link_with: [ libgimpwidgets, ],
diff --git a/m4macros/Makefile.am b/m4macros/Makefile.am
index 6d7c2d0..7206718 100644
--- a/m4macros/Makefile.am
+++ b/m4macros/Makefile.am
@@ -1,6 +1,6 @@
# Makefile.am for gimp/m4macros
-installed_m4 = gimp-2.0.m4
+installed_m4 = gimp-3.0.m4
uninstalled_m4 = \
alsa.m4 \
diff --git a/m4macros/gimp-3.0.m4 b/m4macros/gimp-3.0.m4
new file mode 100644
index 0000000..695b9e5
--- /dev/null
+++ b/m4macros/gimp-3.0.m4
@@ -0,0 +1,180 @@
+# Configure paths for GIMP-2.0
+# Manish Singh, Sven Neumann
+# Large parts shamelessly stolen from Owen Taylor
+
+dnl AM_PATH_GIMP_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for GIMP, and define GIMP_CFLAGS and GIMP_LIBS
+dnl
+AC_DEFUN([AM_PATH_GIMP_2_0],
+[dnl
+dnl Get the cflags and libraries from pkg-config
+dnl
+
+AC_ARG_ENABLE(gimptest, [ --disable-gimptest do not try to compile and run a test GIMP program],,
enable_gimptest=yes)
+
+ pkg_name=gimp-2.0
+ pkg_config_args="$pkg_name gimpui-2.0"
+
+ no_gimp=""
+
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+ if test x$PKG_CONFIG != xno ; then
+ if pkg-config --atleast-pkgconfig-version 0.7 ; then
+ :
+ else
+ echo *** pkg-config too old; version 0.7 or better required.
+ no_gimp=yes
+ PKG_CONFIG=no
+ fi
+ else
+ no_gimp=yes
+ fi
+
+ min_gimp_version=ifelse([$1], ,2.0.0,$1)
+ AC_MSG_CHECKING(for GIMP - version >= $min_gimp_version)
+
+ if test x$PKG_CONFIG != xno ; then
+ ## don't try to run the test against uninstalled libtool libs
+ if $PKG_CONFIG --uninstalled $pkg_config_args; then
+ echo "Will use uninstalled version of GIMP found in PKG_CONFIG_PATH"
+ enable_gimptest=no
+ fi
+
+ if $PKG_CONFIG --atleast-version $min_gimp_version $pkg_config_args; then
+ :
+ else
+ no_gimp=yes
+ fi
+ fi
+
+ if test x"$no_gimp" = x ; then
+ GIMP_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
+ GIMP_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
+ GIMP_CFLAGS_NOUI=`$PKG_CONFIG $pkg_name --cflags`
+ GIMP_LIBS_NOUI=`$PKG_CONFIG $pkg_name --libs`
+ GIMP_DATA_DIR=`$PKG_CONFIG $pkg_name --variable=gimpdatadir`
+ GIMP_PLUGIN_DIR=`$PKG_CONFIG $pkg_name --variable=gimplibdir`
+
+ gimp_pkg_major_version=`$PKG_CONFIG --modversion $pkg_name | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ gimp_pkg_minor_version=`$PKG_CONFIG --modversion $pkg_name | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ gimp_pkg_micro_version=`$PKG_CONFIG --modversion $pkg_name | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ if test "x$enable_gimptest" = "xyes" ; then
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $GIMP_CFLAGS"
+ LIBS="$GIMP_LIBS $LIBS"
+
+dnl
+dnl Now check if the installed GIMP is sufficiently new. (Also sanity
+dnl checks the results of pkg-config to some extent
+dnl
+ rm -f conf.gimptest
+ AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <libgimp/gimp.h>
+
+GimpPlugInInfo PLUG_IN_INFO =
+{
+ NULL, /* init_proc */
+ NULL, /* quit_proc */
+ NULL, /* query_proc */
+ NULL /* run_proc */
+};
+
+int main ()
+{
+ int major, minor, micro;
+ char *tmp_version;
+
+ system ("touch conf.gimptest");
+
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
+ tmp_version = g_strdup("$min_gimp_version");
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
+ printf("%s, bad version string\n", "$min_gimp_version");
+ exit(1);
+ }
+
+ if (($gimp_pkg_major_version > major) ||
+ (($gimp_pkg_major_version == major) && ($gimp_pkg_minor_version > minor)) ||
+ (($gimp_pkg_major_version == major) && ($gimp_pkg_minor_version == minor) &&
($gimp_pkg_micro_version >= micro)))
+ {
+ return 0;
+ }
+ else
+ {
+ printf("\n*** 'pkg-config --modversion %s' returned %d.%d.%d, but the minimum version\n", "$pkg_name",
$gimp_pkg_major_version, $gimp_pkg_minor_version, $gimp_pkg_micro_version);
+ printf("*** of GIMP required is %d.%d.%d. If pkg-config is correct, then it is\n", major, minor,
micro);
+ printf("*** best to upgrade to the required version.\n");
+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+ printf("*** to point to the correct the correct configuration files\n");
+ return 1;
+ }
+}
+
+],, no_gimp=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ if test "x$no_gimp" = x ; then
+ AC_MSG_RESULT(yes (version $gimp_pkg_major_version.$gimp_pkg_minor_version.$gimp_pkg_micro_version))
+ ifelse([$2], , :, [$2])
+ else
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** A new enough version of pkg-config was not found."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig/";
+ else
+ if test -f conf.gimptest ; then
+ :
+ else
+ echo "*** Could not run GIMP test program, checking why..."
+ CFLAGS="$CFLAGS $GIMP_CFLAGS"
+ LIBS="$LIBS $GIMP_LIBS"
+ AC_TRY_LINK([
+#include <stdio.h>
+#include <libgimp/gimp.h>
+
+GimpPlugInInfo PLUG_IN_INFO =
+{
+ NULL, /* init_proc */
+ NULL, /* quit_proc */
+ NULL, /* query_proc */
+ NULL /* run_proc */
+};
+], [ return 0; ],
+ [ echo "*** The test program compiled, but did not run. This usually means"
+ echo "*** that the run-time linker is not finding GIMP or finding the wrong"
+ echo "*** version of GIMP. If it is not finding GIMP, you'll need to set your"
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
+ echo "*** is required on your system"
+ echo "***"
+ echo "*** If you have an old version installed, it is best to remove it, although"
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** exact error that occurred. This usually means GIMP is incorrectly installed."])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ GIMP_CFLAGS=""
+ GIMP_LIBS=""
+ GIMP_CFLAGS_NOUI=""
+ GIMP_LIBS_NOUI=""
+ ifelse([$3], , :, [$3])
+ fi
+ AC_SUBST(GIMP_CFLAGS)
+ AC_SUBST(GIMP_LIBS)
+ AC_SUBST(GIMP_CFLAGS_NOUI)
+ AC_SUBST(GIMP_LIBS_NOUI)
+ AC_SUBST(GIMP_DATA_DIR)
+ AC_SUBST(GIMP_PLUGIN_DIR)
+ rm -f conf.gimptest
+])
diff --git a/meson.build b/meson.build
index 1a1272c..3529e5a 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
# Meson build file
# http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP
-project('gimp', ['c', 'cpp'], version: '2.9.9',
+project('gimp', ['c', 'cpp'], version: '2.99.0',
meson_version: '>=0.44.0',
default_options: [
'sysconfdir=/etc',
@@ -44,14 +44,16 @@ minor_version = version[1].to_int()
micro_version = version[2].to_int()
interface_age = 0
-api_version = '@0@.0' .format(major_version)
-app_version = '@0@.@1@'.format(major_version, minor_version)
-user_version = '@0@.@1@'.format(major_version, minor_version)
+api_version = '3.0'
+app_version = '2.99'
+user_version = '3.0'
gimp_version = meson.project_version()
gimp_command = 'gimp-' + app_version
gimp_api_name = 'gimp-' + api_version
package_string= prettyname + ' ' + gimp_version
+gettext_package= 'gimp30'
+
# TODO cleanup all this versions mess
@@ -118,7 +120,7 @@ endif
# Dependencies
math = cc.find_library('m')
-atk = dependency('atk', version: '>=2.2.0')
+atk = dependency('atk', version: '>=2.4.0')
babl_minver = '>=0.1.42'
babl = dependency('babl', version: babl_minver)
@@ -151,8 +153,8 @@ glib = dependency('glib-2.0', version: '>=2.54.2')
gobject = dependency('gobject-2.0', version: '>=2.54.2')
gmodule = dependency('gmodule-no-export-2.0')
-gtk2_minver = '>=2.24.10'
-gtk2 = dependency('gtk+-2.0', version: gtk2_minver)
+gtk3_minver = '>=3.16.10'
+gtk3 = dependency('gtk+-3.0', version: gtk3_minver)
harfbuzz = dependency('harfbuzz', version: '>=0.9.19')
lcms = dependency('lcms2', version: '>=2.8')
@@ -268,7 +270,7 @@ conf.set10('ENABLE_MP', get_option('enable-openmp'))
# Check if X11
enable_doc_shooter = false
-if gtk2.get_pkgconfig_variable('target') == 'x11'
+if gtk3.get_pkgconfig_variable('targets').contains('x11')
x11 = dependency('x11')
xmu = dependency('xmu')
xt = dependency('xt')
@@ -426,7 +428,7 @@ endif
if get_option('with-webkit')
- webkit = dependency('webkit-1.0', version: '>=1.6.1')
+ webkit = dependency('webkit2gtk-4.0', version: '>=2.0.0')
else
webkit = dependency('', required: false)
endif
@@ -556,12 +558,12 @@ have_scriptfu = get_option('with-script-fu')
# Check for GTK Mac Integration
gtk_mac_integration_ok = false
-if platform_osx and (gtk2.get_pkgconfig_variable('target') == 'xquartz')
- gtk2_macos = dependency('gtk-mac-integration-gtk2', version: '>=2.0.0', required: false)
- if not gtk2_macos.found()
- gtk2_macos = dependency('gtk-mac-integration' , version: '>=2.0.0', required: false)
+if platform_osx and (gtk3.get_pkgconfig_variable('targets').contains('quartz'))
+ gtk3_macos = dependency('gtk-mac-integration-gtk3', version: '>=2.0.0', required: false)
+ if not gtk3_macos.found()
+ gtk3_macos = dependency('gtk-mac-integration' , version: '>=2.0.0', required: false)
endif
- gtk_mac_integration_ok = gtk2_macos.found()
+ gtk_mac_integration_ok = gtk3_macos.found()
endif
# Check for XML tools
@@ -632,28 +634,28 @@ add_project_arguments([
language: 'c',
)
-if glib.version().version_compare('>=2.43')
- add_project_arguments([
- '-DG_DISABLE_DEPRECATED',
- ],
- language: 'c',
- )
-endif
-if gtk2.version().version_compare('>=2.26')
- add_project_arguments([
- '-DGDK_DISABLE_DEPRECATED',
- '-DGTK_DISABLE_DEPRECATED',
- ],
- language: 'c',
- )
-endif
-if glib.version().version_compare('>=1.32')
- add_project_arguments([
- '-DPANGO_DISABLE_DEPRECATED',
- ],
- language: 'c',
- )
-endif
+# if glib.version().version_compare('>=2.43')
+# add_project_arguments([
+# '-DG_DISABLE_DEPRECATED',
+# ],
+# language: 'c',
+# )
+# endif
+# if gtk3.version().version_compare('>=2.26')
+# add_project_arguments([
+# '-DGDK_DISABLE_DEPRECATED',
+# '-DGTK_DISABLE_DEPRECATED',
+# ],
+# language: 'c',
+# )
+# endif
+# if glib.version().version_compare('>=1.32')
+# add_project_arguments([
+# '-DPANGO_DISABLE_DEPRECATED',
+# ],
+# language: 'c',
+# )
+# endif
# Require multihead safe API
@@ -710,9 +712,7 @@ gimp_mkenums_custom_target_commonargs = [
################################################################################
# Localisation
-gettext_package = 'gimp20'
-
-conf.set_quoted('GETTEXT_PACKAGE',gettext_package)
+conf.set_quoted('GETTEXT_PACKAGE', gettext_package)
# localedir = join_paths(get_option('prefix'), get_option('localedir'))
@@ -762,6 +762,7 @@ add_project_arguments(
language: [ 'c', 'cpp', ],
)
+
# Ensure MSVC-compatible struct packing convention is used when
# compiling for Win32 with gcc.
if platform_win32
@@ -789,6 +790,7 @@ config_defines = [
# Names
'-DGIMP_PACKAGE=' +'"'+ meson.project_name() +'"',
+ '-DPACKAGE_NAME=' +'"'+ meson.project_name() +'"',
'-DPACKAGE_STRING=' +'"'+ package_string +'"',
'-DGIMP_COMMAND=' +'"'+ gimp_command +'"',
@@ -981,7 +983,7 @@ pkgconfig.generate(filebase: 'gimpui-' + api_version,
version: gimp_version,
requires: [
'gimp-' + api_version + ' >= ' + app_version,
- 'gtk+-2.0 ' + gtk2_minver,
+ 'gtk+-3.0 ' + gtk3_minver,
],
libraries: [
'-L${libdir}',
diff --git a/modules/meson.build b/modules/meson.build
index e2f9c2d..361f1b1 100644
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -1,6 +1,6 @@
modules_deps = [
- gtk2, babl, gegl, math,
+ gtk3, babl, gegl, math,
]
color_selector_libs = [
diff --git a/plug-ins/common/meson.build b/plug-ins/common/meson.build
index 6fe873d..60ed28e 100644
--- a/plug-ins/common/meson.build
+++ b/plug-ins/common/meson.build
@@ -3,132 +3,132 @@ common_exes_list = [
[
'align-layers',
[ 'align-layers.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'animation-optimize',
[ 'animation-optimize.c', ],
- [ gtk2, gegl, gdk_pixbuf, cairo ],
+ [ gtk3, gegl, gdk_pixbuf, cairo ],
],
[
'animation-play',
[ 'animation-play.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'blinds',
[ 'blinds.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'blur',
[ 'blur.c', ],
- [ gtk2, gegl, gdk_pixbuf, cairo, ],
+ [ gtk3, gegl, gdk_pixbuf, cairo, ],
],
[
'border-average',
[ 'border-average.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'cartoon',
[ 'cartoon.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'checkerboard',
[ 'checkerboard.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'cml-explorer',
[ 'cml-explorer.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'color-cube-analyze',
[ 'color-cube-analyze.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'color-enhance',
[ 'color-enhance.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'colorify',
[ 'colorify.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'colormap-remap',
[ 'colormap-remap.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'compose',
[ 'compose.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'contrast-normalize',
[ 'contrast-normalize.c', ],
- [ gtk2, gegl, gdk_pixbuf, cairo, ],
+ [ gtk3, gegl, gdk_pixbuf, cairo, ],
],
[
'contrast-retinex',
[ 'contrast-retinex.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'crop-zealous',
[ 'crop-zealous.c', ],
- [ gtk2, gegl, gdk_pixbuf, cairo, ],
+ [ gtk3, gegl, gdk_pixbuf, cairo, ],
],
[
'curve-bend',
[ 'curve-bend.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'decompose',
[ 'decompose.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'depth-merge',
[ 'depth-merge.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'despeckle',
[ 'despeckle.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'destripe',
[ 'destripe.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'edge-dog',
[ 'edge-dog.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'edge-neon',
[ 'edge-neon.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'emboss',
[ 'emboss.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'file-cel',
[ 'file-cel.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'file-compressor',
@@ -138,312 +138,312 @@ common_exes_list = [
[
'file-csource',
[ 'file-csource.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'file-desktop-link',
[ 'file-desktop-link.c', ],
- [ gtk2, gegl, gdk_pixbuf, cairo, ],
+ [ gtk3, gegl, gdk_pixbuf, cairo, ],
],
[
'file-dicom',
[ 'file-dicom.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'file-gbr',
[ 'file-gbr.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'file-gegl',
[ 'file-gegl.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'file-gif-load',
[ 'file-gif-load.c', ],
- [ gtk2, gegl, gdk_pixbuf, cairo, ],
+ [ gtk3, gegl, gdk_pixbuf, cairo, ],
],
[
'file-gif-save',
[ 'file-gif-save.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'file-gih',
[ 'file-gih.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'file-glob',
[ 'file-glob.c', ],
- [ gtk2, gegl, gdk_pixbuf, cairo, ],
+ [ gtk3, gegl, gdk_pixbuf, cairo, ],
],
[
'file-header',
[ 'file-header.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'file-html-table',
[ 'file-html-table.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'file-jp2-load',
[ 'file-jp2-load.c', ],
- [ gtk2, gegl, gdk_pixbuf, jasper, ],
+ [ gtk3, gegl, gdk_pixbuf, jasper, ],
],
[
'file-mng',
[ 'file-mng.c', ],
- [ gtk2, gegl, libmng, libpng, ],
+ [ gtk3, gegl, libmng, libpng, ],
],
[
'file-pat',
[ 'file-pat.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'file-pcx',
[ 'file-pcx.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'file-pdf-load',
[ 'file-pdf-load.c', ],
- [ gtk2, gegl, gdk_pixbuf, poppler ],
+ [ gtk3, gegl, gdk_pixbuf, poppler ],
],
[
'file-pdf-save',
[ 'file-pdf-save.c', ],
- [ gtk2, gegl, gdk_pixbuf, poppler, cairo ],
+ [ gtk3, gegl, gdk_pixbuf, poppler, cairo ],
],
[
'file-pix',
[ 'file-pix.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'file-png',
[ 'file-png.c', ],
- [ gtk2, gegl, libpng, ],
+ [ gtk3, gegl, libpng, ],
],
[
'file-pnm',
[ 'file-pnm.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'file-ps',
[ 'file-ps.c', ],
- [ gtk2, gegl, gdk_pixbuf, ghostscript, ],
+ [ gtk3, gegl, gdk_pixbuf, ghostscript, ],
],
[
'file-psp',
[ 'file-psp.c', ],
- [ gtk2, gegl, zlib, ],
+ [ gtk3, gegl, zlib, ],
],
[
'file-raw-data',
[ 'file-raw-data.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'file-sunras',
[ 'file-sunras.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'file-svg',
[ 'file-svg.c', ],
- [ gtk2, gegl, rsvg, ],
+ [ gtk3, gegl, rsvg, ],
],
[
'file-tga',
[ 'file-tga.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'file-xbm',
[ 'file-xbm.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'file-xpm',
[ 'file-xpm.c', ],
- [ gtk2, gegl, libxpm, ],
+ [ gtk3, gegl, libxpm, ],
],
[
'file-xwd',
[ 'file-xwd.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'film',
[ 'film.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'filter-pack',
[ 'filter-pack.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'fractal-trace',
[ 'fractal-trace.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'goat-exercise',
[ 'goat-exercise.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'gradient-map',
[ 'gradient-map.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'grid',
[ 'grid.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'guillotine',
[ 'guillotine.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'hot',
[ 'hot.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'jigsaw',
[ 'jigsaw.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'mail',
[ 'mail.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'max-rgb',
[ 'max-rgb.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'newsprint',
[ 'newsprint.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'nl-filter',
[ 'nl-filter.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'oilify',
[ 'oilify.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'photocopy',
[ 'photocopy.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'plugin-browser',
[ 'plugin-browser.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'procedure-browser',
[ 'procedure-browser.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'qbist',
[ 'qbist.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'ripple',
[ 'ripple.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'sample-colorize',
[ 'sample-colorize.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'sharpen',
[ 'sharpen.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'smooth-palette',
[ 'smooth-palette.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'softglow',
[ 'softglow.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'sparkle',
[ 'sparkle.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'sphere-designer',
[ 'sphere-designer.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'tile-small',
[ 'tile-small.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'tile',
[ 'tile.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'unit-editor',
[ 'unit-editor.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'unsharp-mask',
[ 'unsharp-mask.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'van-gogh-lic',
[ 'van-gogh-lic.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'warp',
[ 'warp.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'wavelet-decompose',
[ 'wavelet-decompose.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
[
'web-browser',
[ 'web-browser.c', ],
- [ gtk2, gegl, gdk_pixbuf, ],
+ [ gtk3, gegl, gdk_pixbuf, ],
],
]
@@ -452,7 +452,7 @@ if wmf.found()
[
'file-wmf',
[ 'file-wmf.c', ],
- [ gtk2, gegl, wmf, ],
+ [ gtk3, gegl, wmf, ],
],
]
endif
@@ -461,7 +461,7 @@ if xmc.found()
[
'file-xmc',
[ 'file-xmc.c', ],
- [ gtk2, gegl, xmc, ],
+ [ gtk3, gegl, xmc, ],
],
]
endif
@@ -471,7 +471,7 @@ if webkit.found()
[
'web-page',
[ 'web-page.c', ],
- [ gtk2, gegl, gdk_pixbuf, webkit, ],
+ [ gtk3, gegl, gdk_pixbuf, webkit, ],
]
]
endif
diff --git a/plug-ins/file-bmp/meson.build b/plug-ins/file-bmp/meson.build
index 9c308ab..b50269e 100644
--- a/plug-ins/file-bmp/meson.build
+++ b/plug-ins/file-bmp/meson.build
@@ -21,7 +21,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl,
+ gtk3, gegl,
],
link_with: [
libgimp,
diff --git a/plug-ins/file-exr/meson.build b/plug-ins/file-exr/meson.build
index bbf784f..cb8302b 100644
--- a/plug-ins/file-exr/meson.build
+++ b/plug-ins/file-exr/meson.build
@@ -22,7 +22,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, openexr, lcms,
+ gtk3, gegl, openexr, lcms,
],
link_with: [
libgimp,
diff --git a/plug-ins/file-faxg3/meson.build b/plug-ins/file-faxg3/meson.build
index 7eaba32..4ddb7fb 100644
--- a/plug-ins/file-faxg3/meson.build
+++ b/plug-ins/file-faxg3/meson.build
@@ -20,7 +20,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, gdk_pixbuf, cairo,
+ gtk3, gegl, gdk_pixbuf, cairo,
],
link_with: [
libgimp,
diff --git a/plug-ins/file-fits/meson.build b/plug-ins/file-fits/meson.build
index c6a3a35..a8bc5ac 100644
--- a/plug-ins/file-fits/meson.build
+++ b/plug-ins/file-fits/meson.build
@@ -20,7 +20,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl,
+ gtk3, gegl,
],
link_with: [
libgimp,
diff --git a/plug-ins/file-fli/meson.build b/plug-ins/file-fli/meson.build
index 205d552..41908e5 100644
--- a/plug-ins/file-fli/meson.build
+++ b/plug-ins/file-fli/meson.build
@@ -20,7 +20,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl,
+ gtk3, gegl,
],
link_with: [
libgimp,
diff --git a/plug-ins/file-ico/meson.build b/plug-ins/file-ico/meson.build
index 10ddfd1..c5de74c 100644
--- a/plug-ins/file-ico/meson.build
+++ b/plug-ins/file-ico/meson.build
@@ -22,7 +22,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, libpng,
+ gtk3, gegl, libpng,
],
link_with: [
libgimp,
diff --git a/plug-ins/file-jpeg/meson.build b/plug-ins/file-jpeg/meson.build
index 07adb0e..f75ab2c 100644
--- a/plug-ins/file-jpeg/meson.build
+++ b/plug-ins/file-jpeg/meson.build
@@ -24,7 +24,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, libjpeg, lcms, gexiv2,
+ gtk3, gegl, libjpeg, lcms, gexiv2,
],
link_with: [
libgimp,
diff --git a/plug-ins/file-psd/meson.build b/plug-ins/file-psd/meson.build
index 8b0635c..21a7b41 100644
--- a/plug-ins/file-psd/meson.build
+++ b/plug-ins/file-psd/meson.build
@@ -25,7 +25,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, libjpeg, math, zlib,
+ gtk3, gegl, libjpeg, math, zlib,
],
link_with: [
libgimp,
diff --git a/plug-ins/file-raw/meson.build b/plug-ins/file-raw/meson.build
index 0522ec5..6da073b 100644
--- a/plug-ins/file-raw/meson.build
+++ b/plug-ins/file-raw/meson.build
@@ -27,7 +27,7 @@ foreach plugin_name : file_raw_exes
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl,
+ gtk3, gegl,
],
link_with: [
libgimp,
diff --git a/plug-ins/file-sgi/meson.build b/plug-ins/file-sgi/meson.build
index 7445b79..48e2e68 100644
--- a/plug-ins/file-sgi/meson.build
+++ b/plug-ins/file-sgi/meson.build
@@ -20,7 +20,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl,
+ gtk3, gegl,
],
link_with: [
libgimp,
diff --git a/plug-ins/file-tiff/meson.build b/plug-ins/file-tiff/meson.build
index 86d23a1..f534f89 100644
--- a/plug-ins/file-tiff/meson.build
+++ b/plug-ins/file-tiff/meson.build
@@ -22,7 +22,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, gexiv2, webp, libtiff,
+ gtk3, gegl, gexiv2, webp, libtiff,
],
link_with: [
libgimp,
diff --git a/plug-ins/file-webp/meson.build b/plug-ins/file-webp/meson.build
index 1a578f2..7d6cc1a 100644
--- a/plug-ins/file-webp/meson.build
+++ b/plug-ins/file-webp/meson.build
@@ -24,7 +24,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, gexiv2, webp,
+ gtk3, gegl, gexiv2, webp,
],
link_with: [
libgimp,
diff --git a/plug-ins/flame/meson.build b/plug-ins/flame/meson.build
index 7950361..6144fd2 100644
--- a/plug-ins/flame/meson.build
+++ b/plug-ins/flame/meson.build
@@ -22,7 +22,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, math,
+ gtk3, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/fractal-explorer/meson.build b/plug-ins/fractal-explorer/meson.build
index 967f921..8767517 100644
--- a/plug-ins/fractal-explorer/meson.build
+++ b/plug-ins/fractal-explorer/meson.build
@@ -22,7 +22,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, math,
+ gtk3, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/gfig/meson.build b/plug-ins/gfig/meson.build
index bb10a41..95f5397 100644
--- a/plug-ins/gfig/meson.build
+++ b/plug-ins/gfig/meson.build
@@ -38,7 +38,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, math,
+ gtk3, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/gimpressionist/meson.build b/plug-ins/gimpressionist/meson.build
index 1979943..9a56ace 100644
--- a/plug-ins/gimpressionist/meson.build
+++ b/plug-ins/gimpressionist/meson.build
@@ -40,7 +40,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, math,
+ gtk3, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/gradient-flare/meson.build b/plug-ins/gradient-flare/meson.build
index a4d369d..c699f28 100644
--- a/plug-ins/gradient-flare/meson.build
+++ b/plug-ins/gradient-flare/meson.build
@@ -21,7 +21,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, math,
+ gtk3, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/help-browser/meson.build b/plug-ins/help-browser/meson.build
index 96437d0..025f0b6 100644
--- a/plug-ins/help-browser/meson.build
+++ b/plug-ins/help-browser/meson.build
@@ -25,7 +25,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, gio, webkit,
+ gtk3, gegl, gio, webkit,
],
link_with: [
libgimp,
diff --git a/plug-ins/help/meson.build b/plug-ins/help/meson.build
index d849956..e464775 100644
--- a/plug-ins/help/meson.build
+++ b/plug-ins/help/meson.build
@@ -24,7 +24,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, cairo, gio, gdk_pixbuf,
+ gtk3, gegl, cairo, gio, gdk_pixbuf,
],
link_with: [
libgimp,
diff --git a/plug-ins/ifs-compose/meson.build b/plug-ins/ifs-compose/meson.build
index 8d80435..2beb71e 100644
--- a/plug-ins/ifs-compose/meson.build
+++ b/plug-ins/ifs-compose/meson.build
@@ -21,7 +21,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, math,
+ gtk3, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/imagemap/meson.build b/plug-ins/imagemap/meson.build
index 4c3d795..a136e2f 100644
--- a/plug-ins/imagemap/meson.build
+++ b/plug-ins/imagemap/meson.build
@@ -84,7 +84,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, math,
+ gtk3, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/lighting/meson.build b/plug-ins/lighting/meson.build
index 2b637d4..3a8dc73 100644
--- a/plug-ins/lighting/meson.build
+++ b/plug-ins/lighting/meson.build
@@ -28,7 +28,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, include_directories('.'), ],
dependencies: [
- gtk2, gegl, math,
+ gtk3, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/map-object/meson.build b/plug-ins/map-object/meson.build
index 2382738..a89484d 100644
--- a/plug-ins/map-object/meson.build
+++ b/plug-ins/map-object/meson.build
@@ -26,7 +26,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, math,
+ gtk3, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/metadata/meson.build b/plug-ins/metadata/meson.build
index bd23427..1c4f8b1 100644
--- a/plug-ins/metadata/meson.build
+++ b/plug-ins/metadata/meson.build
@@ -22,7 +22,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, gexiv2,
+ gtk3, gegl, gexiv2,
],
link_with: [
libgimp,
@@ -57,7 +57,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, gexiv2,
+ gtk3, gegl, gexiv2,
],
link_with: [
libgimp,
diff --git a/plug-ins/pagecurl/meson.build b/plug-ins/pagecurl/meson.build
index 55fc8c8..ff01ec1 100644
--- a/plug-ins/pagecurl/meson.build
+++ b/plug-ins/pagecurl/meson.build
@@ -53,7 +53,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl, math,
+ gtk3, gegl, math,
],
link_with: [
libgimp,
diff --git a/plug-ins/print/meson.build b/plug-ins/print/meson.build
index e9cd6c4..fc10c20 100644
--- a/plug-ins/print/meson.build
+++ b/plug-ins/print/meson.build
@@ -28,7 +28,7 @@ executable(plugin_name,
],
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl,
+ gtk3, gegl,
# x11, xmu, xext, xfixes,
],
link_with: [
diff --git a/plug-ins/pygimp/meson.build b/plug-ins/pygimp/meson.build
index 7297146..7fb9ebd 100644
--- a/plug-ins/pygimp/meson.build
+++ b/plug-ins/pygimp/meson.build
@@ -33,7 +33,7 @@ python_so_libs = [
'pygimp-tile.c',
'pygimp-vectors.c',
],
- [ pycairo, cairo, gtk2, ],
+ [ pycairo, cairo, gtk3, ],
[
libgimp,
libgimpbase,
@@ -43,14 +43,14 @@ python_so_libs = [
],
[ '_gimpenums',
[ 'gimpenumsmodule.c', ],
- [ gobject, cairo, gtk2, ],
+ [ gobject, cairo, gtk3, ],
[
libgimp,libgimpbase
],
],
[ '_gimpui',
[ 'gimpuimodule.c', pygtk_generator.process('gimpui.defs'), ],
- [ pygtk2, pycairo, gtk2, ],
+ [ pygtk2, pycairo, gtk3, ],
[
libgimp,
libgimpbase,
diff --git a/plug-ins/screenshot/meson.build b/plug-ins/screenshot/meson.build
index 1263615..06ba793 100644
--- a/plug-ins/screenshot/meson.build
+++ b/plug-ins/screenshot/meson.build
@@ -15,7 +15,7 @@ screenshot = executable('screenshot',
plugin_screenshot_sources,
include_directories: [ rootInclude, ],
dependencies: [
- gtk2, gegl,
+ gtk3, gegl,
x11, xmu, xext, xfixes,
],
link_with: [
diff --git a/plug-ins/script-fu/meson.build b/plug-ins/script-fu/meson.build
index 13b2a9b..ba56d96 100644
--- a/plug-ins/script-fu/meson.build
+++ b/plug-ins/script-fu/meson.build
@@ -41,7 +41,7 @@ executable(plugin_name,
plugin_scriptfu_sources,
include_directories: [ rootInclude, ],
dependencies: [
- gegl, gtk2, math, winsock,
+ gegl, gtk3, math, winsock,
],
c_args: [
'-DSTANDALONE=0',
diff --git a/plug-ins/selection-to-path/meson.build b/plug-ins/selection-to-path/meson.build
index 49eb822..3e803d6 100644
--- a/plug-ins/selection-to-path/meson.build
+++ b/plug-ins/selection-to-path/meson.build
@@ -34,7 +34,7 @@ plugin_selection_to_path_link = [
libgimpwidgets,
]
plugin_selection_to_path_deps = [
- gegl, gtk2, math,
+ gegl, gtk3, math,
]
selection_to_path = executable(plugin_name,
diff --git a/plug-ins/twain/meson.build b/plug-ins/twain/meson.build
index 55a287e..bb7f488 100644
--- a/plug-ins/twain/meson.build
+++ b/plug-ins/twain/meson.build
@@ -27,7 +27,7 @@ twain = executable(plugin_name,
plugin_twain_sources,
include_directories: [ rootInclude, ],
dependencies: [
- glib, gtk2, gegl,
+ glib, gtk3, gegl,
],
link_with: [
libgimp,
diff --git a/tools/meson.build b/tools/meson.build
index 7ee6d8e..d4975fa 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -10,7 +10,7 @@ gimptool = executable('gimptool-' + api_version,
'gimptool.c',
include_directories: rootInclude,
dependencies: [
- gtk2,
+ gtk3,
],
link_with: [
libgimpbase,
@@ -18,26 +18,6 @@ gimptool = executable('gimptool-' + api_version,
install: true,
)
-gimpdebug = executable('gimp-debug-tool-' + api_version,
- [
- '../app/gimp-version.c',
- '../app/widgets/gimpcriticaldialog.c',
- 'gimpdebug.c',
- ],
- include_directories: [ rootInclude, appInclude, ],
- dependencies: [
- fontconfig,
- gegl,
- gio,
- gtk2,
- ],
- link_with: [
- libgimpbase,
- ],
- install: true,
-)
-
-
executable('kernelgen',
'kernelgen.c',
include_directories: rootInclude,
@@ -48,7 +28,7 @@ executable('test-clipboard',
'test-clipboard.c',
include_directories: rootInclude,
dependencies: [
- gtk2,
+ gtk3,
],
install: false,
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
