r19601 - gnucash/trunk/packaging/win32 - Win32 build: The existing webkit binary needs libjpeg-7, so we install that one, too.

[Christian Stimming]

Author: cstim
Date: 2010-09-21 15:48:54 -0400 (Tue, 21 Sep 2010)
New Revision: 19601
Trac: http://svn.gnucash.org/trac/changeset/19601

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install-impl.sh
Log:
Win32 build: The existing webkit binary needs libjpeg-7, so we install that one, too.

Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2010-09-21 19:26:49 UTC (rev 19600)
+++ gnucash/trunk/packaging/win32/defaults.sh	2010-09-21 19:48:54 UTC (rev 19601)
@@ -211,6 +211,7 @@
 set_default GLIB_URL "$GNOME_WIN32_URL/glib/2.24/glib_2.24.2-2_win32.zip"
 set_default GLIB_DEV_URL "$GNOME_WIN32_URL/glib/2.24/glib-dev_2.24.2-2_win32.zip"
 #set_default LIBJPEG_URL "$SF_MIRROR/gnucash/jpeg_7-1-fixed-win32.zip" # ?!?
+set_default LIBJPEG_7_URL  "$GNOME_WIN32_DEPS_URL/jpeg_7-1_win32.zip"
 set_default LIBJPEG_URL  "$GNOME_WIN32_DEPS_URL/jpeg_8-1_win32.zip"
 set_default LIBJPEG_DEV_URL "$GNOME_WIN32_DEPS_URL/jpeg-dev_8-1_win32.zip"
 set_default LIBPNG_URL "$GNOME_WIN32_DEPS_URL/libpng_1.4.3-1_win32.zip"

Modified: gnucash/trunk/packaging/win32/install-impl.sh
===================================================================
--- gnucash/trunk/packaging/win32/install-impl.sh	2010-09-21 19:26:49 UTC (rev 19600)
+++ gnucash/trunk/packaging/win32/install-impl.sh	2010-09-21 19:48:54 UTC (rev 19601)
@@ -543,6 +543,7 @@
         wget_unpacked $LIBICONV_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $GLIB_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $GLIB_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
+        wget_unpacked $LIBJPEG_7_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $LIBJPEG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $GNOME_DIR