diff --git a/packaging/win32/custom.sh b/packaging/win32/custom.sh index 25a5542bdf..26fca268a2 100644 --- a/packaging/win32/custom.sh +++ b/packaging/win32/custom.sh @@ -50,6 +50,8 @@ WGET_DIR=$GLOBAL_DIR\\wget SF_MIRROR="http://heanet.dl.sourceforge.net/sourceforge" GTK_MIRROR="ftp.gtk.org/pub" GNOME_MIRROR="ftp.gnome.org/pub/gnome" +GNOME_WIN32_URL="$GNOME_MIRROR/binaries/win32" +GNOME_WIN32_DEPS_URL="$GNOME_WIN32_URL/dependencies" DTK_URL="$SF_MIRROR/mingw/msysDTK-1.0.1.exe" @@ -60,8 +62,8 @@ UNZIP_URL="$SF_MIRROR/gnuwin32/unzip-5.51-1.exe" UNZIP_DIR=$GLOBAL_DIR\\unzip # do not use regex-gnu or regex-spencer v3.8.g3, see bug #382852 -REGEX_BIN_URL="$SF_MIRROR/gnuwin32/regex-spencer-3.8-bin.zip" -REGEX_LIB_URL="$SF_MIRROR/gnuwin32/regex-spencer-3.8-lib.zip" +REGEX_URL="$GNOME_WIN32_DEPS_URL/libgnurx-2.5.zip" +REGEX_DEV_URL="$GNOME_WIN32_DEPS_URL/libgnurx-dev-2.5.zip" REGEX_DIR=$GLOBAL_DIR\\regex READLINE_BIN_URL="$SF_MIRROR/gnuwin32/readline-5.0-bin.zip" @@ -93,13 +95,11 @@ PEXPORTS_DIR=$GLOBAL_DIR\\pexports LIBXML2_URL="http://www.zlatkovic.com/pub/libxml/libxml2-2.6.27.win32.zip" LIBXML2_DIR=$GLOBAL_DIR\\gnome #avoid XML_FLAGS -GNOME_WIN32_URL="$GNOME_MIRROR/binaries/win32" -GNOME_WIN32_DEPS_URL="$GNOME_WIN32_URL/dependencies" GETTEXT_URL="$GNOME_WIN32_DEPS_URL/gettext-0.14.5.zip" GETTEXT_DEV_URL="$GNOME_WIN32_DEPS_URL/gettext-dev-0.14.5.zip" LIBICONV_URL="$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip" -GLIB_URL="$GNOME_WIN32_URL/glib/2.12/glib-2.12.4.zip" -GLIB_DEV_URL="$GNOME_WIN32_URL/glib/2.12/glib-dev-2.12.4.zip" +GLIB_URL="$GNOME_WIN32_URL/glib/2.12/glib-2.12.9.zip" +GLIB_DEV_URL="$GNOME_WIN32_URL/glib/2.12/glib-dev-2.12.9.zip" LIBJPEG_URL="$GNOME_WIN32_DEPS_URL/libjpeg-6b-4.zip" LIBPNG_URL="$GTK_MIRROR/gtk/v2.10/win32/dependencies/libpng-1.2.8-bin.zip" ZLIB_URL="$GTK_MIRROR/gtk/v2.10/win32/dependencies/zlib123-dll.zip" @@ -109,16 +109,16 @@ CAIRO_DEV_URL="$GNOME_WIN32_DEPS_URL/cairo-dev-1.2.6.zip" EXPAT_URL="$GNOME_WIN32_DEPS_URL/expat-2.0.0.zip" FONTCONFIG_URL="$GNOME_WIN32_DEPS_URL/fontconfig-2.3.2-tml-20060825.zip" FONTCONFIG_DEV_URL="$GNOME_WIN32_DEPS_URL/fontconfig-dev-2.3.2-tml-20060825.zip" -FREETYPE_URL="$GNOME_WIN32_DEPS_URL/freetype-2.1.10.zip" -FREETYPE_DEV_URL="$SF_MIRROR/gnuwin32/freetype-2.1.10-lib.zip" +FREETYPE_URL="$GNOME_WIN32_DEPS_URL/freetype-2.2.1.zip" +FREETYPE_DEV_URL="$GNOME_WIN32_DEPS_URL/freetype-dev-2.2.1.zip" ATK_URL="$GNOME_WIN32_URL/atk/1.12/atk-1.12.3.zip" ATK_DEV_URL="$GNOME_WIN32_URL/atk/1.12/atk-dev-1.12.3.zip" -PANGO_URL="$GNOME_WIN32_URL/pango/1.14/pango-1.14.5.zip" -PANGO_DEV_URL="$GNOME_WIN32_URL/pango/1.14/pango-dev-1.14.5.zip" +PANGO_URL="$GNOME_WIN32_URL/pango/1.14/pango-1.14.9.zip" +PANGO_DEV_URL="$GNOME_WIN32_URL/pango/1.14/pango-dev-1.14.9.zip" LIBART_LGPL_URL="$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-2.3.17.zip" LIBART_LGPL_DEV_URL="$GNOME_WIN32_URL/libart_lgpl/2.3/libart_lgpl-dev-2.3.17.zip" -GTK_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-2.10.6.zip" -GTK_DEV_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-dev-2.10.6.zip" +GTK_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-2.10.9.zip" +GTK_DEV_URL="$GNOME_WIN32_URL/gtk+/2.10/gtk+-dev-2.10.9.zip" INTLTOOL_URL="$GNOME_WIN32_URL/intltool/0.35/intltool-0.35.0.zip" ORBIT2_URL="$GNOME_WIN32_URL/ORBit2/2.13/ORBit2-2.13.3.zip" ORBIT2_DEV_URL="$GNOME_WIN32_URL/ORBit2/2.13/ORBit2-dev-2.13.3.zip" @@ -146,8 +146,8 @@ LIBGNOMEPRINT_URL="$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-2.12.1.zip" LIBGNOMEPRINT_DEV_URL="$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-dev-2.12.1.zip" LIBGNOMEPRINTUI_URL="$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-2.12.1.zip" LIBGNOMEPRINTUI_DEV_URL="$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-dev-2.12.1.zip" -GTKHTML_URL="$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-3.12.0.zip" -GTKHTML_DEV_URL="$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-dev-3.12.0.zip" +GTKHTML_URL="$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-3.12.2.zip" +GTKHTML_DEV_URL="$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-dev-3.12.2.zip" GNOME_DIR=$GLOBAL_DIR\\gnome SWIG_URL="$SF_MIRROR/swig/swigwin-1.3.31.zip" diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh index 9d082eebf8..b0c9a29b4e 100644 --- a/packaging/win32/install.sh +++ b/packaging/win32/install.sh @@ -137,6 +137,7 @@ function inst_unzip() { function inst_regex() { setup RegEx _REGEX_UDIR=`unix_path $REGEX_DIR` + add_to_env -lregex REGEX_LDFLAGS add_to_env -I$_REGEX_UDIR/include REGEX_CPPFLAGS add_to_env -L$_REGEX_UDIR/lib REGEX_LDFLAGS add_to_env $_REGEX_UDIR/bin PATH @@ -145,10 +146,10 @@ function inst_regex() { echo "regex already installed. skipping." else mkdir -p $_REGEX_UDIR - wget_unpacked $REGEX_BIN_URL $DOWNLOAD_DIR $REGEX_DIR - wget_unpacked $REGEX_LIB_URL $DOWNLOAD_DIR $REGEX_DIR + wget_unpacked $REGEX_URL $DOWNLOAD_DIR $REGEX_DIR + wget_unpacked $REGEX_DEV_URL $DOWNLOAD_DIR $REGEX_DIR fi - quiet ${LD} $REGEX_LDFLAGS -lregex -o $TMP_UDIR/ofile || die "regex not installed correctly" + quiet ${LD} $REGEX_LDFLAGS -o $TMP_UDIR/ofile || die "regex not installed correctly" } function inst_readline() { @@ -288,7 +289,7 @@ function inst_guile() { -C --prefix=$_GUILE_WFSDIR \ ac_cv_func_regcomp_rx=yes \ CPPFLAGS="${READLINE_CPPFLAGS} ${REGEX_CPPFLAGS}" \ - LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -lregex" + LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS}" cp config.status config.status.bak cat config.status.bak | sed 's# fileblocks[$.A-Za-z]*,#,#' > config.status ./config.status @@ -296,7 +297,7 @@ function inst_guile() { cp Makefile Makefile.bak cat Makefile.bak | sed '/-bindir-/s,:,^,g' > Makefile qpopd - make LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -lregex -no-undefined -avoid-version" + make LDFLAGS="-lwsock32 ${READLINE_LDFLAGS} ${REGEX_LDFLAGS} -no-undefined -avoid-version" make install qpopd _SLIB_DIR=$_GUILE_UDIR/share/guile/1.* @@ -488,20 +489,6 @@ else res=false fi \${PKG_CONFIG} "\$@" | tr -d \\\\r && \$res -EOF - _FREETYPE_VERSION=`echo $FREETYPE_DEV_URL | sed 's#.*freetype-\(.*\)-lib.zip#\1#'` - cat > lib/pkgconfig/freetype2.pc <