Skip to content

Commit

Permalink
Add libtiff and libjpeg to the collection of precompiled packages
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jralls committed Nov 10, 2014
1 parent 5997773 commit cc7e9ac
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
6 changes: 2 additions & 4 deletions defaults.sh
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion dist-impl.sh
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions install-impl.sh
Expand Up @@ -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
Expand Down

0 comments on commit cc7e9ac

Please sign in to comment.