r18991 - gnucash/trunk/packaging/win32 - Upgrade win32 version of webkit from 1.1.5 to 1.1.90.

[Phil Longstaff]

Author: plongstaff
Date: 2010-04-04 17:22:19 -0400 (Sun, 04 Apr 2010)
New Revision: 18991
Trac: http://svn.gnucash.org/trac/changeset/18991

Modified:
   gnucash/trunk/packaging/win32/defaults.sh
   gnucash/trunk/packaging/win32/install.sh
Log:
Upgrade win32 version of webkit from 1.1.5 to 1.1.90.

This version contains changes required to fix #588816 (Heading Banner Image does not display or print
on invoice reports).  Note that this bug won't be fixed until some gnucash changes are checked in as well.


Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh	2010-04-04 20:11:18 UTC (rev 18990)
+++ gnucash/trunk/packaging/win32/defaults.sh	2010-04-04 21:22:19 UTC (rev 18991)
@@ -249,8 +249,8 @@
 set_default HH_URL "http://download.microsoft.com/download/OfficeXPProf/Install/4.71.1015.0/W98NT42KMe/EN-US/HTMLHELP.EXE"
 set_default HH_DIR $GLOBAL_DIR\\hh
 
-set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-1.1.5-win32.zip"
-set_default WEBKIT_DIR $GLOBAL_DIR\\webkit-1.1.5
+set_default WEBKIT_URL "$SF_MIRROR/gnucash/webkit-1.1.90-win32.zip"
+set_default WEBKIT_DIR $GLOBAL_DIR\\webkit-1.1.90
 
 set_default SVN_URL "http://subversion.tigris.org/files/documents/15/35379/svn-1.4.2-setup.exe"
 set_default SVN_DIR $GLOBAL_DIR\\svn

Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh	2010-04-04 20:11:18 UTC (rev 18990)
+++ gnucash/trunk/packaging/win32/install.sh	2010-04-04 21:22:19 UTC (rev 18991)
@@ -1272,7 +1272,7 @@
     add_to_env ${_WEBKIT_UDIR}/bin PATH
     add_to_env -lwebkit-1.0-2 WEBKIT_LIBS
     add_to_env -L${_WEBKIT_UDIR}/bin WEBKIT_LIBS
-    add_to_env -I${_WEBKIT_UDIR}/include WEBKIT_CFLAGS
+    add_to_env -I${_WEBKIT_UDIR}/include/webkit-1.0 WEBKIT_CFLAGS
     if quiet ${LD} ${WEBKIT_LIBS} -o $TMP_UDIR/ofile
     then
         echo "webkit already installed.  skipping."