From 9d4a8b40d69eff2a6052181373efec9853d3bb29 Mon Sep 17 00:00:00 2001
From: Christian Stimming <stimming@tuhh.de>
Date: Wed, 3 Apr 2013 13:21:21 +0000
Subject: [PATCH] Win32 build: Can we get along without libgsf-gnome?

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22869 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 packaging/win32/defaults.sh     | 2 +-
 packaging/win32/install-impl.sh | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh
index 0f245c928a..1a1c4b2002 100644
--- a/packaging/win32/defaults.sh
+++ b/packaging/win32/defaults.sh
@@ -284,7 +284,7 @@ set_default PCRE_BIN_URL "$SF_MIRROR/gnuwin32/pcre-7.0-bin.zip"
 set_default PCRE_LIB_URL "$SF_MIRROR/gnuwin32/pcre-7.0-lib.zip"
 set_default PCRE_DIR $GLOBAL_DIR\\pcre
 
-LIBGSF_VERSION="1.14.17"
+LIBGSF_VERSION="1.14.26"
 set_default LIBGSF_URL "$GNOME_MIRROR/sources/libgsf/1.14/libgsf-${LIBGSF_VERSION}.tar.bz2"
 set_default LIBGSF_DIR $GLOBAL_DIR\\libgsf
 
diff --git a/packaging/win32/install-impl.sh b/packaging/win32/install-impl.sh
index 3bf4370524..952030e6c8 100644
--- a/packaging/win32/install-impl.sh
+++ b/packaging/win32/install-impl.sh
@@ -995,7 +995,7 @@ function inst_libgsf() {
     _LIBGSF_UDIR=`unix_path $LIBGSF_DIR`
     add_to_env $_LIBGSF_UDIR/bin PATH
     add_to_env $_LIBGSF_UDIR/lib/pkgconfig PKG_CONFIG_PATH
-    if quiet ${PKG_CONFIG} --exists libgsf-1 libgsf-gnome-1 &&
+    if quiet ${PKG_CONFIG} --exists libgsf-1 &&
         quiet ${PKG_CONFIG} --atleast-version=${LIBGSF_VERSION} libgsf-1
     then
         echo "libgsf already installed in $_LIBGSF_UDIR.  skipping."
@@ -1008,7 +1008,6 @@ function inst_libgsf() {
                 --prefix=$_LIBGSF_UDIR \
                 --disable-static \
                 --without-python \
-                --with-gnome-vfs \
                 CPPFLAGS="${GNOME_CPPFLAGS}" \
                 LDFLAGS="${GNOME_LDFLAGS}"
             make
@@ -1016,7 +1015,7 @@ function inst_libgsf() {
             make install
         qpopd
         ${PKG_CONFIG} --exists libgsf-1 || die "libgsf not installed correctly: No libgsf-1"
-        ${PKG_CONFIG} --exists libgsf-gnome-1 || die "libgsf not installed correctly: No libgsf-gnome-1"
+        #${PKG_CONFIG} --exists libgsf-gnome-1 || die "libgsf not installed correctly: No libgsf-gnome-1"
     fi
 }