[gimp/gtk3-port: 1/137] Switch to version 3.0 in a lot of places and depend on GTK+ 3.0
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 1/137] Switch to version 3.0 in a lot of places and depend on GTK+ 3.0
- Date: Mon, 22 Nov 2010 10:20:09 +0000 (UTC)
commit 3a56df704fb9a28dd8829df81f1b2f8740245c55
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.0
and lots of other newer libraries. I'm sure I forgot to bump quite
some things...
configure.ac | 60 ++++++++++++++++++++++----------------------
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 ++++++++--------
9 files changed, 91 insertions(+), 91 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b7b807d..1babb13 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], [2])
+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]))
@@ -42,12 +42,12 @@ m4_define([gimp_full_name], [GNU Image Manipulation Program])
# required versions of other packages
m4_define([babl_required_version], [0.1.2])
m4_define([gegl_required_version], [0.1.2])
-m4_define([glib_required_version], [2.24.0])
-m4_define([gtk_required_version], [2.20.0])
-m4_define([gdk_pixbuf_required_version], [gtk_required_version])
-m4_define([cairo_required_version], [1.8.0])
-m4_define([cairo_pdf_required_version], [1.8.0])
-m4_define([pangocairo_required_version], [1.22.0])
+m4_define([glib_required_version], [2.26.0])
+m4_define([gtk_required_version], [2.91.0])
+m4_define([gdk_pixbuf_required_version], [2.22.1])
+m4_define([cairo_required_version], [1.10.0])
+m4_define([cairo_pdf_required_version], [1.10.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])
@@ -467,13 +467,13 @@ PKG_CHECK_MODULES(GMODULE_NO_EXPORT, gmodule-no-export-2.0)
PKG_CHECK_MODULES(GIO, gio-2.0)
-AC_MSG_CHECKING([if GLib is version 2.26.0 or newer])
-if $PKG_CONFIG --atleast-version=2.26.0 glib-2.0; then
- have_glib_2_26=yes
+AC_MSG_CHECKING([if GLib is version 2.30.0 or newer])
+if $PKG_CONFIG --atleast-version=2.30.0 glib-2.0; then
+ have_glib_2_30=yes
else
- have_glib_2_26=no
+ have_glib_2_30=no
fi
-AC_MSG_RESULT($have_glib_2_26)
+AC_MSG_RESULT($have_glib_2_30)
# Check for bind_textdomain_codeset, including -lintl if GLib brings it in.
@@ -488,17 +488,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)
-AC_MSG_CHECKING([if GTK+ is version 2.24.0 or newer])
-if $PKG_CONFIG --atleast-version=2.24.0 gtk+-2.0; then
- have_gtk_2_24=yes
+AC_MSG_CHECKING([if GTK+ is version 3.2.0 or newer])
+if $PKG_CONFIG --atleast-version=3.2.0 gtk+-3.0; then
+ have_gtk_3_2=yes
else
- have_gtk_2_24=no
+ have_gtk_3_2=no
fi
-AC_MSG_RESULT($have_gtk_2_24)
+AC_MSG_RESULT($have_gtk_3_2)
PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0 >= gdk_pixbuf_required_version)
@@ -934,7 +934,7 @@ AC_ARG_ENABLE(gimp-remote,
################################
# 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)"
@@ -1920,11 +1920,11 @@ CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DBABL_DISABLE_DEPRECATED -DGSEA
# must build without problems with future releases of libraries and
# disabling deprecated API risks breaking the build
-if test "x$have_glib_2_26" != "xyes"; then
+if test "x$have_glib_2_28" != "xyes"; then
CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
fi
-if test "x$have_gtk_2_24" != "xyes"; then
+if test "x$have_gtk_3_2" != "xyes"; then
CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
fi
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index 0b06e40..0e8ba19 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -65,7 +65,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 = \
gimpbrush_pdb.c \
@@ -172,7 +172,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 \
@@ -233,16 +233,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 \
@@ -291,15 +291,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 \
@@ -357,32 +357,32 @@ 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 = $(libgimpconfig) $(libgimpcolor) $(libgimpbase) $(GLIB_LIBS) $(RT_LIBS)
+libgimp_3_0_la_LIBADD = $(libgimpconfig) $(libgimpcolor) $(libgimpbase) $(GLIB_LIBS) $(RT_LIBS)
-libgimp_2_0_la_DEPENDENCIES = $(gimp_def) $(libgimpconfig) $(libgimpcolor) $(libgimpbase)
+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 = $(libgimp) $(libgimpwidgets) $(libgimpcolor) \
+libgimpui_3_0_la_LIBADD = $(libgimp) $(libgimpwidgets) $(libgimpcolor) \
$(libgimpbase) $(libgimpmodule) $(GTK_LIBS) $(RT_LIBS)
-libgimpui_2_0_la_DEPENDENCIES = $(gimpui_def) $(libgimp) $(libgimpwidgets) $(libgimpbase)
+libgimpui_3_0_la_DEPENDENCIES = $(gimpui_def) $(libgimp) $(libgimpwidgets) $(libgimpbase)
EXTRA_DIST = \
COPYING \
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 473fa7c..8987da0 100644
--- a/libgimpbase/Makefile.am
+++ b/libgimpbase/Makefile.am
@@ -67,7 +67,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
@@ -119,7 +119,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 = \
@@ -143,15 +143,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 ad7b064..94d6857 100644
--- a/libgimpcolor/Makefile.am
+++ b/libgimpcolor/Makefile.am
@@ -58,9 +58,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 \
@@ -93,14 +93,14 @@ 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 = $(gimpcolor_def) $(libgimpbase)
+libgimpcolor_3_0_la_DEPENDENCIES = $(gimpcolor_def) $(libgimpbase)
-libgimpcolor_2_0_la_LIBADD = $(GLIB_LIBS) $(libm)
+libgimpcolor_3_0_la_LIBADD = $(GLIB_LIBS) $(libm)
#
diff --git a/libgimpconfig/Makefile.am b/libgimpconfig/Makefile.am
index c5992f4..25ea741 100644
--- a/libgimpconfig/Makefile.am
+++ b/libgimpconfig/Makefile.am
@@ -55,7 +55,7 @@ EXTRA_DIST = \
makefile.msc \
gimpconfig.def
-lib_LTLIBRARIES = libgimpconfig-2.0.la
+lib_LTLIBRARIES = libgimpconfig-3.0.la
libgimpconfig_sources = \
gimpconfig.h \
@@ -84,7 +84,7 @@ libgimpconfig_sources = \
libgimpconfig_built_sources = \
gimpcolorconfig-enums.c
-libgimpconfig_2_0_la_SOURCES = \
+libgimpconfig_3_0_la_SOURCES = \
$(libgimpconfig_sources) $(libgimpconfig_built_sources)
@@ -104,14 +104,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 92e123d..8857fb0 100644
--- a/libgimpmath/Makefile.am
+++ b/libgimpmath/Makefile.am
@@ -58,9 +58,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 \
@@ -77,14 +77,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 12560bf..a3da48f 100644
--- a/libgimpmodule/Makefile.am
+++ b/libgimpmodule/Makefile.am
@@ -54,9 +54,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 \
@@ -68,14 +68,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 98acd24..20370b7 100644
--- a/libgimpthumb/Makefile.am
+++ b/libgimpthumb/Makefile.am
@@ -52,9 +52,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 \
@@ -74,12 +74,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 8b013e3..9a3e1ef 100644
--- a/libgimpwidgets/Makefile.am
+++ b/libgimpwidgets/Makefile.am
@@ -56,9 +56,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 \
@@ -177,17 +177,17 @@ libgimpwidgets_2_0_la_sources = \
gimpzoommodel.c \
gimpzoommodel.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 \
@@ -248,19 +248,19 @@ libgimpwidgetsinclude_HEADERS = \
gimpwidgetstypes.h \
gimpzoommodel.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
@@ -281,7 +281,7 @@ WILBER_VARIABLES = \
EXTRA_DIST = \
makefile.msc \
gimpwidgets.def \
- $(libgimpwidgets_2_0_la_extra_sources) \
+ $(libgimpwidgets_3_0_la_extra_sources) \
$(WILBER_IMAGES)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]