From 3db749b2e94adf9b7bd1fce5e9a844497303df72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=B6hler?= Date: Sun, 8 Feb 2009 13:13:48 +0000 Subject: [PATCH] [Win32] Update gtkhtml to version 3.24.2. BP git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17882 57a11ea4-9604-0410-9ed3-97b8803252fd --- packaging/win32/defaults.sh | 10 ++-------- packaging/win32/install.sh | 2 ++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/packaging/win32/defaults.sh b/packaging/win32/defaults.sh index 91fefe17bb..74a5c77128 100644 --- a/packaging/win32/defaults.sh +++ b/packaging/win32/defaults.sh @@ -212,14 +212,8 @@ set_default LIBGNOMEUI_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-2.22.1.z set_default LIBGNOMEUI_DEV_URL "$GNOME_WIN32_URL/libgnomeui/2.22/libgnomeui-dev-2.22.1.zip" set_default LIBGLADE_URL "$GNOME_WIN32_URL/libglade/2.6/libglade_2.6.3-1_win32.zip" set_default LIBGLADE_DEV_URL "$GNOME_WIN32_URL/libglade/2.6/libglade-dev_2.6.3-1_win32.zip" -#set_default LIBGNOMEPRINT_URL "$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-2.12.1.zip" -#set_default LIBGNOMEPRINT_DEV_URL "$GNOME_WIN32_URL/libgnomeprint/2.12/libgnomeprint-dev-2.12.1.zip" -#set_default LIBGNOMEPRINTUI_URL "$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-2.12.1.zip" # gnomeprint -#set_default LIBGNOMEPRINTUI_DEV_URL "$GNOME_WIN32_URL/libgnomeprintui/2.12/libgnomeprintui-dev-2.12.1.zip" # gnomeprint -#set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-3.12.2.zip" # gnomeprint -#set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.12/gtkhtml-dev-3.12.2.zip" # gnomeprint -set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.18/gtkhtml-3.18.2.zip" # not gnomeprint -set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.18/gtkhtml-dev-3.18.2.zip" # not gnomeprint +set_default GTKHTML_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml_3.24.2-1_win32.zip" +set_default GTKHTML_DEV_URL "$GNOME_WIN32_URL/gtkhtml/3.24/gtkhtml-dev_3.24.2-1_win32.zip" set_default GTK_DOC_URL "$GNOME_MIRROR/sources/gtk-doc/1.11/gtk-doc-1.11.tar.bz2" set_default GNOME_DIR $GLOBAL_DIR\\gnome diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh index 1326b859df..885f50b5ee 100755 --- a/packaging/win32/install.sh +++ b/packaging/win32/install.sh @@ -589,6 +589,8 @@ fi \${PKG_CONFIG} "\$@" | tr -d \\\\r && \$res EOF chmod +x bin/pkg-config{.exe,-msys.sh} + sed '/Requires/s,\(.*\) enchant\(.*\) iso-codes\(.*\),\1\2\3,' lib/pkgconfig/libgtkhtml-3.14.pc > tmp + mv tmp lib/pkgconfig/libgtkhtml-3.14.pc qpopd quiet gconftool-2 --version && quiet ${PKG_CONFIG} --exists gconf-2.0 libgnome-2.0 libgnomeui-2.0 libgtkhtml-3.14 &&