GNOME.org
 

[gimp/gtk3-port: 1/235] Switch to version 3.0 in a lot of places and depend on GTK+ 3.2

commit a9164a8d4cbe79e9e436bef86f9b38b99c513946
Author: Michael Natterer <mitch gimp org>
Date:   Fri Oct 15 09:56:27 2010 +0200

    Switch to version 3.0 in a lot of places and depend on GTK+ 3.2
    
    and lots of other newer libraries.

 app/gui/gui.c                   |    6 ++--
 app/sanity.c                    |    2 +-
 configure.ac                    |   54 ++++++++++++++++++--------------------
 libgimp/Makefile.am             |   42 +++++++++++++++---------------
 libgimpbase/Makefile.am         |   10 +++---
 libgimpcolor/Makefile.am        |   10 +++---
 libgimpconfig/Makefile.am       |   10 +++---
 libgimpmath/Makefile.am         |   10 +++---
 libgimpmodule/Makefile.am       |   10 +++---
 libgimpthumb/Makefile.am        |    8 +++---
 libgimpwidgets/Makefile.am      |   22 ++++++++--------
 libgimpwidgets/gimp3migration.c |    5 +++
 libgimpwidgets/gimp3migration.h |    4 +++
 tools/Makefile.am               |    6 ++--
 14 files changed, 103 insertions(+), 96 deletions(-)
---
diff --git a/app/gui/gui.c b/app/gui/gui.c
index b27d0a9..9f722bb 100644
--- a/app/gui/gui.c
+++ b/app/gui/gui.c
@@ -250,9 +250,9 @@ gui_init (Gimp     *gimp,
 static gchar *
 gui_sanity_check (void)
 {
-#define GTK_REQUIRED_MAJOR 2
-#define GTK_REQUIRED_MINOR 24
-#define GTK_REQUIRED_MICRO 3
+#define GTK_REQUIRED_MAJOR 3
+#define GTK_REQUIRED_MINOR 2
+#define GTK_REQUIRED_MICRO 0
 
   const gchar *mismatch = gtk_check_version (GTK_REQUIRED_MAJOR,
                                              GTK_REQUIRED_MINOR,
diff --git a/app/sanity.c b/app/sanity.c
index d6cd5c2..82e4fee 100644
--- a/app/sanity.c
+++ b/app/sanity.c
@@ -193,7 +193,7 @@ static gchar *
 sanity_check_pango (void)
 {
 #define PANGO_REQUIRED_MAJOR 1
-#define PANGO_REQUIRED_MINOR 22
+#define PANGO_REQUIRED_MINOR 28
 #define PANGO_REQUIRED_MICRO 0
 
   const gchar *mismatch = pango_version_check (PANGO_REQUIRED_MAJOR,
diff --git a/configure.ac b/configure.ac
index d62257a..c8fd440 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,8 +7,8 @@ AC_PREREQ(2.54)
 #   GIMP_INTERFACE_AGE += 1;
 
 m4_define([gimp_major_version], [2])
-m4_define([gimp_minor_version], [7])
-m4_define([gimp_micro_version], [4])
+m4_define([gimp_minor_version], [99])
+m4_define([gimp_micro_version], [0])
 m4_define([gimp_real_version],
           [gimp_major_version.gimp_minor_version.gimp_micro_version])
 m4_define([gimp_version], [gimp_real_version])
@@ -20,17 +20,17 @@ m4_define([gimp_binary_age],
 # m4_define([gimp_version], [2.7.0])
 
 # This is the X.Y used in -lgimp-X.Y
-m4_define([gimp_api_version], [2.0])
+m4_define([gimp_api_version], [3.0])
 
 # Versions used for apps, plugins, tools, pkg-config files, and data,
 # as well as global and user prefs
-m4_define([gimp_app_version], [2.7])
-m4_define([gimp_plugin_version], [2.0])
-m4_define([gimp_tool_version], [2.0])
-m4_define([gimp_pkgconfig_version], [2.0])
-m4_define([gimp_data_version], [2.0])
-m4_define([gimp_sysconf_version], [2.0])
-m4_define([gimp_user_version], [2.7])
+m4_define([gimp_app_version], [3.0])
+m4_define([gimp_plugin_version], [3.0])
+m4_define([gimp_tool_version], [3.0])
+m4_define([gimp_pkgconfig_version], [3.0])
+m4_define([gimp_data_version], [3.0])
+m4_define([gimp_sysconf_version], [3.0])
+m4_define([gimp_user_version], [3.0])
 
 m4_define([gimp_unstable],
           m4_if(m4_eval(gimp_minor_version % 2), [1], [yes], [no]))
@@ -43,14 +43,14 @@ m4_define([gimp_full_name], [GNU Image Manipulation Program])
 m4_define([babl_required_version], [0.1.4])
 m4_define([gegl_required_version], [0.1.6])
 m4_define([glib_required_version], [2.28.1])
-m4_define([gtk_required_version], [2.24.3])
+m4_define([gtk_required_version], [3.2.0])
 m4_define([gdk_pixbuf_required_version], [2.22.1])
 m4_define([cairo_required_version], [1.10.2])
 m4_define([cairo_pdf_required_version], [1.10.2])
-m4_define([pangocairo_required_version], [1.22.0])
+m4_define([pangocairo_required_version], [1.28.0])
 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([webkitgtk_required_version], [1.4.2])
 m4_define([alsa_required_version], [1.0.0])
 m4_define([rsvg_required_version], [2.14.0])
 m4_define([wmf_required_version], [0.2.8])
@@ -146,7 +146,7 @@ AC_SUBST(LT_CURRENT_MINUS_AGE)
 
 
 # gettext i18n support
-GETTEXT_PACKAGE=gimp20
+GETTEXT_PACKAGE=gimp30
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                    [The prefix for our gettext translation domains.])
@@ -506,19 +506,17 @@ LIBS=$gimp_save_LIBS
 
 AC_PATH_XTRA
 
-AM_PATH_GTK_2_0(gtk_required_version, :,
+AM_PATH_GTK_3_0(gtk_required_version, :,
   AC_MSG_ERROR(Test for GTK+ failed. See the file 'INSTALL' for help.),
   gthread)
 
-# GTK+ 2.26.0 will never be released, we keep the check around anyway
-# because we will need it again after the switch to GTK+ 3.x
-AC_MSG_CHECKING([if GTK+ is version 2.26.0 or newer (bogus placeholder check)])
-if $PKG_CONFIG --atleast-version=2.26.0 gtk+-2.0; then
-  have_gtk_2_26=yes
+AC_MSG_CHECKING([if GTK+ is version 3.3.0 or newer])
+if $PKG_CONFIG --atleast-version=3.3.0 gtk+-3.0; then
+  have_gtk_3_3=yes
 else
-  have_gtk_2_26=no
+  have_gtk_3_3=no
 fi
-AC_MSG_RESULT($have_gtk_2_26)
+AC_MSG_RESULT($have_gtk_3_3)
 
 PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gdk_pixbuf_required_version)
 
@@ -952,7 +950,7 @@ fi
 ################################
 
 # Check if building for GTK+-X11
-gdk_target=`$PKG_CONFIG --variable=target gtk+-2.0`
+gdk_target=`$PKG_CONFIG --variable=target gtk+-3.0`
 
 have_libxmu="no (building for $gdk_target)"
 
@@ -1264,15 +1262,15 @@ AC_SUBST(FILE_XPM)
 AC_SUBST(XPM_LIBS)
 
 
-##################
-# Check for webkit
-##################
+#####################
+# Check for webkitgtk
+#####################
 
 AC_ARG_WITH(webkit, [  --without-webkit        don't build the help-browser plug-in])
 
 have_webkit=no
 if test "x$with_webkit" != xno; then
-  PKG_CHECK_MODULES(WEBKIT, webkit-1.0 >= webkit_required_version,
+  PKG_CHECK_MODULES(WEBKIT, webkitgtk-3.0 >= webkitgtk_required_version,
     WEB_PAGE='web-page$(EXEEXT)'
     have_webkit=yes,
     have_webkit="no (WebKit not found)")
@@ -1947,7 +1945,7 @@ if test "x$have_glib_2_30" != "xyes"; then
   CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
 fi
 
-if test "x$have_gtk_2_26" != "xyes"; then
+if test "x$have_gtk_3_3" != "xyes"; then
   CPPFLAGS="${CPPFLAGS} -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
 fi
 
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index 11e3969..da171aa 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -66,7 +66,7 @@ INCLUDES = \
 	$(GTK_CFLAGS)	\
 	-I$(includedir)
 
-lib_LTLIBRARIES = libgimp-2.0.la libgimpui-2.0.la
+lib_LTLIBRARIES = libgimp-3.0.la libgimpui-3.0.la
 
 PDB_WRAPPERS_C = \
 	gimp_pdb.c			\
@@ -171,7 +171,7 @@ PDB_WRAPPERS_H = \
 	gimpunit_pdb.h			\
 	gimpvectors_pdb.h
 
-libgimp_2_0_la_sources = \
+libgimp_3_0_la_sources = \
 	gimp.c			\
 	gimp.h			\
 	gimpcompat.h		\
@@ -234,16 +234,16 @@ libgimp_2_0_la_sources = \
 	stdplugins-intl.h	\
 	libgimp-intl.h
 
-libgimp_2_0_la_built_sources = \
+libgimp_3_0_la_built_sources = \
 	gimpenums.c
 
-libgimp_2_0_la_extra_sources = gimpenums.c.tail
+libgimp_3_0_la_extra_sources = gimpenums.c.tail
 
-libgimp_2_0_la_SOURCES = \
-	$(libgimp_2_0_la_built_sources)	\
-	$(libgimp_2_0_la_sources)
+libgimp_3_0_la_SOURCES = \
+	$(libgimp_3_0_la_built_sources)	\
+	$(libgimp_3_0_la_sources)
 
-libgimpui_2_0_la_sources = \
+libgimpui_3_0_la_sources = \
 	gimpui.c			\
 	gimpui.h			\
 	gimpuitypes.h			\
@@ -290,15 +290,15 @@ libgimpui_2_0_la_sources = \
 	gimpzoompreview.c		\
 	gimpzoompreview.h
 
-libgimpui_2_0_la_built_sources = \
+libgimpui_3_0_la_built_sources = \
 	gimpuimarshal.c			\
 	gimpuimarshal.h
 
-libgimpui_2_0_la_extra_sources = gimpuimarshal.list
+libgimpui_3_0_la_extra_sources = gimpuimarshal.list
 
-libgimpui_2_0_la_SOURCES = \
-	$(libgimpui_2_0_la_built_sources)	\
-	$(libgimpui_2_0_la_sources)
+libgimpui_3_0_la_SOURCES = \
+	$(libgimpui_3_0_la_built_sources)	\
+	$(libgimpui_3_0_la_sources)
 
 gimpinclude_HEADERS = \
 	gimp.h				\
@@ -356,12 +356,12 @@ gimpinclude_HEADERS = \
 	gimpselectbutton.h		\
 	gimpzoompreview.h
 
-libgimp_2_0_la_LDFLAGS = \
+libgimp_3_0_la_LDFLAGS = \
 	-version-info $(LT_VERSION_INFO)	\
 	$(no_undefined)				\
 	$(libgimp_export_symbols)
 
-libgimp_2_0_la_LIBADD = \
+libgimp_3_0_la_LIBADD = \
 	$(libgimpconfig)	\
 	$(libgimpcolor)		\
 	$(libgimpbase)		\
@@ -369,18 +369,18 @@ libgimp_2_0_la_LIBADD = \
 	$(GDK_PIXBUF_LIBS)	\
 	$(RT_LIBS)
 
-libgimp_2_0_la_DEPENDENCIES = \
+libgimp_3_0_la_DEPENDENCIES = \
 	$(gimp_def)		\
 	$(libgimpconfig)	\
 	$(libgimpcolor)		\
 	$(libgimpbase)
 
-libgimpui_2_0_la_LDFLAGS = \
+libgimpui_3_0_la_LDFLAGS = \
 	-version-info $(LT_VERSION_INFO)	\
 	$(no_undefined)				\
 	$(libgimpui_export_symbols)
 
-libgimpui_2_0_la_LIBADD = \
+libgimpui_3_0_la_LIBADD = \
 	$(libgimp)		\
 	$(libgimpwidgets)	\
 	$(libgimpcolor)		\
@@ -389,7 +389,7 @@ libgimpui_2_0_la_LIBADD = \
 	$(GTK_LIBS)		\
 	$(RT_LIBS)
 
-libgimpui_2_0_la_DEPENDENCIES = \
+libgimpui_3_0_la_DEPENDENCIES = \
 	$(gimpui_def)		\
 	$(libgimp)		\
 	$(libgimpwidgets)	\
@@ -400,8 +400,8 @@ EXTRA_DIST = \
 	makefile.msc			\
 	gimp.def			\
 	gimpui.def			\
-	$(libgimp_2_0_la_extra_sources)	\
-	$(libgimpui_2_0_la_extra_sources)
+	$(libgimp_3_0_la_extra_sources)	\
+	$(libgimpui_3_0_la_extra_sources)
 
 install-data-local: install-ms-lib install-libtool-import-lib
 
diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am
index 100b39c..144b628 100644
--- a/libgimpbase/Makefile.am
+++ b/libgimpbase/Makefile.am
@@ -68,7 +68,7 @@ EXTRA_DIST = \
 	makefile.msc	\
 	gimpbase.def
 
-lib_LTLIBRARIES = libgimpbase-2.0.la
+lib_LTLIBRARIES = libgimpbase-3.0.la
 
 # help `make' along by giving another name for the file, which it knows
 # how to build
@@ -120,7 +120,7 @@ libgimpbase_sources = \
 libgimpbase_built_sources = \
 	gimpbaseenums.c
 
-libgimpbase_2_0_la_SOURCES = $(libgimpbase_sources) $(libgimpbase_built_sources)
+libgimpbase_3_0_la_SOURCES = $(libgimpbase_sources) $(libgimpbase_built_sources)
 
 
 libgimpbaseinclude_HEADERS = \
@@ -144,15 +144,15 @@ libgimpbaseinclude_HEADERS = \
 	gimputils.h
 
 
-libgimpbase_2_0_la_LDFLAGS = \
+libgimpbase_3_0_la_LDFLAGS = \
 	-version-info $(LT_VERSION_INFO)	\
 	$(no_undefined) 			\
 	$(libgimpbase_export_symbols)		\
 	$(CARBON_LDFLAGS)
 
-libgimpbase_2_0_la_DEPENDENCIES = $(gimpbase_def)
+libgimpbase_3_0_la_DEPENDENCIES = $(gimpbase_def)
 
-libgimpbase_2_0_la_LIBADD = $(GLIB_LIBS) $(ole32_lib)
+libgimpbase_3_0_la_LIBADD = $(GLIB_LIBS) $(ole32_lib)
 
 
 install-data-local: install-ms-lib install-libtool-import-lib
diff --git a/libgimpcolor/Makefile.am b/libgimpcolor/Makefile.am
index 3bb5eb6..b5f0f7d 100644
--- a/libgimpcolor/Makefile.am
+++ b/libgimpcolor/Makefile.am
@@ -60,9 +60,9 @@ EXTRA_DIST = \
 	makefile.msc		\
 	gimpcolor.def
 
-lib_LTLIBRARIES = libgimpcolor-2.0.la
+lib_LTLIBRARIES = libgimpcolor-3.0.la
 
-libgimpcolor_2_0_la_SOURCES = \
+libgimpcolor_3_0_la_SOURCES = \
 	gimpcolor.h			\
 	gimpcolortypes.h		\
 	gimpadaptivesupersample.c	\
@@ -98,16 +98,16 @@ libgimpcolorinclude_HEADERS = \
 	gimphsv.h			\
 	gimprgb.h
 
-libgimpcolor_2_0_la_LDFLAGS = \
+libgimpcolor_3_0_la_LDFLAGS = \
 	-version-info $(LT_VERSION_INFO)	\
 	$(no_undefined) 			\
 	$(libgimpcolor_export_symbols)
 
-libgimpcolor_2_0_la_DEPENDENCIES = \
+libgimpcolor_3_0_la_DEPENDENCIES = \
 	$(gimpcolor_def)	\
 	$(libgimpbase)
 
-libgimpcolor_2_0_la_LIBADD = \
+libgimpcolor_3_0_la_LIBADD = \
 	$(CAIRO_LIBS)	\
 	$(GLIB_LIBS)	\
 	$(libm)
diff --git a/libgimpconfig/Makefile.am b/libgimpconfig/Makefile.am
index 599e0d9..779b878 100644
--- a/libgimpconfig/Makefile.am
+++ b/libgimpconfig/Makefile.am
@@ -57,7 +57,7 @@ EXTRA_DIST = \
 	makefile.msc	\
 	gimpconfig.def
 
-lib_LTLIBRARIES = libgimpconfig-2.0.la
+lib_LTLIBRARIES = libgimpconfig-3.0.la
 
 libgimpconfig_sources = 		\
 	gimpconfig.h			\
@@ -86,7 +86,7 @@ libgimpconfig_sources = 		\
 libgimpconfig_built_sources = \
 	gimpcolorconfig-enums.c
 
-libgimpconfig_2_0_la_SOURCES = \
+libgimpconfig_3_0_la_SOURCES = \
 	$(libgimpconfig_sources) $(libgimpconfig_built_sources)
 
 
@@ -106,14 +106,14 @@ libgimpconfiginclude_HEADERS = \
 	gimpcolorconfig-enums.h
 
 
-libgimpconfig_2_0_la_LDFLAGS = \
+libgimpconfig_3_0_la_LDFLAGS = \
 	-version-info $(LT_VERSION_INFO)	\
 	$(no_undefined) 			\
 	$(libgimpconfig_export_symbols)
 
-libgimpconfig_2_0_la_DEPENDENCIES = $(gimpconfig_def)
+libgimpconfig_3_0_la_DEPENDENCIES = $(gimpconfig_def)
 
-libgimpconfig_2_0_la_LIBADD = \
+libgimpconfig_3_0_la_LIBADD = \
 	$(libgimpbase)	\
 	$(libgimpcolor)	\
 	$(libgimpmath)	\
diff --git a/libgimpmath/Makefile.am b/libgimpmath/Makefile.am
index c97127a..6221180 100644
--- a/libgimpmath/Makefile.am
+++ b/libgimpmath/Makefile.am
@@ -59,9 +59,9 @@ EXTRA_DIST = \
 	makefile.msc		\
 	gimpmath.def
 
-lib_LTLIBRARIES = libgimpmath-2.0.la
+lib_LTLIBRARIES = libgimpmath-3.0.la
 
-libgimpmath_2_0_la_SOURCES = \
+libgimpmath_3_0_la_SOURCES = \
 	gimpmath.h	\
 	gimpmathtypes.h	\
 	gimpmatrix.c	\
@@ -78,14 +78,14 @@ libgimpmathinclude_HEADERS = \
 	gimpmd5.h	\
 	gimpvector.h
 
-libgimpmath_2_0_la_LDFLAGS = \
+libgimpmath_3_0_la_LDFLAGS = \
 	-version-info $(LT_VERSION_INFO)	\
 	$(no_undefined)				\
 	$(libgimpmath_export_symbols)
 
-libgimpmath_2_0_la_DEPENDENCIES = $(gimpmath_def) $(libgimpbase)
+libgimpmath_3_0_la_DEPENDENCIES = $(gimpmath_def) $(libgimpbase)
 
-libgimpmath_2_0_la_LIBADD = $(GLIB_LIBS) $(libm)
+libgimpmath_3_0_la_LIBADD = $(GLIB_LIBS) $(libm)
 
 
 install-data-local: install-ms-lib install-libtool-import-lib
diff --git a/libgimpmodule/Makefile.am b/libgimpmodule/Makefile.am
index cdee2c4..f238dc8 100644
--- a/libgimpmodule/Makefile.am
+++ b/libgimpmodule/Makefile.am
@@ -55,9 +55,9 @@ EXTRA_DIST = \
 	makefile.msc		\
 	gimpmodule.def
 
-lib_LTLIBRARIES = libgimpmodule-2.0.la
+lib_LTLIBRARIES = libgimpmodule-3.0.la
 
-libgimpmodule_2_0_la_SOURCES = \
+libgimpmodule_3_0_la_SOURCES = \
 	gimpmoduletypes.h	\
 	gimpmodule.c		\
 	gimpmodule.h		\
@@ -69,14 +69,14 @@ libgimpmoduleinclude_HEADERS = \
 	gimpmodule.h		\
 	gimpmoduledb.h
 
-libgimpmodule_2_0_la_LDFLAGS = \
+libgimpmodule_3_0_la_LDFLAGS = \
 	-version-info $(LT_VERSION_INFO)	\
 	$(no_undefined) 			\
 	$(libgimpmodule_export_symbols)
 
-libgimpmodule_2_0_la_DEPENDENCIES = $(gimpmodule_def)
+libgimpmodule_3_0_la_DEPENDENCIES = $(gimpmodule_def)
 
-libgimpmodule_2_0_la_LIBADD = \
+libgimpmodule_3_0_la_LIBADD = \
 	$(libgimpbase)			\
 	$(GMODULE_NO_EXPORT_LIBS) 	\
 	$(GLIB_LIBS)
diff --git a/libgimpthumb/Makefile.am b/libgimpthumb/Makefile.am
index 2b07c0b..8f46ed2 100644
--- a/libgimpthumb/Makefile.am
+++ b/libgimpthumb/Makefile.am
@@ -53,9 +53,9 @@ EXTRA_DIST = \
 	makefile.msc	\
 	gimpthumb.def
 
-lib_LTLIBRARIES = libgimpthumb-2.0.la
+lib_LTLIBRARIES = libgimpthumb-3.0.la
 
-libgimpthumb_2_0_la_SOURCES = \
+libgimpthumb_3_0_la_SOURCES = \
 	gimpthumb.h		\
 	gimpthumb-enums.c	\
 	gimpthumb-enums.h	\
@@ -75,12 +75,12 @@ libgimpthumbinclude_HEADERS = \
 	gimpthumb-utils.h	\
 	gimpthumbnail.h
 
-libgimpthumb_2_0_la_LDFLAGS = \
+libgimpthumb_3_0_la_LDFLAGS = \
 	-version-info $(LT_VERSION_INFO)	\
 	$(no_undefined)				\
 	$(libgimpthumb_export_symbols)
 
-libgimpthumb_2_0_la_LIBADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS) 
+libgimpthumb_3_0_la_LIBADD = $(GDK_PIXBUF_LIBS) $(GLIB_LIBS) 
 
 
 noinst_PROGRAMS = gimp-thumbnail-list
diff --git a/libgimpwidgets/Makefile.am b/libgimpwidgets/Makefile.am
index 1f17b0b..b62699d 100644
--- a/libgimpwidgets/Makefile.am
+++ b/libgimpwidgets/Makefile.am
@@ -57,9 +57,9 @@ INCLUDES = \
 	$(GTK_CFLAGS)	\
 	-I$(includedir)
 
-lib_LTLIBRARIES = libgimpwidgets-2.0.la
+lib_LTLIBRARIES = libgimpwidgets-3.0.la
 
-libgimpwidgets_2_0_la_sources = \
+libgimpwidgets_3_0_la_sources = \
 	gimpbrowser.c			\
 	gimpbrowser.h			\
 	gimpbutton.c			\
@@ -180,17 +180,17 @@ libgimpwidgets_2_0_la_sources = \
 	gimp3migration.c		\
 	gimp3migration.h
 
-libgimpwidgets_2_0_la_built_sources = \
+libgimpwidgets_3_0_la_built_sources = \
 	gimp-wilber-pixbufs.h	\
 	gimpwidgetsenums.c	\
 	gimpwidgetsmarshal.c	\
 	gimpwidgetsmarshal.h
 
-libgimpwidgets_2_0_la_extra_sources = gimpwidgetsmarshal.list
+libgimpwidgets_3_0_la_extra_sources = gimpwidgetsmarshal.list
 
-libgimpwidgets_2_0_la_SOURCES = \
-	$(libgimpwidgets_2_0_la_built_sources)	\
-	$(libgimpwidgets_2_0_la_sources)
+libgimpwidgets_3_0_la_SOURCES = \
+	$(libgimpwidgets_3_0_la_built_sources)	\
+	$(libgimpwidgets_3_0_la_sources)
 
 libgimpwidgetsinclude_HEADERS = \
 	gimpbrowser.h			\
@@ -252,19 +252,19 @@ libgimpwidgetsinclude_HEADERS = \
 	gimpzoommodel.h			\
 	gimp3migration.h
 
-libgimpwidgets_2_0_la_LDFLAGS = \
+libgimpwidgets_3_0_la_LDFLAGS = \
 	-version-info $(LT_VERSION_INFO)\
 	$(no_undefined) 		\
 	$(libgimpwidgets_export_symbols)
 
-libgimpwidgets_2_0_la_LIBADD = \
+libgimpwidgets_3_0_la_LIBADD = \
 	$(libgimpcolor)		\
 	$(libgimpconfig)	\
 	$(libgimpbase)		\
 	$(GTK_LIBS)		\
 	$(libm)
 
-libgimpwidgets_2_0_la_DEPENDENCIES = $(gimpwidgets_def)
+libgimpwidgets_3_0_la_DEPENDENCIES = $(gimpwidgets_def)
 
 
 ## Wilber icons for the window managaer, compiled in
@@ -285,7 +285,7 @@ WILBER_VARIABLES = \
 EXTRA_DIST = \
 	makefile.msc				\
 	gimpwidgets.def				\
-	$(libgimpwidgets_2_0_la_extra_sources)	\
+	$(libgimpwidgets_3_0_la_extra_sources)	\
 	$(WILBER_IMAGES)
 
 
diff --git a/libgimpwidgets/gimp3migration.c b/libgimpwidgets/gimp3migration.c
index a32a2ed..e2d4877 100644
--- a/libgimpwidgets/gimp3migration.c
+++ b/libgimpwidgets/gimp3migration.c
@@ -28,6 +28,8 @@
 #include "gimp3migration.h"
 
 
+#if 0
+
 GtkWidget *
 gtk_box_new (GtkOrientation  orientation,
              gint            spacing)
@@ -85,6 +87,9 @@ gtk_separator_new (GtkOrientation  orientation)
     return gtk_vseparator_new ();
 }
 
+#endif /* if 0 */
+
+
 #if ! GTK_CHECK_VERSION (3, 3, 0)
 
 gboolean
diff --git a/libgimpwidgets/gimp3migration.h b/libgimpwidgets/gimp3migration.h
index 3371c7a..c638587 100644
--- a/libgimpwidgets/gimp3migration.h
+++ b/libgimpwidgets/gimp3migration.h
@@ -33,6 +33,8 @@
  * along. This file will be removed in GIMP 3.
  */
 
+#if 0
+
 GtkWidget * gtk_box_new        (GtkOrientation  orientation,
                                 gint            spacing);
 GtkWidget * gtk_button_box_new (GtkOrientation  orientation);
@@ -43,6 +45,8 @@ GtkWidget * gtk_scrollbar_new  (GtkOrientation  orientation,
                                 GtkAdjustment  *adjustment);
 GtkWidget * gtk_separator_new  (GtkOrientation  orientation);
 
+#endif
+
 
 /* These functions are even more evil. They exist only since GTK+ 3.3
  * and need to be taken care of carefully when building against GTK+
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 6128f57..adb3e8e 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -8,17 +8,17 @@ endif
 
 SUBDIRS = $(D_pdbgen)
 
-bin_PROGRAMS = gimptool-2.0
+bin_PROGRAMS = gimptool-3.0
 
 noinst_PROGRAMS = test-clipboard
 
 EXTRA_PROGRAMS = \
 	kernelgen
 
-gimptool_2_0_SOURCES = \
+gimptool_3_0_SOURCES = \
 	gimptool.c
 
-gimptool_2_0_LDADD = \
+gimptool_3_0_LDADD = \
 	$(GTK_LIBS)
 
 kernelgen_SOURCES = kernelgen.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]