r22869 - gnucash/trunk/packaging/win32 - Win32 build: Can we get along without libgsf-gnome?

Christian Stimming cstim at code.gnucash.org
Wed Apr 3 09:21:22 EDT 2013


Author: cstim
Date: 2013-04-03 09:21:21 -0400 (Wed, 03 Apr 2013)
New Revision: 22869
Trac: http://svn.gnucash.org/trac/changeset/22869

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install-impl.sh
Log:
Win32 build: Can we get along without libgsf-gnome?

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2013-04-03 08:21:54 UTC (rev 22868)
+++ gnucash/trunk/packaging/win32/defaults.sh	2013-04-03 13:21:21 UTC (rev 22869)
@@ -284,7 +284,7 @@
 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
 

Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh	2013-04-03 08:21:54 UTC (rev 22868)
+++ gnucash/trunk/packaging/win32/install-impl.sh	2013-04-03 13:21:21 UTC (rev 22869)
@@ -995,7 +995,7 @@
     _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 @@
                 --prefix=$_LIBGSF_UDIR \
                 --disable-static \
                 --without-python \
-                --with-gnome-vfs \
                 CPPFLAGS="${GNOME_CPPFLAGS}" \
                 LDFLAGS="${GNOME_LDFLAGS}"
             make
@@ -1016,7 +1015,7 @@
             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
 }
 



More information about the gnucash-changes mailing list