From 41b7edbd3bd2187674bf1ec469aaeaad17f34e7c Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Mon, 20 Sep 2010 19:34:41 +0000 Subject: [PATCH] Win32 build: Switch back gettext to 0.17 because 0.18 require libc++ which we don't want to have. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19593 57a11ea4-9604-0410-9ed3-97b8803252fd --- packaging/win32/defaults.sh | 6 +++--- packaging/win32/install-impl.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh index 32a67a5ba3..d375cefc64 100644 --- a/packaging/win32/defaults.sh +++ b/packaging/win32/defaults.sh @@ -204,9 +204,9 @@ set_default LIBXSLT_DIR $GLOBAL_DIR\\libxslt 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 GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime_0.18.1.1-2_win32.zip" -set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev_0.18.1.1-2_win32.zip" -set_default GETTEXT_TOOLS_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-dev_0.18.1.1-2_win32.zip" +set_default GETTEXT_RUNTIME_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-0.17-1.zip" +set_default GETTEXT_RUNTIME_DEV_URL "$GNOME_WIN32_DEPS_URL/gettext-runtime-dev-0.17-1.zip" +set_default GETTEXT_TOOLS_URL "$GNOME_WIN32_DEPS_URL/gettext-tools-0.17.zip" set_default LIBICONV_URL "$GNOME_WIN32_DEPS_URL/libiconv-1.9.1.bin.woe32.zip" 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" diff --git a/packaging/win32/install-impl.sh b/packaging/win32/install-impl.sh index 518473e206..9aad882211 100755 --- a/packaging/win32/install-impl.sh +++ b/packaging/win32/install-impl.sh @@ -533,7 +533,7 @@ function inst_gnome() { wget_unpacked $LIBXML2_DEV_URL $DOWNLOAD_DIR $GNOME_DIR wget_unpacked $GETTEXT_RUNTIME_URL $DOWNLOAD_DIR $GNOME_DIR wget_unpacked $GETTEXT_RUNTIME_DEV_URL $DOWNLOAD_DIR $GNOME_DIR - wget_unpacked $GETTEXT_TOOLS_DEV_URL $DOWNLOAD_DIR $GNOME_DIR + wget_unpacked $GETTEXT_TOOLS_URL $DOWNLOAD_DIR $GNOME_DIR 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