Update to webkit-gtk 1.1.8, heavy consumers are happy with it, tested

@ppc/amd64/i386. Add a temporary workaround for upstream bz #26099.
Bumps minor as some funcs were added.

www/webkit/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2009/05/17 09:40:53 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2009/06/01 05:51:31 landry Exp $
 
 COMMENT =	open source web browser engine
 
-V = 1.1.5
+V = 1.1.8
 DISTNAME =	webkit-${V}
-PKGNAME =	webkit-${V}p0v0
+PKGNAME =	webkit-${V}v0
 CATEGORIES =	www
 
 HOMEPAGE =	http://webkitgtk.org/
@@ -12,7 +12,7 @@ MASTER_SITES =	${HOMEPAGE}
 
 MAINTAINER =	Landry Breuil <gaston@gcu.info>
 
-SHARED_LIBS =	webkit-1.0	0.1
+SHARED_LIBS =	webkit-1.0	0.2
 
 # LGPLv2 / BSD
 PERMIT_PACKAGE_CDROM =	Yes
@@ -53,6 +53,7 @@ LIB_DEPENDS =	gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2,-main \
 		icudata,icui18n,icuuc::textproc/icu4c \
 		sqlite3::databases/sqlite3 \
 		xslt::textproc/libxslt \
+		enchant::textproc/enchant \
 		soup-2.4:libsoup->=2.26:devel/libsoup
 
 

www/webkit/distinfo

@@ -1,5 +1,5 @@
-MD5 (webkit-1.1.5.tar.gz) = XKfELIMBDUufXu0Vq7XvQg==
-RMD160 (webkit-1.1.5.tar.gz) = aSUVZicaj2R1jHB09p7tYG1HyWg=
-SHA1 (webkit-1.1.5.tar.gz) = CYfOSplQG+nlsv8jNiXkZCMdy1M=
-SHA256 (webkit-1.1.5.tar.gz) = iZ0lmyTzsnwNT6ziwW47+l5lbGgql4AHOTB36KuYnU8=
-SIZE (webkit-1.1.5.tar.gz) = 5878572
+MD5 (webkit-1.1.8.tar.gz) = CZG088LvDQnoxawHN9/roQ==
+RMD160 (webkit-1.1.8.tar.gz) = bAzajLz4jH1xBOC8xrkQ6tqSE8A=
+SHA1 (webkit-1.1.8.tar.gz) = O4WEleKTwJmKJlKZOpPMvt/3GDk=
+SHA256 (webkit-1.1.8.tar.gz) = mEkp5CxpBIk/XNc/ZQb4WKOFnS7hpW1ptPfp9ioNL/o=
+SIZE (webkit-1.1.8.tar.gz) = 6232745

www/webkit/patches/patch-GNUmakefile_in

@@ -1,7 +1,7 @@
-$OpenBSD: patch-GNUmakefile_in,v 1.1 2009/04/27 19:25:09 landry Exp $
---- GNUmakefile.in.orig	Tue Apr 14 23:39:16 2009
-+++ GNUmakefile.in	Fri Apr 24 13:51:52 2009
-@@ -5966,9 +5966,10 @@ libJavaScriptCore_la_SOURCES = \
+$OpenBSD: patch-GNUmakefile_in,v 1.2 2009/06/01 05:51:31 landry Exp $
+--- GNUmakefile.in.orig	Thu May 28 20:36:42 2009
++++ GNUmakefile.in	Sun May 31 01:38:02 2009
+@@ -7655,9 +7655,10 @@ libJavaScriptCore_la_SOURCES = \
  
  libJavaScriptCore_la_LIBADD = \
  	$(UNICODE_LIBS) \
@@ -14,24 +14,26 @@ $OpenBSD: patch-GNUmakefile_in,v 1.1 2009/04/27 19:25:09 landry Exp $
  libJavaScriptCore_la_CXXFLAGS = \
  	$(global_cxxflags) \
  	$(libJavaScriptCore_la_CFLAGS)
-@@ -7481,9 +7482,9 @@ libWebCore_la_LIBADD = \
- 	$(HILDON_LIBS) \
- 	$(JPEG_LIBS) \
- 	$(PNG_LIBS) \
--	$(GEOCLUE_LIBS) \
--	-lpthread
-+	$(GEOCLUE_LIBS)
+@@ -7723,12 +7724,12 @@ libwebkit_1_0_la_CPPFLAGS = \
+ 	$(HILDON_CPPFLAGS)
  
-+libWebCore_la_LDFLAGS = -pthread
+ libwebkit_1_0_la_LDFLAGS = \
++	-pthread \
+ 	-version-info @LIBWEBKITGTK_VERSION@ \
+ 	$(version_script) \
+ 	$(no_undefined)
  
- # WebKit
- webkitgtk_h_api := WebKit/gtk/webkit/webkit.h \
-@@ -7664,7 +7665,7 @@ Programs_minidom_CFLAGS = \
+ libwebkit_1_0_la_LIBADD = \
+-	-lpthread \
+ 	libJavaScriptCore.la \
+ 	libWebCore.la \
+ 	libWebCoreJS.la \
+@@ -7847,7 +7848,7 @@ Programs_minidom_CFLAGS = \
  Programs_minidom_LDADD = \
  	 libJavaScriptCore.la \
  	 -lm \
 -	 -lstdc++
 +	 -lestdc++
  
- 
- # jsc
+ Programs_minidom_LDFLAGS = \
+ 	-no-install \

www/webkit/patches/patch-JavaScriptCore_jit_JITStubs_cpp

@@ -0,0 +1,29 @@
+$OpenBSD: patch-JavaScriptCore_jit_JITStubs_cpp,v 1.1 2009/06/01 05:51:31 landry Exp $
+--- JavaScriptCore/jit/JITStubs.cpp.orig	Sun May 31 01:57:11 2009
++++ JavaScriptCore/jit/JITStubs.cpp	Sun May 31 01:58:02 2009
+@@ -67,9 +67,9 @@ namespace JSC {
+ 
+ // These ASSERTs remind you that, if you change the layout of JITStackFrame, you
+ // need to change the assembly trampolines below to match.
+-COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x38, JITStackFrame_callFrame_offset_matches_ctiTrampoline);
+-COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x30, JITStackFrame_code_offset_matches_ctiTrampoline);
+-COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x1c, JITStackFrame_stub_argument_space_matches_ctiTrampoline);
++//COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x38, JITStackFrame_callFrame_offset_matches_ctiTrampoline);
++//COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x30, JITStackFrame_code_offset_matches_ctiTrampoline);
++//COMPILE_ASSERT(offsetof(struct JITStackFrame, savedEBX) == 0x1c, JITStackFrame_stub_argument_space_matches_ctiTrampoline);
+ 
+ #if PLATFORM(DARWIN) || PLATFORM(WIN_OS)
+ #define SYMBOL_STRING(name) "_" #name
+@@ -122,9 +122,9 @@ SYMBOL_STRING(ctiVMThrowTrampoline) ":" "\n"
+ 
+ // These ASSERTs remind you that, if you change the layout of JITStackFrame, you
+ // need to change the assembly trampolines below to match.
+-COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x90, JITStackFrame_callFrame_offset_matches_ctiTrampoline);
+-COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x80, JITStackFrame_code_offset_matches_ctiTrampoline);
+-COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x48, JITStackFrame_stub_argument_space_matches_ctiTrampoline);
++//COMPILE_ASSERT(offsetof(struct JITStackFrame, callFrame) == 0x90, JITStackFrame_callFrame_offset_matches_ctiTrampoline);
++//COMPILE_ASSERT(offsetof(struct JITStackFrame, code) == 0x80, JITStackFrame_code_offset_matches_ctiTrampoline);
++//COMPILE_ASSERT(offsetof(struct JITStackFrame, savedRBX) == 0x48, JITStackFrame_stub_argument_space_matches_ctiTrampoline);
+ 
+ #if PLATFORM(DARWIN) || PLATFORM(WIN_OS)
+ #define SYMBOL_STRING(name) "_" #name

www/webkit/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2009/04/27 19:25:09 landry Exp $
+@comment $OpenBSD: PLIST,v 1.7 2009/06/01 05:51:31 landry Exp $
 %%SHARED%%
 @bin bin/jsc
 include/webkit-1.0/
@@ -18,6 +18,7 @@ include/webkit-1.0/webkit/webkit.h
 include/webkit-1.0/webkit/webkitdefines.h
 include/webkit-1.0/webkit/webkitdownload.h
 include/webkit-1.0/webkit/webkitenumtypes.h
+include/webkit-1.0/webkit/webkiterror.h
 include/webkit-1.0/webkit/webkitnetworkrequest.h
 include/webkit-1.0/webkit/webkitsoupauthdialog.h
 include/webkit-1.0/webkit/webkitversion.h
@@ -38,11 +39,30 @@ share/locale/
 share/locale/de/
 share/locale/de/LC_MESSAGES/
 share/locale/de/LC_MESSAGES/webkit.mo
+share/locale/it/
+share/locale/it/LC_MESSAGES/
+share/locale/it/LC_MESSAGES/webkit.mo
 share/locale/pt_BR/
 share/locale/pt_BR/LC_MESSAGES/
 share/locale/pt_BR/LC_MESSAGES/webkit.mo
+share/locale/ru/
+share/locale/ru/LC_MESSAGES/
+share/locale/ru/LC_MESSAGES/webkit.mo
+share/locale/sv/
+share/locale/sv/LC_MESSAGES/
+share/locale/sv/LC_MESSAGES/webkit.mo
 share/webkit-1.0/
+share/webkit-1.0/images/
+share/webkit-1.0/images/deleteButton.png
+share/webkit-1.0/images/missingImage.png
+share/webkit-1.0/images/nullPlugin.png
+share/webkit-1.0/images/panIcon.png
+share/webkit-1.0/images/textAreaResizeCorner.png
+share/webkit-1.0/images/urlIcon.png
+share/webkit-1.0/resources/
+share/webkit-1.0/resources/error.html
 share/webkit-1.0/webinspector/
+share/webkit-1.0/webinspector/BottomUpProfileDataGridTree.js
 share/webkit-1.0/webinspector/Breakpoint.js
 share/webkit-1.0/webinspector/BreakpointsSidebarPane.js
 share/webkit-1.0/webinspector/CallStackSidebarPane.js
@@ -179,6 +199,7 @@ share/webkit-1.0/webinspector/ObjectPropertiesSection.js
 share/webkit-1.0/webinspector/Panel.js
 share/webkit-1.0/webinspector/PanelEnablerView.js
 share/webkit-1.0/webinspector/Placard.js
+share/webkit-1.0/webinspector/ProfileDataGridTree.js
 share/webkit-1.0/webinspector/ProfileView.js
 share/webkit-1.0/webinspector/ProfilesPanel.js
 share/webkit-1.0/webinspector/PropertiesSection.js
@@ -197,9 +218,11 @@ share/webkit-1.0/webinspector/SourceFrame.js
 share/webkit-1.0/webinspector/SourceView.js
 share/webkit-1.0/webinspector/StylesSidebarPane.js
 share/webkit-1.0/webinspector/TextPrompt.js
+share/webkit-1.0/webinspector/TopDownProfileDataGridTree.js
 share/webkit-1.0/webinspector/View.js
 share/webkit-1.0/webinspector/inspector.css
 share/webkit-1.0/webinspector/inspector.html
 share/webkit-1.0/webinspector/inspector.js
+share/webkit-1.0/webinspector/localizedStrings.js
 share/webkit-1.0/webinspector/treeoutline.js
 share/webkit-1.0/webinspector/utilities.js