gnucash-on-windows master: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/cc7e9ac9 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/5997773e (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/78737c61 (commit)



commit cc7e9ac9d8ad941d89cb9db2d453315733137ae4
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Nov 9 18:17:49 2014 -0800

    Add libtiff and libjpeg to the collection of precompiled packages
    
    We were using precompiled packages of these before from the Gnome binary
    collection, but that libtiff had an obsolete link request to
    libjpeg-uchar-boolean-8.dll. These editions are compiled from the latest
    sources and should avoid the bad rpath.

diff --git a/defaults.sh b/defaults.sh
index f8ce978..81056a2 100644
--- a/defaults.sh
+++ b/defaults.sh
@@ -255,12 +255,10 @@ set_default LIBART_LGPL_DEV_URL     "$GNOME_WIN32_URL/libart_lgpl/2.3/libart-lgp
 set_default LIBGNOMECANVAS_URL      "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas_2.30.1-1_win32.zip"
 set_default LIBGNOMECANVAS_DEV_URL  "$GNOME_WIN32_URL/libgnomecanvas/2.30/libgnomecanvas-dev_2.30.1-1_win32.zip"
 set_default LIBICONV_URL            "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip"
-set_default LIBJPEG_URL             "$SF_MIRROR/gnucash/jpeg_7-1-fixed-win32.zip"
-set_default LIBJPEG_DEV_URL         "$GNOME_WIN32_DEPS_URL/jpeg-dev_7-1_win32.zip"
 set_default LIBPNG_URL              "$GNOME_WIN32_DEPS_URL/libpng_1.4.3-1_win32.zip"
 set_default LIBPNG_DEV_URL          "$GNOME_WIN32_DEPS_URL/libpng-dev_1.4.3-1_win32.zip"
-set_default LIBTIFF_URL             "$GNOME_WIN32_DEPS_URL/libtiff_3.9.2-1_win32.zip"
-set_default LIBTIFF_DEV_URL         "$GNOME_WIN32_DEPS_URL/libtiff-dev_3.9.2-1_win32.zip"
+set_default LIBTIFF_URL             "$GC_DEPS_URL/tiff-4.0.3-mingw.tgz"
+set_default LIBTIFF_DEV_URL         "$GC_DEPS_URL/tiff-4.0.3-dev-mingw.tgz"
 set_default LIBXML2_URL             "$GNOME_WIN32_DEPS_URL/libxml2_2.7.7-1_win32.zip"
 set_default LIBXML2_DEV_URL         "$GNOME_WIN32_DEPS_URL/libxml2-dev_2.7.7-1_win32.zip"
 set_default PKG_CONFIG_URL          "$GNOME_WIN32_DEPS_URL/pkg-config_0.25-1_win32.zip"
diff --git a/dist-impl.sh b/dist-impl.sh
index f4fe538..f762c88 100755
--- a/dist-impl.sh
+++ b/dist-impl.sh
@@ -97,7 +97,6 @@ function dist_gnome() {
     wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $DIST_DIR
     smart_wget $LIBICONV_URL $DOWNLOAD_DIR
     unzip -q $LAST_FILE bin/iconv.dll -d $DIST_DIR
-    wget_unpacked $LIBJPEG_URL $DOWNLOAD_DIR $DIST_DIR
     wget_unpacked $LIBPNG_URL $DOWNLOAD_DIR $DIST_DIR
     wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $DIST_DIR
     #wget_unpacked $LIBXML2_URL $DOWNLOAD_DIR $DIST_DIR
diff --git a/install-impl.sh b/install-impl.sh
index 32236f7..6f4f7af 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -378,8 +378,6 @@ function inst_gnome() {
         wget_unpacked $LIBART_LGPL_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $LIBGNOMECANVAS_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $LIBGNOMECANVAS_DEV_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
         wget_unpacked $LIBPNG_DEV_URL $DOWNLOAD_DIR $GNOME_DIR
         wget_unpacked $LIBTIFF_URL $DOWNLOAD_DIR $GNOME_DIR

commit 5997773ecde99e5e7caf6efa0571020e9d72fc1e
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Nov 9 14:38:19 2014 -0800

    Rewrite /c/gcdev/ to $GLOBAL_DIR in targeted libtool archives.
    
    * Ensures all directly-linked libtool archives in "dependency_libs" are
    linked from the right directory
    * Reduces the number of "appears to have been moved" warnings.

diff --git a/functions.sh b/functions.sh
index 4502268..620b40b 100644
--- a/functions.sh
+++ b/functions.sh
@@ -317,8 +317,14 @@ function fix_lt_file () {
     orig_dir=`grep ^libdir= $filename | cut -d "'" -f 2`
     orig_dir=`dirname $orig_dir`
     target_dir="$1"/`echo $(dirname "$filename") | sed -e"s;$1/;;"`
-
-    sed -i'.bak' -E -e"s;-L$orig_dir;-L$target_dir;g" -e"s;([/a-z0-9A-Z:_-]+)/lib([a-zA-Z0-9._-]+)\.la;-L\1 -l\2;g" -e"s;^libdir=.*$;libdir='$target_dir';" $filename
+    global_udir=`unix_path ${GLOBAL_DIR}`
+
+    sed -i'.bak' -E \
+        -e"s;-L$orig_dir;-L$target_dir;g" \
+        -e"s;([/a-z0-9A-Z:_-]+)/lib([a-zA-Z0-9._-]+)\.la;-L\1 -l\2;g" \
+        -e"s;^libdir=.*$;libdir='$target_dir';" \
+        -e"s;(/c|c:)/gcdev/;$global_udir/;g" \
+        $filename
 }
 
 function fix_libtool_files () {
diff --git a/install-impl.sh b/install-impl.sh
index d71338b..32236f7 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1149,6 +1149,7 @@ function inst_webkit() {
             mkdir -p $_WEBKIT_UDIR
             wget_unpacked $WEBKIT_URL $DOWNLOAD_DIR $WEBKIT_DIR
             wget_unpacked $WEBKIT_DEV_URL $DOWNLOAD_DIR $WEBKIT_DIR
+            fix_libtool_files ${_WEBKIT_UDIR}
         fi
         quiet ${PKG_CONFIG} --exists webkit-1.0 || die "webkit not installed correctly"
         rm -rf ${TMP_UDIR}/webkit-*



Summary of changes:
 defaults.sh     |  6 ++----
 dist-impl.sh    |  1 -
 functions.sh    | 10 ++++++++--
 install-impl.sh |  3 +--
 4 files changed, 11 insertions(+), 9 deletions(-)