AUDIT: r17882 - gnucash/trunk/packaging/win32 - [Win32] Update gtkhtml to version 3.24.2.

[Andreas Köhler]

Author: andi5
Date: 2009-02-08 08:13:48 -0500 (Sun, 08 Feb 2009)
New Revision: 17882
Trac: http://svn.gnucash.org/trac/changeset/17882

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install.sh
Log:
[Win32] Update gtkhtml to version 3.24.2.

BP


Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2009-02-08 13:02:56 UTC (rev 17881)
+++ gnucash/trunk/packaging/win32/defaults.sh	2009-02-08 13:13:48 UTC (rev 17882)
@@ -212,14 +212,8 @@
 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
 

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2009-02-08 13:02:56 UTC (rev 17881)
+++ gnucash/trunk/packaging/win32/install.sh	2009-02-08 13:13:48 UTC (rev 17882)
@@ -589,6 +589,8 @@
 \${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 &&