From 9b9409ece53cbae2254eecd2fd208a285059e73b Mon Sep 17 00:00:00 2001
From: Geert Janssens <janssens-geert@telenet.be>
Date: Mon, 25 Feb 2013 10:13:26 +0000
Subject: [PATCH] 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.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22813 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 packaging/win32/crossbuild_webkit.sh |  3 +--
 packaging/win32/defaults.sh          |  3 ---
 packaging/win32/dist-impl.sh         |  2 --
 packaging/win32/install-impl.sh      | 20 --------------------
 4 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/packaging/win32/crossbuild_webkit.sh b/packaging/win32/crossbuild_webkit.sh
index d9cfe4c2d5..06cafe368c 100755
--- a/packaging/win32/crossbuild_webkit.sh
+++ b/packaging/win32/crossbuild_webkit.sh
@@ -246,8 +246,7 @@ function check_gnome() {
         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."
diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh
index 54e9d4262e..5417631772 100644
--- a/packaging/win32/defaults.sh
+++ b/packaging/win32/defaults.sh
@@ -277,9 +277,6 @@ set_default ZLIB_URL                "$GNOME_WIN32_DEPS_URL/zlib_1.2.5-2_win32.zi
 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
 
diff --git a/packaging/win32/dist-impl.sh b/packaging/win32/dist-impl.sh
index 44b387a023..8f29c30d3f 100755
--- a/packaging/win32/dist-impl.sh
+++ b/packaging/win32/dist-impl.sh
@@ -116,8 +116,6 @@ function dist_gnome() {
     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}
diff --git a/packaging/win32/install-impl.sh b/packaging/win32/install-impl.sh
index 85dab6df2a..69604f3453 100644
--- a/packaging/win32/install-impl.sh
+++ b/packaging/win32/install-impl.sh
@@ -506,7 +506,6 @@ function inst_gnome() {
         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 @@ EOF
             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