r19575 - gnucash/trunk/packaging/win32 - Win32 build: Add version number checks for gtk and gconf so that updating them should work more easily.

[Christian Stimming]

Author: cstim
Date: 2010-09-14 15:26:30 -0400 (Tue, 14 Sep 2010)
New Revision: 19575
Trac: http://svn.gnucash.org/trac/changeset/19575

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install-impl.sh
Log:
Win32 build: Add version number checks for gtk and gconf so that updating them should work more easily.

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2010-09-14 19:26:17 UTC (rev 19574)
+++ gnucash/trunk/packaging/win32/defaults.sh	2010-09-14 19:26:30 UTC (rev 19575)
@@ -232,8 +232,9 @@
 set_default PANGO_DEV_URL "$GNOME_WIN32_URL/pango/1.26/pango-dev_1.26.2-1_win32.zip"
 set_default LIBART_LGPL_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.20.zip"
 set_default LIBART_LGPL_DEV_URL "$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.20.zip"
-set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+_2.16.6-2_win32.zip"
-set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+-dev_2.16.6-2_win32.zip"
+GTK_VERSION="2.16.6"
+set_default GTK_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+_${GTK_VERSION}-2_win32.zip"
+set_default GTK_DEV_URL "$GNOME_WIN32_URL/gtk+/2.16/gtk+-dev_${GTK_VERSION}-2_win32.zip"
 set_default INTLTOOL_URL "$GNOME_WIN32_URL/intltool/0.40/intltool_0.40.4-1_win32.zip"
 set_default ORBIT2_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-2.14.13.zip"
 set_default ORBIT2_DEV_URL "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev-2.14.13.zip"
@@ -241,8 +242,9 @@
 set_default GAIL_DEV_URL "$GNOME_WIN32_URL/gail/1.22/gail-dev-1.22.0.zip"
 set_default POPT_URL "$GNOME_WIN32_DEPS_URL/popt-1.10.2-tml-20050828.zip"
 set_default POPT_DEV_URL "$GNOME_WIN32_DEPS_URL/popt-dev-1.10.2-tml-20050828.zip"
-set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.22/GConf_2.22.0-3_win32.zip"
-set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.22/GConf-dev_2.22.0-3_win32.zip"
+GCONF_VERSION="2.22.0"
+set_default GCONF_URL "$GNOME_WIN32_URL/GConf/2.22/GConf_${GCONF_VERSION}-3_win32.zip"
+set_default GCONF_DEV_URL "$GNOME_WIN32_URL/GConf/2.22/GConf-dev_${GCONF_VERSION}-3_win32.zip"
 set_default LIBBONOBO_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo_2.24.0-1_win32.zip"
 set_default LIBBONOBO_DEV_URL "$GNOME_WIN32_URL/libbonobo/2.24/libbonobo-dev_2.24.0-1_win32.zip"
 set_default GNOME_VFS_URL "$GNOME_WIN32_URL/gnome-vfs/2.24/gnome-vfs_2.24.1-1_win32.zip"

Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh	2010-09-14 19:26:17 UTC (rev 19574)
+++ gnucash/trunk/packaging/win32/install-impl.sh	2010-09-14 19:26:30 UTC (rev 19575)
@@ -519,6 +519,8 @@
     fi
     if quiet gconftool-2 --version &&
         quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 &&
+        quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
+        quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
         quiet intltoolize --version
     then
         echo "gnome packages installed.  skipping."