From f5e7bbb7b0fd6d46d049feeea47f2a89204e9df6 Mon Sep 17 00:00:00 2001 From: Stephane Delcroix Date: Mon, 5 Jan 2009 16:30:59 +0000 Subject: [PATCH] 2009-01-05 Stephane Delcroix * bootstrap-2.14: * bootstrap-generic: * configure.in.in: depend on glib/gio 2.18 svn path=/trunk/gtk-sharp/; revision=122467 --- ChangeLog | 6 ++++++ bootstrap-2.14 | 3 ++- bootstrap-generic | 1 + configure.in.in | 5 +++-- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 542cec2ff..99fc51bc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-01-05 Stephane Delcroix + + * bootstrap-2.14: + * bootstrap-generic: + * configure.in.in: depend on glib/gio 2.18 + 2009-01-04 Mike Kestner * *: update to 2.14. parser support for GSEALed fields. svn build diff --git a/bootstrap-2.14 b/bootstrap-2.14 index 8a1e34589..997b97743 100755 --- a/bootstrap-2.14 +++ b/bootstrap-2.14 @@ -4,7 +4,8 @@ GTK_SHARP_VERSION=2.13.90 ASSEMBLY_VERSION=2.14.0.0 POLICY_VERSIONS="2.4 2.6 2.8 2.10 2.12" -GTK_REQUIRED_VERSION=2.13.5 +GTK_REQUIRED_VERSION=2.14.3 +GLIB_REQUIRED_VERSION=2.18.1 VERSIONCSDEFINES="-define:GTK_SHARP_2_6 -define:GTK_SHARP_2_8 -define:GTK_SHARP_2_10 -define:GTK_SHARP_2_12 -define:GTK_SHARP_2_14" VERSIONCFLAGS="-DGTK_SHARP_2_6 -DGTK_SHARP_2_8 -DGTK_SHARP_2_10 -DGTK_SHARP_2_12 -DGTK_SHARP_2_14" GTK_API_TAG=2.14 diff --git a/bootstrap-generic b/bootstrap-generic index 5850ec963..6df03651e 100755 --- a/bootstrap-generic +++ b/bootstrap-generic @@ -16,6 +16,7 @@ set -x sed -e "s/@GTK_SHARP_VERSION@/$GTK_SHARP_VERSION/" \ -e "s/@GTK_REQUIRED_VERSION@/$GTK_REQUIRED_VERSION/" \ + -e "s/@GLIB_REQUIRED_VERSION@/$GLIB_REQUIRED_VERSION/" \ -e "s/@VERSIONCSDEFINES@/$VERSIONCSDEFINES/" \ -e "s/@VERSIONCFLAGS@/$VERSIONCFLAGS/" \ -e "s/@POLICY_VERSIONS@/$POLICY_VERSIONS/" \ diff --git a/configure.in.in b/configure.in.in index 990cce0e3..46441db9d 100644 --- a/configure.in.in +++ b/configure.in.in @@ -169,12 +169,13 @@ PKG_CHECK_MODULES(MONO_CAIRO, mono-cairo >= $MONO_REQUIRED_VERSION, enable_mono_ AC_SUBST(MONO_CAIRO_LIBS) GTK_REQUIRED_VERSION=@GTK_REQUIRED_VERSION@ +GLIB_REQUIRED_VERSION=@GLIB_REQUIRED_VERSION@ -PKG_CHECK_MODULES(GLIB, gobject-2.0 >= $GTK_REQUIRED_VERSION) +PKG_CHECK_MODULES(GLIB, gobject-2.0 >= $GLIB_REQUIRED_VERSION) AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) -PKG_CHECK_MODULES(GIO, gio-2.0 >= $GTK_REQUIRED_VERSION) +PKG_CHECK_MODULES(GIO, gio-2.0 >= $GLIB_REQUIRED_VERSION) AC_SUBST(GIO_CFLAGS) AC_SUBST(GIO_LIBS)