r20613 - gnucash/trunk/packaging/win32 - Win32 build: Fix pixman URL (old version has disappeared from URL)

[Christian Stimming]

Author: cstim
Date: 2011-05-08 16:05:33 -0400 (Sun, 08 May 2011)
New Revision: 20613
Trac: http://svn.gnucash.org/trac/changeset/20613

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install-impl.sh
Log:
Win32 build: Fix pixman URL (old version has disappeared from URL)

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2011-05-07 16:26:25 UTC (rev 20612)
+++ gnucash/trunk/packaging/win32/defaults.sh	2011-05-08 20:05:33 UTC (rev 20613)
@@ -278,7 +278,6 @@
 set_default ORBIT2_DEV_URL          "$GNOME_WIN32_URL/ORBit2/2.14/ORBit2-dev_2.14.16-1_win32.zip"
 set_default PANGO_URL               "$GNOME_WIN32_URL/pango/1.28/pango_1.28.3-1_win32.zip"
 set_default PANGO_DEV_URL           "$GNOME_WIN32_URL/pango/1.28/pango-dev_1.28.3-1_win32.zip"
-set_default PIXMAN_DEV_URL          "$GNOME_WIN32_DEPS_URL/pixman-dev_0.20.0-1_win32.zip"
 set_default PKG_CONFIG_URL          "$GNOME_WIN32_DEPS_URL/pkg-config_0.25-1_win32.zip"
 set_default PKG_CONFIG_DEV_URL      "$GNOME_WIN32_DEPS_URL/pkg-config-dev_0.25-1_win32.zip"
 set_default POPT_URL                "$GNOME_WIN32_DEPS_URL/popt-1.10.2-tml-20050828.zip"
@@ -287,7 +286,8 @@
 set_default ZLIB_DEV_URL            "$GNOME_WIN32_DEPS_URL/zlib-dev_1.2.5-2_win32.zip"
 set_default GNOME_DIR $GLOBAL_DIR\\gnome
 
-set_default PIXMAN_URL              "http://cairographics.org/releases/pixman-0.17.6.tar.gz"
+PIXMAN_VERSION="0.22.0"
+set_default PIXMAN_URL              "http://www.cairographics.org/releases/pixman-${PIXMAN_VERSION}.tar.gz"
 
 set_default LIBBONOBOUI_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui_2.24.0-1_win32.zip"
 set_default LIBBONOBOUI_DEV_URL "$GNOME_WIN32_URL/libbonoboui/2.24/libbonoboui-dev_2.24.0-1_win32.zip"

Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh	2011-05-07 16:26:25 UTC (rev 20612)
+++ gnucash/trunk/packaging/win32/install-impl.sh	2011-05-08 20:05:33 UTC (rev 20613)
@@ -484,6 +484,7 @@
         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 intltoolize --version
     then
         echo "gnome packages installed in $_GNOME_UDIR.  skipping."
@@ -595,21 +596,26 @@
             qpopd
         fi
 
-        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
-        ${PKG_CONFIG} --exists pixman-1 || die "pixman not installed correctly"
-        rm -rf $TMP_UDIR/pixman-*
 
+        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"
+
         wget_unpacked $LIBXML2_SRC_URL $DOWNLOAD_DIR $TMP_DIR
         assert_one_dir $TMP_UDIR/libxml2-*
         qpushd $TMP_UDIR/libxml2-*