From 7d46b5fc0e740cdfdb9cc0cdd8769c8b82c435d4 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Sat, 26 Mar 2011 12:50:06 +0000 Subject: [PATCH] Bump required gtk version to 2.16 as discussed on gnucash-devel. This requirement will be increased to 2.18.1 once our win32 build is upgraded. Following the gtk version, I increased also all the other related libraries according to what I found here: ftp://ftp.gnome.org/pub/gnome/platform/2.26/2.26.3/sources/ git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20489 57a11ea4-9604-0410-9ed3-97b8803252fd --- CMakeLists.txt | 10 ++-- configure.ac | 89 ++++++-------------------------- src/gnome-utils/dialog-account.c | 5 -- src/libqof/qof/Makefile.am | 4 -- 4 files changed, 22 insertions(+), 86 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5baaa4caa8..a7c86eacdd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,11 +37,11 @@ IF (NOT PKG_CONFIG_FOUND) ENDIF (NOT PKG_CONFIG_FOUND) # glib et al. -PKG_CHECK_MODULES (GLIB2 glib-2.0>=2.12.0) -PKG_CHECK_MODULES (GCONF2 gconf-2.0>=2.0) -PKG_CHECK_MODULES (GOBJECT gobject-2.0>=2.12.0) -PKG_CHECK_MODULES (GMODULE gmodule-2.0>=2.12.0) -PKG_CHECK_MODULES (GTHREAD gthread-2.0>=2.12.0) +PKG_CHECK_MODULES (GLIB2 glib-2.0>=2.20) +PKG_CHECK_MODULES (GCONF2 gconf-2.0>=2.22) +PKG_CHECK_MODULES (GOBJECT gobject-2.0>=2.20) +PKG_CHECK_MODULES (GMODULE gmodule-2.0>=2.20) +PKG_CHECK_MODULES (GTHREAD gthread-2.0>=2.20) IF (MSVC) MESSAGE (STATUS "Hint: To create the import libraries for the gnome DLLs (e.g. gconf-2.lib), use the dlltool as follows: pexports bin/libgconf-2-4.dll > lib/libgconf-2.def ; dlltool -d lib/libgconf-2.def -D bin/libgconf-2-4.dll -l lib/gconf-2.lib") diff --git a/configure.ac b/configure.ac index e26f9a9665..0d9eefb577 100644 --- a/configure.ac +++ b/configure.ac @@ -227,33 +227,10 @@ if test "x$PKG_CONFIG" = x; then fi ### -------------------------------------------------------------------------- -### Glib checks.. +### Glib checks. -AM_PATH_GLIB_2_0(2.12.0,,AC_MSG_ERROR([ -*** GLIB >= 2.12 is required to build Gnucash; please make sure you have the -*** development headers installed. The latest version of GLIB is -*** always available at ftp://ftp.gnome.org/pub/gnome/sources/glib/.]), - gthread gobject gmodule) - -AC_MSG_CHECKING([for untested GLIB versions (glib >= 2.13.0)]) -if $PKG_CONFIG 'glib-2.0 >= 2.13.0' -then - AC_MSG_RESULT(yes) - HAVE_UNTESTED_GLIB=yes -else - AC_MSG_RESULT(no) -fi - -AC_MSG_CHECKING([for GLib testing (glib >= 2.16.0)]) -if $PKG_CONFIG 'glib-2.0 >= 2.16.0' -then - AC_MSG_RESULT(yes) - _have_glib_testing=yes -else - AC_MSG_RESULT(no) - _have_glib_testing=no -fi -AM_CONDITIONAL(HAVE_GLIB_TESTING, test "x$_have_glib_testing" = "xyes") +# We require glib >= 2.20, released together with gtk-2.16 +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.20 gthread-2.0 gobject-2.0 gmodule-2.0) AC_CHECK_HEADERS(dirent.h dlfcn.h dl.h utmp.h locale.h mcheck.h unistd.h wctype.h) @@ -483,7 +460,7 @@ AM_CONDITIONAL(GNC_HAVE_GUILE_WWW, test "${gnc_have_guile_www}" = yes) ### -------------------------------------------------------------------------- ### look for gconf -PKG_CHECK_MODULES(GCONF, gconf-2.0 >= "2.0") +PKG_CHECK_MODULES(GCONF, gconf-2.0 >= 2.22) # Look up gconftool-2 AC_PATH_PROG(GCONFTOOL, gconftool-2) AC_SUBST(GCONFTOOL) @@ -890,46 +867,24 @@ then fi GNOME_COMPILE_WARNINGS - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.10) + PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.16) + # Should be >= 2.18.1 once we got the win32 webkit build with newer + # gtk working. AS_SCRUB_INCLUDE(GTK_CFLAGS) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) - AC_MSG_CHECKING([for untested GTK versions (gtk > 2.11.0)]) - if $PKG_CONFIG 'gtk+-2.0 > 2.11.0' - then - AC_MSG_RESULT(yes) - HAVE_UNTESTED_GTK=yes - fi - - AC_MSG_CHECKING([for GTK >= 2.12.0]) - if $PKG_CONFIG 'gtk+-2.0 >= 2.12.0' - then - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_GTK_2_12,1,[System has gtk 2.12.0 or better]) - HAVE_GTK_2_12=yes - fi - - PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 >= 2.4) + PKG_CHECK_MODULES(GNOME, libgnomeui-2.0 >= 2.24) AS_SCRUB_INCLUDE(GNOME_CFLAGS) AC_SUBST(GNOME_CFLAGS) AC_SUBST(GNOME_LIBS) - AC_MSG_CHECKING([for untested GNOME versions (libgnome >= 2.19.0)]) - if $PKG_CONFIG 'libgnome-2.0 >= 2.19.0' - then - AC_MSG_RESULT(yes) - HAVE_UNTESTED_GNOME=yes - else - AC_MSG_RESULT(no) - fi - PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0) AS_SCRUB_INCLUDE(GDK_PIXBUF_CFLAGS) AC_SUBST(GDK_PIXBUF_CFLAGS) AC_SUBST(GDK_PIXBUF_LIBS) - PKG_CHECK_MODULES(GLADE, libglade-2.0 >= 2.4) + PKG_CHECK_MODULES(GLADE, libglade-2.0 >= 2.6) AS_SCRUB_INCLUDE(GLADE_CFLAGS) AC_SUBST(GLADE_CFLAGS) AC_SUBST(GLADE_LIBS) @@ -1052,12 +1007,8 @@ fi ###------------------------------------------------------------------------- ### Selectively disable deprecated bits of glib/gdk/gtk/gnome ###------------------------------------------------------------------------- -if test x${HAVE_UNTESTED_GLIB} = "xyes" -then - allow_deprecated=true -else - allow_deprecated=false -fi + +allow_deprecated=true AC_ARG_ENABLE(deprecated-glib, [AS_HELP_STRING([--disable-deprecated-glib],[don't use deprecated glib functions])], [case "${enableval}" in @@ -1067,16 +1018,13 @@ AC_ARG_ENABLE(deprecated-glib, ) if test x${allow_deprecated} != "xtrue" then + # FIXME: This define is unused; this block can be removed AC_DEFINE(G_DISABLE_DEPRECATED,1, [Don't use deprecated glib functions]) fi -if test x${HAVE_UNTESTED_GTK} = "xyes" -then - allow_deprecated=true -else - allow_deprecated=false -fi +# default: Allow deprecated gtk functions +allow_deprecated=true AC_ARG_ENABLE(deprecated-gtk, [AS_HELP_STRING([--disable-deprecated-gtk],[don't use deprecated gtk, gdk or gdk-pixbuf functions])], [case "${enableval}" in @@ -1086,18 +1034,14 @@ AC_ARG_ENABLE(deprecated-gtk, ) if test x${allow_deprecated} != "xtrue" then + # FIXME: This define is unused; this block can be removed AC_DEFINE(GTK_DISABLE_DEPRECATED,1, [Don't use deprecated gtk functions]) AC_DEFINE(GDK_DISABLE_DEPRECATED,1, [Don't use deprecated gdk functions]) AC_DEFINE(GDK_PIXBUF_DISABLE_DEPRECATED,1, [Don't use deprecated gdk-pixbuf functions]) fi -if test x${HAVE_UNTESTED_GNOME} = "xyes" -then - allow_deprecated=true -else - allow_deprecated=false -fi +allow_deprecated=true AC_ARG_ENABLE(deprecated-gnome, [AS_HELP_STRING([--disable-deprecated-gnome],[don't use deprecated gnome functions])], [case "${enableval}" in @@ -1107,6 +1051,7 @@ AC_ARG_ENABLE(deprecated-gnome, ) if test x${allow_deprecated} != "xtrue" then + # FIXME: This define is unused; this block can be removed AC_DEFINE(GNOME_DISABLE_DEPRECATED,1, [Don't use deprecated gnome functions]) fi diff --git a/src/gnome-utils/dialog-account.c b/src/gnome-utils/dialog-account.c index 7fafa65a7f..6e66d43c14 100644 --- a/src/gnome-utils/dialog-account.c +++ b/src/gnome-utils/dialog-account.c @@ -366,12 +366,7 @@ gnc_ui_to_account(AccountWindow *aw) xaccAccountSetDescription (account, string); gtk_color_button_get_color(GTK_COLOR_BUTTON(aw->color_entry_button), &color ); -#ifdef HAVE_GTK_2_12 string = gdk_color_to_string(&color); -#else - /* gdk_color_to_string requires gtk >= 2.12 */ - string = g_strdup_printf("#%04X%04X%04X", color.red, color.green, color.blue); -#endif if (safe_strcmp (string, DEFAULT_COLOR) == 0) string = "Not Set"; diff --git a/src/libqof/qof/Makefile.am b/src/libqof/qof/Makefile.am index 5503cf8d62..9e551311e3 100644 --- a/src/libqof/qof/Makefile.am +++ b/src/libqof/qof/Makefile.am @@ -1,8 +1,4 @@ -if HAVE_GLIB_TESTING SUBDIRS = . test -else -SUBDIRS = . -endif lib_LTLIBRARIES = libgnc-qof.la