r22813 - gnucash/trunk/packaging/win32 - Winbuild: remove obsolete pixman dependency

[Geert Janssens]

Author: gjanssens
Date: 2013-02-25 05:13:26 -0500 (Mon, 25 Feb 2013)
New Revision: 22813
Trac: http://svn.gnucash.org/trac/changeset/22813

Modified:
   gnucash/trunk/packaging/win32/crossbuild_webkit.sh
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/dist-impl.sh
   gnucash/trunk/packaging/win32/install-impl.sh
Log:
Winbuild: remove obsolete pixman dependency

It was an internal depencency of libgnomeui, which
is no longer used for GnuCash

I found one more reference to libgnomeui in the
crosbuild_webkit.sh script. I have removed it there as well.

Modified: gnucash/trunk/packaging/win32/crossbuild_webkit.sh
===================================================================
--- gnucash/trunk/packaging/win32/crossbuild_webkit.sh	2013-02-23 22:53:02 UTC (rev 22812)
+++ gnucash/trunk/packaging/win32/crossbuild_webkit.sh	2013-02-25 10:13:26 UTC (rev 22813)
@@ -246,8 +246,7 @@
         add_to_env pkg-config PKG_CONFIG
     fi
     if quiet gconftool-2 --version &&
-        quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 pixman-1 &&
-        [ -f $_GNOME_UDIR/lib/pkgconfig/pixman-1.pc ] &&
+        quiet ${PKG_CONFIG} --exists gconf-2.0 gtk+-2.0 cairo libxml-2.0 &&
         quiet intltoolize --version
     then
         echo "gnome packages installed."

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2013-02-23 22:53:02 UTC (rev 22812)
+++ gnucash/trunk/packaging/win32/defaults.sh	2013-02-25 10:13:26 UTC (rev 22813)
@@ -277,9 +277,6 @@
 set_default ZLIB_DEV_URL            "$GNOME_WIN32_DEPS_URL/zlib-dev_1.2.5-2_win32.zip"
 set_default GNOME_DIR $GLOBAL_DIR\\gnome
 
-PIXMAN_VERSION="0.22.0"
-set_default PIXMAN_URL              "http://www.cairographics.org/releases/pixman-${PIXMAN_VERSION}.tar.gz"
-
 set_default SWIG_URL "$SF_MIRROR/swig/swigwin-1.3.36.zip"
 set_default SWIG_DIR $GLOBAL_DIR\\swig
 

Modified: gnucash/trunk/packaging/win32/dist-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/dist-impl.sh	2013-02-23 22:53:02 UTC (rev 22812)
+++ gnucash/trunk/packaging/win32/dist-impl.sh	2013-02-25 10:13:26 UTC (rev 22813)
@@ -116,8 +116,6 @@
     mv $TMP_UDIR/gtk2_prefs-*/gtk2_prefs.exe $DIST_DIR/bin
     rm -rf $TMP_UDIR/gtk2_prefs-*
 
-    wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $DIST_DIR
-
     cp -a $_GNOME_UDIR/bin/libxml*.dll $DIST_DIR/bin
 
     rm -rf $DIST_UDIR/etc/gconf/gconf.xml.defaults/{desktop,schemas}

Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh	2013-02-23 22:53:02 UTC (rev 22812)
+++ gnucash/trunk/packaging/win32/install-impl.sh	2013-02-25 10:13:26 UTC (rev 22813)
@@ -506,7 +506,6 @@
         quiet ${PKG_CONFIG} --atleast-version=${GCONF_VERSION} gconf-2.0 &&
         quiet ${PKG_CONFIG} --atleast-version=${GTK_VERSION} gtk+-2.0 &&
         quiet ${PKG_CONFIG} --atleast-version=${CAIRO_VERSION} cairo &&
-        quiet ${PKG_CONFIG} --atleast-version=${PIXMAN_VERSION} pixman-1 &&
         quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 &&
         quiet intltoolize --version
     then
@@ -598,25 +597,6 @@
             rm -rf $TMP_UDIR/gtk-doc-*
         qpopd
 
-        if quiet ${PKG_CONFIG} --exact-version=${PIXMAN_VERSION} pixman-1 ; then
-            echo "Pixman already compiled+installed"
-        else
-            wget_unpacked $PIXMAN_URL $DOWNLOAD_DIR $TMP_DIR
-            assert_one_dir $TMP_UDIR/pixman-*
-            qpushd $TMP_UDIR/pixman-*
-	        GLIB_CPPFLAGS=`${PKG_CONFIG} --cflags glib-2.0`
-                GTK_CPPFLAGS="-I${_GNOME_UDIR}/include/gtk-2.0"
-                ./configure ${HOST_XCOMPILE} \
-                    --prefix=$_GNOME_UDIR \
-                    --disable-static \
-                    CPPFLAGS="${GLIB_CPPFLAGS} ${GTK_CPPFLAGS}"
-                make
-                make install
-            qpopd
-            rm -rf $TMP_UDIR/pixman-*
-        fi
-        quiet ${PKG_CONFIG} --exact-version=${PIXMAN_VERSION} pixman-1 || die "pixman not installed correctly"
-
         if quiet ${PKG_CONFIG} --exact-version=${LIBXML2_VERSION} libxml-2.0 ; then
             echo "Libxml2 already compiled + installed"
         else