summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2012-10-30 12:46:30 +0000
committerdrochner <drochner@pkgsrc.org>2012-10-30 12:46:30 +0000
commitdc157a35cdcbb059fb781983ba33ffe3be31a4a6 (patch)
tree487ff2de55050af35e8a8359d3a7f5cfb3a264b2 /www
parent35382e98238c640fb4f68989238ecf24ee158b87 (diff)
downloadpkgsrc-dc157a35cdcbb059fb781983ba33ffe3be31a4a6.tar.gz
update to 1.10.1
this switches to the 1.10 release branch, no useful changelog available
Diffstat (limited to 'www')
-rw-r--r--www/webkit-gtk/Makefile6
-rw-r--r--www/webkit-gtk/Makefile.common6
-rw-r--r--www/webkit-gtk/PLIST219
-rw-r--r--www/webkit-gtk/distinfo28
-rw-r--r--www/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp20
-rw-r--r--www/webkit-gtk/patches/patch-Source_JavaScriptCore_wtf_MathExtras.h13
-rw-r--r--www/webkit-gtk/patches/patch-Source_JavaScriptCore_wtf_Threading.h8
-rw-r--r--www/webkit-gtk/patches/patch-Source_WebCore_css_CSSGrammar.y34
-rw-r--r--www/webkit-gtk/patches/patch-Source_WebCore_css_CSSParser.cpp16
-rw-r--r--www/webkit-gtk/patches/patch-Source_WebCore_editing_Editor.h10
-rw-r--r--www/webkit-gtk/patches/patch-Source_WebCore_xml_XPathGrammar.y472
-rw-r--r--www/webkit-gtk/patches/patch-Source_WebCore_xml_XPathParser.cpp44
-rw-r--r--www/webkit-gtk/patches/patch-ai6
-rw-r--r--www/webkit-gtk/patches/patch-aj12
-rw-r--r--www/webkit-gtk/patches/patch-ak10
-rw-r--r--www/webkit-gtk/patches/patch-am32
-rw-r--r--www/webkit-gtk/patches/patch-configure14
17 files changed, 233 insertions, 717 deletions
diff --git a/www/webkit-gtk/Makefile b/www/webkit-gtk/Makefile
index 4bd1e79a95c..7bac8d2fc6e 100644
--- a/www/webkit-gtk/Makefile
+++ b/www/webkit-gtk/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.61 2012/10/08 23:00:50 adam Exp $
+# $NetBSD: Makefile,v 1.62 2012/10/30 12:46:30 drochner Exp $
.include "Makefile.common"
-PKGNAME= ${DISTNAME:S/webkit/webkit-gtk/}
-PKGREVISION= 4
+PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
COMMENT= GTK2 port of the WebKit browser engine
CONFIGURE_ARGS+= --with-gtk=2.0
+CONFIGURE_ARGS+= --disable-webkit2
.include "../../x11/gtk2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/www/webkit-gtk/Makefile.common b/www/webkit-gtk/Makefile.common
index cddfcce0dda..87e6c119f48 100644
--- a/www/webkit-gtk/Makefile.common
+++ b/www/webkit-gtk/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.16 2012/10/28 06:31:08 asau Exp $
+# $NetBSD: Makefile.common,v 1.17 2012/10/30 12:46:30 drochner Exp $
# used by www/webkit-gtk/Makefile
# used by www/webkit-gtk3/Makefile
-DISTNAME= webkit-1.8.3
+DISTNAME= webkitgtk-1.10.1
CATEGORIES= www
MASTER_SITES= http://www.webkitgtk.org/releases/
EXTRACT_SUFX= .tar.xz
@@ -41,6 +41,8 @@ REPLACE_PERL+= Source/JavaScriptCore/create_hash_table \
Source/WebCore/make-hash-tools.pl \
Source/WebCore/platform/text/mac/*.pl
+BUILD_DEPENDS+= ruby-[0-9]*:../../lang/ruby
+
PYTHON_FOR_BUILD_ONLY= yes
.include "../../lang/python/application.mk"
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
diff --git a/www/webkit-gtk/PLIST b/www/webkit-gtk/PLIST
index cb653d2a308..b0d7781c74b 100644
--- a/www/webkit-gtk/PLIST
+++ b/www/webkit-gtk/PLIST
@@ -1,14 +1,11 @@
-@comment $NetBSD: PLIST,v 1.19 2012/07/06 14:03:50 drochner Exp $
+@comment $NetBSD: PLIST,v 1.20 2012/10/30 12:46:30 drochner Exp $
bin/jsc-1
include/webkitgtk-1.0/JavaScriptCore/JSBase.h
include/webkitgtk-1.0/JavaScriptCore/JSContextRef.h
include/webkitgtk-1.0/JavaScriptCore/JSObjectRef.h
include/webkitgtk-1.0/JavaScriptCore/JSStringRef.h
-include/webkitgtk-1.0/JavaScriptCore/JSStringRefBSTR.h
-include/webkitgtk-1.0/JavaScriptCore/JSStringRefCF.h
include/webkitgtk-1.0/JavaScriptCore/JSValueRef.h
include/webkitgtk-1.0/JavaScriptCore/JavaScript.h
-include/webkitgtk-1.0/JavaScriptCore/JavaScriptCore.h
include/webkitgtk-1.0/JavaScriptCore/WebKitAvailability.h
include/webkitgtk-1.0/webkit/WebKitDOMAttr.h
include/webkitgtk-1.0/webkit/WebKitDOMBarInfo.h
@@ -29,6 +26,7 @@ include/webkitgtk-1.0/webkit/WebKitDOMDOMMimeType.h
include/webkitgtk-1.0/webkit/WebKitDOMDOMMimeTypeArray.h
include/webkitgtk-1.0/webkit/WebKitDOMDOMPlugin.h
include/webkitgtk-1.0/webkit/WebKitDOMDOMPluginArray.h
+include/webkitgtk-1.0/webkit/WebKitDOMDOMSecurityPolicy.h
include/webkitgtk-1.0/webkit/WebKitDOMDOMSelection.h
include/webkitgtk-1.0/webkit/WebKitDOMDOMSettableTokenList.h
include/webkitgtk-1.0/webkit/WebKitDOMDOMStringList.h
@@ -45,6 +43,8 @@ include/webkitgtk-1.0/webkit/WebKitDOMEvent.h
include/webkitgtk-1.0/webkit/WebKitDOMEventTarget.h
include/webkitgtk-1.0/webkit/WebKitDOMFile.h
include/webkitgtk-1.0/webkit/WebKitDOMFileList.h
+include/webkitgtk-1.0/webkit/WebKitDOMGamepad.h
+include/webkitgtk-1.0/webkit/WebKitDOMGamepadList.h
include/webkitgtk-1.0/webkit/WebKitDOMGeolocation.h
include/webkitgtk-1.0/webkit/WebKitDOMHTMLAnchorElement.h
include/webkitgtk-1.0/webkit/WebKitDOMHTMLAppletElement.h
@@ -128,6 +128,7 @@ include/webkitgtk-1.0/webkit/WebKitDOMProcessingInstruction.h
include/webkitgtk-1.0/webkit/WebKitDOMRange.h
include/webkitgtk-1.0/webkit/WebKitDOMScreen.h
include/webkitgtk-1.0/webkit/WebKitDOMStorage.h
+include/webkitgtk-1.0/webkit/WebKitDOMStorageInfo.h
include/webkitgtk-1.0/webkit/WebKitDOMStyleMedia.h
include/webkitgtk-1.0/webkit/WebKitDOMStyleSheet.h
include/webkitgtk-1.0/webkit/WebKitDOMStyleSheetList.h
@@ -152,6 +153,7 @@ include/webkitgtk-1.0/webkit/webkitdownload.h
include/webkitgtk-1.0/webkit/webkitenumtypes.h
include/webkitgtk-1.0/webkit/webkiterror.h
include/webkitgtk-1.0/webkit/webkitfavicondatabase.h
+include/webkitgtk-1.0/webkit/webkitfilechooserrequest.h
include/webkitgtk-1.0/webkit/webkitgeolocationpolicydecision.h
include/webkitgtk-1.0/webkit/webkitglobals.h
include/webkitgtk-1.0/webkit/webkithittestresult.h
@@ -179,6 +181,7 @@ include/webkitgtk-1.0/webkit/webkitwebview.h
include/webkitgtk-1.0/webkit/webkitwebwindowfeatures.h
include/webkitgtk-1.0/webkit2/WebKit2/WKAPICast.h
include/webkitgtk-1.0/webkit2/WebKit2/WKAPICastGtk.h
+include/webkitgtk-1.0/webkit2/WebKit2/WKAPICastSoup.h
include/webkitgtk-1.0/webkit2/WebKit2/WKApplicationCacheManager.h
include/webkitgtk-1.0/webkit2/WebKit2/WKArray.h
include/webkitgtk-1.0/webkit2/WebKit2/WKAuthenticationChallenge.h
@@ -187,12 +190,16 @@ include/webkitgtk-1.0/webkit2/WebKit2/WKBackForwardList.h
include/webkitgtk-1.0/webkit2/WebKit2/WKBackForwardListItem.h
include/webkitgtk-1.0/webkit2/WebKit2/WKBase.h
include/webkitgtk-1.0/webkit2/WebKit2/WKBaseGtk.h
+include/webkitgtk-1.0/webkit2/WebKit2/WKBaseSoup.h
+include/webkitgtk-1.0/webkit2/WebKit2/WKBatteryManager.h
+include/webkitgtk-1.0/webkit2/WebKit2/WKBatteryStatus.h
include/webkitgtk-1.0/webkit2/WebKit2/WKCertificateInfo.h
include/webkitgtk-1.0/webkit2/WebKit2/WKConnectionRef.h
include/webkitgtk-1.0/webkit2/WebKit2/WKContext.h
include/webkitgtk-1.0/webkit2/WebKit2/WKContextMenuItem.h
include/webkitgtk-1.0/webkit2/WebKit2/WKContextMenuItemTypes.h
include/webkitgtk-1.0/webkit2/WebKit2/WKContextPrivate.h
+include/webkitgtk-1.0/webkit2/WebKit2/WKContextSoup.h
include/webkitgtk-1.0/webkit2/WebKit2/WKCookieManager.h
include/webkitgtk-1.0/webkit2/WebKit2/WKCredential.h
include/webkitgtk-1.0/webkit2/WebKit2/WKCredentialTypes.h
@@ -206,6 +213,7 @@ include/webkitgtk-1.0/webkit2/WebKit2/WKFindOptions.h
include/webkitgtk-1.0/webkit2/WebKit2/WKFormSubmissionListener.h
include/webkitgtk-1.0/webkit2/WebKit2/WKFrame.h
include/webkitgtk-1.0/webkit2/WebKit2/WKFramePolicyListener.h
+include/webkitgtk-1.0/webkit2/WebKit2/WKFullScreenClientGtk.h
include/webkitgtk-1.0/webkit2/WebKit2/WKGeolocationManager.h
include/webkitgtk-1.0/webkit2/WebKit2/WKGeolocationPermissionRequest.h
include/webkitgtk-1.0/webkit2/WebKit2/WKGeolocationPosition.h
@@ -216,12 +224,17 @@ include/webkitgtk-1.0/webkit2/WebKit2/WKGraphicsContextGtk.h
include/webkitgtk-1.0/webkit2/WebKit2/WKHitTestResult.h
include/webkitgtk-1.0/webkit2/WebKit2/WKImage.h
include/webkitgtk-1.0/webkit2/WebKit2/WKInspector.h
+include/webkitgtk-1.0/webkit2/WebKit2/WKInspectorClientGtk.h
+include/webkitgtk-1.0/webkit2/WebKit2/WKIntentData.h
+include/webkitgtk-1.0/webkit2/WebKit2/WKIntentServiceInfo.h
include/webkitgtk-1.0/webkit2/WebKit2/WKKeyValueStorageManager.h
include/webkitgtk-1.0/webkit2/WebKit2/WKMediaCacheManager.h
include/webkitgtk-1.0/webkit2/WebKit2/WKMutableArray.h
include/webkitgtk-1.0/webkit2/WebKit2/WKMutableDictionary.h
include/webkitgtk-1.0/webkit2/WebKit2/WKNativeEvent.h
include/webkitgtk-1.0/webkit2/WebKit2/WKNavigationData.h
+include/webkitgtk-1.0/webkit2/WebKit2/WKNetworkInfo.h
+include/webkitgtk-1.0/webkit2/WebKit2/WKNetworkInfoManager.h
include/webkitgtk-1.0/webkit2/WebKit2/WKNotification.h
include/webkitgtk-1.0/webkit2/WebKit2/WKNotificationManager.h
include/webkitgtk-1.0/webkit2/WebKit2/WKNotificationPermissionRequest.h
@@ -238,12 +251,15 @@ include/webkitgtk-1.0/webkit2/WebKit2/WKPreferences.h
include/webkitgtk-1.0/webkit2/WebKit2/WKPreferencesPrivate.h
include/webkitgtk-1.0/webkit2/WebKit2/WKProtectionSpace.h
include/webkitgtk-1.0/webkit2/WebKit2/WKProtectionSpaceTypes.h
+include/webkitgtk-1.0/webkit2/WebKit2/WKRenderLayer.h
+include/webkitgtk-1.0/webkit2/WebKit2/WKRenderObject.h
include/webkitgtk-1.0/webkit2/WebKit2/WKResourceCacheManager.h
include/webkitgtk-1.0/webkit2/WebKit2/WKRetainPtr.h
include/webkitgtk-1.0/webkit2/WebKit2/WKSecurityOrigin.h
include/webkitgtk-1.0/webkit2/WebKit2/WKSerializedScriptValue.h
include/webkitgtk-1.0/webkit2/WebKit2/WKSerializedScriptValuePrivate.h
include/webkitgtk-1.0/webkit2/WebKit2/WKSharedAPICast.h
+include/webkitgtk-1.0/webkit2/WebKit2/WKSoupRequestManager.h
include/webkitgtk-1.0/webkit2/WebKit2/WKString.h
include/webkitgtk-1.0/webkit2/WebKit2/WKStringPrivate.h
include/webkitgtk-1.0/webkit2/WebKit2/WKTextChecker.h
@@ -252,25 +268,42 @@ include/webkitgtk-1.0/webkit2/WebKit2/WKURL.h
include/webkitgtk-1.0/webkit2/WebKit2/WKURLRequest.h
include/webkitgtk-1.0/webkit2/WebKit2/WKURLResponse.h
include/webkitgtk-1.0/webkit2/WebKit2/WKUserContentURLPattern.h
+include/webkitgtk-1.0/webkit2/WebKit2/WKVibration.cpp
include/webkitgtk-1.0/webkit2/WebKit2/WKView.h
-include/webkitgtk-1.0/webkit2/WebKit2/WebKit2.h
+include/webkitgtk-1.0/webkit2/WebKit2/WebKit2_C.h
include/webkitgtk-1.0/webkit2/WebKitBackForwardList.h
include/webkitgtk-1.0/webkit2/WebKitBackForwardListItem.h
+include/webkitgtk-1.0/webkit2/WebKitContextMenu.h
+include/webkitgtk-1.0/webkit2/WebKitContextMenuActions.h
+include/webkitgtk-1.0/webkit2/WebKitContextMenuItem.h
+include/webkitgtk-1.0/webkit2/WebKitCookieManager.h
include/webkitgtk-1.0/webkit2/WebKitDefines.h
include/webkitgtk-1.0/webkit2/WebKitDownload.h
include/webkitgtk-1.0/webkit2/WebKitEditingCommands.h
include/webkitgtk-1.0/webkit2/WebKitEnumTypes.h
include/webkitgtk-1.0/webkit2/WebKitError.h
+include/webkitgtk-1.0/webkit2/WebKitFileChooserRequest.h
include/webkitgtk-1.0/webkit2/WebKitFindController.h
+include/webkitgtk-1.0/webkit2/WebKitFormSubmissionRequest.h
+include/webkitgtk-1.0/webkit2/WebKitGeolocationPermissionRequest.h
include/webkitgtk-1.0/webkit2/WebKitHitTestResult.h
+include/webkitgtk-1.0/webkit2/WebKitJavascriptResult.h
+include/webkitgtk-1.0/webkit2/WebKitMimeInfo.h
include/webkitgtk-1.0/webkit2/WebKitNavigationPolicyDecision.h
+include/webkitgtk-1.0/webkit2/WebKitPermissionRequest.h
+include/webkitgtk-1.0/webkit2/WebKitPlugin.h
include/webkitgtk-1.0/webkit2/WebKitPolicyDecision.h
include/webkitgtk-1.0/webkit2/WebKitPrintOperation.h
include/webkitgtk-1.0/webkit2/WebKitResponsePolicyDecision.h
+include/webkitgtk-1.0/webkit2/WebKitScriptDialog.h
include/webkitgtk-1.0/webkit2/WebKitSettings.h
include/webkitgtk-1.0/webkit2/WebKitURIRequest.h
include/webkitgtk-1.0/webkit2/WebKitURIResponse.h
+include/webkitgtk-1.0/webkit2/WebKitURISchemeRequest.h
+include/webkitgtk-1.0/webkit2/WebKitVersion.h
include/webkitgtk-1.0/webkit2/WebKitWebContext.h
+include/webkitgtk-1.0/webkit2/WebKitWebInspector.h
+include/webkitgtk-1.0/webkit2/WebKitWebResource.h
include/webkitgtk-1.0/webkit2/WebKitWebView.h
include/webkitgtk-1.0/webkit2/WebKitWebViewBase.h
include/webkitgtk-1.0/webkit2/WebKitWindowProperties.h
@@ -279,42 +312,42 @@ lib/libjavascriptcoregtk-1.0.la
lib/libwebkitgtk-1.0.la
lib/pkgconfig/javascriptcoregtk-1.0.pc
lib/pkgconfig/webkit-1.0.pc
-share/locale/ar/LC_MESSAGES/webkit-2.0.mo
-share/locale/bg/LC_MESSAGES/webkit-2.0.mo
-share/locale/cs/LC_MESSAGES/webkit-2.0.mo
-share/locale/de/LC_MESSAGES/webkit-2.0.mo
-share/locale/el/LC_MESSAGES/webkit-2.0.mo
-share/locale/en_CA/LC_MESSAGES/webkit-2.0.mo
-share/locale/en_GB/LC_MESSAGES/webkit-2.0.mo
-share/locale/eo/LC_MESSAGES/webkit-2.0.mo
-share/locale/es/LC_MESSAGES/webkit-2.0.mo
-share/locale/et/LC_MESSAGES/webkit-2.0.mo
-share/locale/eu/LC_MESSAGES/webkit-2.0.mo
-share/locale/fr/LC_MESSAGES/webkit-2.0.mo
-share/locale/gl/LC_MESSAGES/webkit-2.0.mo
-share/locale/gu/LC_MESSAGES/webkit-2.0.mo
-share/locale/he/LC_MESSAGES/webkit-2.0.mo
-share/locale/hu/LC_MESSAGES/webkit-2.0.mo
-share/locale/id/LC_MESSAGES/webkit-2.0.mo
-share/locale/it/LC_MESSAGES/webkit-2.0.mo
-share/locale/ko/LC_MESSAGES/webkit-2.0.mo
-share/locale/lt/LC_MESSAGES/webkit-2.0.mo
-share/locale/lv/LC_MESSAGES/webkit-2.0.mo
-share/locale/mr/LC_MESSAGES/webkit-2.0.mo
-share/locale/nb/LC_MESSAGES/webkit-2.0.mo
-share/locale/nl/LC_MESSAGES/webkit-2.0.mo
-share/locale/pa/LC_MESSAGES/webkit-2.0.mo
-share/locale/pl/LC_MESSAGES/webkit-2.0.mo
-share/locale/pt/LC_MESSAGES/webkit-2.0.mo
-share/locale/pt_BR/LC_MESSAGES/webkit-2.0.mo
-share/locale/ru/LC_MESSAGES/webkit-2.0.mo
-share/locale/sl/LC_MESSAGES/webkit-2.0.mo
-share/locale/sr/LC_MESSAGES/webkit-2.0.mo
-share/locale/sr@latin/LC_MESSAGES/webkit-2.0.mo
-share/locale/sv/LC_MESSAGES/webkit-2.0.mo
-share/locale/uk/LC_MESSAGES/webkit-2.0.mo
-share/locale/vi/LC_MESSAGES/webkit-2.0.mo
-share/locale/zh_CN/LC_MESSAGES/webkit-2.0.mo
+share/locale/ar/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/bg/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/cs/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/de/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/el/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/en_CA/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/en_GB/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/eo/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/es/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/et/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/eu/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/fr/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/gl/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/gu/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/he/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/hu/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/id/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/it/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/ko/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/lt/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/lv/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/mr/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/nb/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/nl/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/pa/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/pl/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/pt/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/ru/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/sl/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/sr/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/sv/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/uk/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/vi/LC_MESSAGES/webkitgtk-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/webkitgtk-2.0.mo
share/webkitgtk-1.0/images/deleteButton.png
share/webkitgtk-1.0/images/inputSpeech.png
share/webkitgtk-1.0/images/missingImage.png
@@ -332,22 +365,24 @@ share/webkitgtk-1.0/webinspector/AuditLauncherView.js
share/webkitgtk-1.0/webinspector/AuditResultView.js
share/webkitgtk-1.0/webinspector/AuditRules.js
share/webkitgtk-1.0/webinspector/AuditsPanel.js
-share/webkitgtk-1.0/webinspector/BinarySearch.js
share/webkitgtk-1.0/webinspector/BottomUpProfileDataGridTree.js
share/webkitgtk-1.0/webinspector/BreakpointManager.js
share/webkitgtk-1.0/webinspector/BreakpointsSidebarPane.js
+share/webkitgtk-1.0/webinspector/CPUProfileView.js
share/webkitgtk-1.0/webinspector/CSSCompletions.js
share/webkitgtk-1.0/webinspector/CSSKeywordCompletions.js
share/webkitgtk-1.0/webinspector/CSSSelectorProfileView.js
share/webkitgtk-1.0/webinspector/CSSStyleModel.js
share/webkitgtk-1.0/webinspector/CallStackSidebarPane.js
share/webkitgtk-1.0/webinspector/Checkbox.js
+share/webkitgtk-1.0/webinspector/CodeMirrorTextEditor.js
share/webkitgtk-1.0/webinspector/Color.js
-share/webkitgtk-1.0/webinspector/CompilerSourceMapping.js
+share/webkitgtk-1.0/webinspector/CompilerScriptMapping.js
share/webkitgtk-1.0/webinspector/ConsoleMessage.js
share/webkitgtk-1.0/webinspector/ConsoleModel.js
share/webkitgtk-1.0/webinspector/ConsolePanel.js
share/webkitgtk-1.0/webinspector/ConsoleView.js
+share/webkitgtk-1.0/webinspector/ContentProvider.js
share/webkitgtk-1.0/webinspector/ContentProviders.js
share/webkitgtk-1.0/webinspector/ContextMenu.js
share/webkitgtk-1.0/webinspector/CookieItemsView.js
@@ -355,6 +390,7 @@ share/webkitgtk-1.0/webinspector/CookieParser.js
share/webkitgtk-1.0/webinspector/CookiesTable.js
share/webkitgtk-1.0/webinspector/DOMAgent.js
share/webkitgtk-1.0/webinspector/DOMBreakpointsSidebarPane.js
+share/webkitgtk-1.0/webinspector/DOMExtension.js
share/webkitgtk-1.0/webinspector/DOMPresentationUtils.js
share/webkitgtk-1.0/webinspector/DOMStorage.js
share/webkitgtk-1.0/webinspector/DOMStorageItemsView.js
@@ -364,10 +400,10 @@ share/webkitgtk-1.0/webinspector/Database.js
share/webkitgtk-1.0/webinspector/DatabaseQueryView.js
share/webkitgtk-1.0/webinspector/DatabaseTableView.js
share/webkitgtk-1.0/webinspector/DebuggerModel.js
-share/webkitgtk-1.0/webinspector/DebuggerPresentationModel.js
-share/webkitgtk-1.0/webinspector/DetailedHeapshotGridNodes.js
-share/webkitgtk-1.0/webinspector/DetailedHeapshotView.js
+share/webkitgtk-1.0/webinspector/DebuggerScriptMapping.js
+share/webkitgtk-1.0/webinspector/DefaultTextEditor.js
share/webkitgtk-1.0/webinspector/Dialog.js
+share/webkitgtk-1.0/webinspector/DirectoryContentView.js
share/webkitgtk-1.0/webinspector/Drawer.js
share/webkitgtk-1.0/webinspector/ElementsPanel.js
share/webkitgtk-1.0/webinspector/ElementsTreeOutline.js
@@ -378,13 +414,23 @@ share/webkitgtk-1.0/webinspector/ExtensionAuditCategory.js
share/webkitgtk-1.0/webinspector/ExtensionPanel.js
share/webkitgtk-1.0/webinspector/ExtensionRegistryStub.js
share/webkitgtk-1.0/webinspector/ExtensionServer.js
+share/webkitgtk-1.0/webinspector/ExtensionView.js
+share/webkitgtk-1.0/webinspector/FileContentView.js
+share/webkitgtk-1.0/webinspector/FileManager.js
+share/webkitgtk-1.0/webinspector/FileSystemModel.js
+share/webkitgtk-1.0/webinspector/FileSystemView.js
+share/webkitgtk-1.0/webinspector/FileUtils.js
share/webkitgtk-1.0/webinspector/FilteredItemSelectionDialog.js
share/webkitgtk-1.0/webinspector/FontView.js
share/webkitgtk-1.0/webinspector/GoToLineDialog.js
share/webkitgtk-1.0/webinspector/HAREntry.js
share/webkitgtk-1.0/webinspector/HandlerRegistry.js
share/webkitgtk-1.0/webinspector/HeapSnapshot.js
+share/webkitgtk-1.0/webinspector/HeapSnapshotDataGrids.js
+share/webkitgtk-1.0/webinspector/HeapSnapshotGridNodes.js
+share/webkitgtk-1.0/webinspector/HeapSnapshotLoader.js
share/webkitgtk-1.0/webinspector/HeapSnapshotProxy.js
+share/webkitgtk-1.0/webinspector/HeapSnapshotView.js
share/webkitgtk-1.0/webinspector/HeapSnapshotWorker.js
share/webkitgtk-1.0/webinspector/HeapSnapshotWorkerDispatcher.js
share/webkitgtk-1.0/webinspector/HelpScreen.js
@@ -419,6 +465,7 @@ share/webkitgtk-1.0/webinspector/Images/domain.png
share/webkitgtk-1.0/webinspector/Images/errorIcon.png
share/webkitgtk-1.0/webinspector/Images/errorMediumIcon.png
share/webkitgtk-1.0/webinspector/Images/errorRedDot.png
+share/webkitgtk-1.0/webinspector/Images/fileSystem.png
share/webkitgtk-1.0/webinspector/Images/forward.png
share/webkitgtk-1.0/webinspector/Images/frame.png
share/webkitgtk-1.0/webinspector/Images/glossyHeader.png
@@ -432,7 +479,6 @@ share/webkitgtk-1.0/webinspector/Images/indexedDB.png
share/webkitgtk-1.0/webinspector/Images/indexedDBIndex.png
share/webkitgtk-1.0/webinspector/Images/indexedDBObjectStore.png
share/webkitgtk-1.0/webinspector/Images/localStorage.png
-share/webkitgtk-1.0/webinspector/Images/navigatorPinButton.png
share/webkitgtk-1.0/webinspector/Images/navigatorShowHideButton.png
share/webkitgtk-1.0/webinspector/Images/paneAddButtons.png
share/webkitgtk-1.0/webinspector/Images/paneBottomGrow.png
@@ -459,6 +505,8 @@ share/webkitgtk-1.0/webinspector/Images/resourcePlainIconSmall.png
share/webkitgtk-1.0/webinspector/Images/resourcesSizeGraphIcon.png
share/webkitgtk-1.0/webinspector/Images/resourcesTimeGraphIcon.png
share/webkitgtk-1.0/webinspector/Images/scriptsSilhouette.png
+share/webkitgtk-1.0/webinspector/Images/searchNext.png
+share/webkitgtk-1.0/webinspector/Images/searchPrev.png
share/webkitgtk-1.0/webinspector/Images/searchSmallBlue.png
share/webkitgtk-1.0/webinspector/Images/searchSmallBrightBlue.png
share/webkitgtk-1.0/webinspector/Images/searchSmallGray.png
@@ -477,12 +525,7 @@ share/webkitgtk-1.0/webinspector/Images/spinnerInactive.gif
share/webkitgtk-1.0/webinspector/Images/spinnerInactiveSelected.gif
share/webkitgtk-1.0/webinspector/Images/splitviewDimple.png
share/webkitgtk-1.0/webinspector/Images/splitviewDividerBackground.png
-share/webkitgtk-1.0/webinspector/Images/statusbarBackground.png
-share/webkitgtk-1.0/webinspector/Images/statusbarBottomBackground.png
share/webkitgtk-1.0/webinspector/Images/statusbarButtonGlyphs.png
-share/webkitgtk-1.0/webinspector/Images/statusbarButtons.png
-share/webkitgtk-1.0/webinspector/Images/statusbarMenuButton.png
-share/webkitgtk-1.0/webinspector/Images/statusbarMenuButtonSelected.png
share/webkitgtk-1.0/webinspector/Images/statusbarResizerHorizontal.png
share/webkitgtk-1.0/webinspector/Images/statusbarResizerVertical.png
share/webkitgtk-1.0/webinspector/Images/successGreenDot.png
@@ -492,15 +535,7 @@ share/webkitgtk-1.0/webinspector/Images/thumbHoriz.png
share/webkitgtk-1.0/webinspector/Images/thumbHoverHoriz.png
share/webkitgtk-1.0/webinspector/Images/thumbHoverVert.png
share/webkitgtk-1.0/webinspector/Images/thumbVert.png
-share/webkitgtk-1.0/webinspector/Images/timelineBarBlue.png
-share/webkitgtk-1.0/webinspector/Images/timelineBarGray.png
-share/webkitgtk-1.0/webinspector/Images/timelineBarGreen.png
-share/webkitgtk-1.0/webinspector/Images/timelineBarOrange.png
-share/webkitgtk-1.0/webinspector/Images/timelineBarPurple.png
-share/webkitgtk-1.0/webinspector/Images/timelineBarRed.png
-share/webkitgtk-1.0/webinspector/Images/timelineBarYellow.png
-share/webkitgtk-1.0/webinspector/Images/timelineCheckmarks.png
-share/webkitgtk-1.0/webinspector/Images/timelineDots.png
+share/webkitgtk-1.0/webinspector/Images/tickMark.png
share/webkitgtk-1.0/webinspector/Images/timelineHollowPillBlue.png
share/webkitgtk-1.0/webinspector/Images/timelineHollowPillGray.png
share/webkitgtk-1.0/webinspector/Images/timelineHollowPillGreen.png
@@ -534,55 +569,68 @@ share/webkitgtk-1.0/webinspector/Images/warningMediumIcon.png
share/webkitgtk-1.0/webinspector/Images/warningOrangeDot.png
share/webkitgtk-1.0/webinspector/Images/warningsErrors.png
share/webkitgtk-1.0/webinspector/IndexedDBModel.js
-share/webkitgtk-1.0/webinspector/InjectedFakeWorker.js
+share/webkitgtk-1.0/webinspector/IndexedDBViews.js
share/webkitgtk-1.0/webinspector/InspectorBackend.js
-share/webkitgtk-1.0/webinspector/InspectorBackendStub.js
+share/webkitgtk-1.0/webinspector/InspectorBackendCommands.js
share/webkitgtk-1.0/webinspector/InspectorFrontendAPI.js
share/webkitgtk-1.0/webinspector/InspectorFrontendHostStub.js
share/webkitgtk-1.0/webinspector/InspectorView.js
share/webkitgtk-1.0/webinspector/JavaScriptContextManager.js
share/webkitgtk-1.0/webinspector/JavaScriptFormatter.js
+share/webkitgtk-1.0/webinspector/JavaScriptSource.js
share/webkitgtk-1.0/webinspector/JavaScriptSourceFrame.js
share/webkitgtk-1.0/webinspector/KeyboardShortcut.js
+share/webkitgtk-1.0/webinspector/Linkifier.js
share/webkitgtk-1.0/webinspector/MemoryStatistics.js
share/webkitgtk-1.0/webinspector/MetricsSidebarPane.js
+share/webkitgtk-1.0/webinspector/NativeBreakpointsSidebarPane.js
+share/webkitgtk-1.0/webinspector/NativeMemorySnapshotView.js
+share/webkitgtk-1.0/webinspector/NavigatorOverlayController.js
+share/webkitgtk-1.0/webinspector/NavigatorView.js
share/webkitgtk-1.0/webinspector/NetworkItemView.js
share/webkitgtk-1.0/webinspector/NetworkLog.js
share/webkitgtk-1.0/webinspector/NetworkManager.js
share/webkitgtk-1.0/webinspector/NetworkPanel.js
+share/webkitgtk-1.0/webinspector/NetworkRequest.js
share/webkitgtk-1.0/webinspector/Object.js
share/webkitgtk-1.0/webinspector/ObjectPopoverHelper.js
share/webkitgtk-1.0/webinspector/ObjectPropertiesSection.js
share/webkitgtk-1.0/webinspector/Panel.js
share/webkitgtk-1.0/webinspector/PanelEnablerView.js
-share/webkitgtk-1.0/webinspector/PartialQuickSort.js
share/webkitgtk-1.0/webinspector/Placard.js
share/webkitgtk-1.0/webinspector/Popover.js
+share/webkitgtk-1.0/webinspector/PresentationConsoleMessageHelper.js
share/webkitgtk-1.0/webinspector/ProfileDataGridTree.js
share/webkitgtk-1.0/webinspector/ProfileLauncherView.js
-share/webkitgtk-1.0/webinspector/ProfileView.js
share/webkitgtk-1.0/webinspector/ProfilesPanel.js
+share/webkitgtk-1.0/webinspector/ProgressBar.js
share/webkitgtk-1.0/webinspector/PropertiesSection.js
share/webkitgtk-1.0/webinspector/PropertiesSidebarPane.js
share/webkitgtk-1.0/webinspector/RawSourceCode.js
share/webkitgtk-1.0/webinspector/RemoteObject.js
+share/webkitgtk-1.0/webinspector/RequestCookiesView.js
+share/webkitgtk-1.0/webinspector/RequestHTMLView.js
+share/webkitgtk-1.0/webinspector/RequestHeadersView.js
+share/webkitgtk-1.0/webinspector/RequestJSONView.js
+share/webkitgtk-1.0/webinspector/RequestPreviewView.js
+share/webkitgtk-1.0/webinspector/RequestResponseView.js
+share/webkitgtk-1.0/webinspector/RequestTimingView.js
+share/webkitgtk-1.0/webinspector/RequestView.js
share/webkitgtk-1.0/webinspector/Resource.js
-share/webkitgtk-1.0/webinspector/ResourceCategory.js
-share/webkitgtk-1.0/webinspector/ResourceCookiesView.js
-share/webkitgtk-1.0/webinspector/ResourceHTMLView.js
-share/webkitgtk-1.0/webinspector/ResourceHeadersView.js
-share/webkitgtk-1.0/webinspector/ResourceJSONView.js
-share/webkitgtk-1.0/webinspector/ResourcePreviewView.js
-share/webkitgtk-1.0/webinspector/ResourceResponseView.js
-share/webkitgtk-1.0/webinspector/ResourceTimingView.js
+share/webkitgtk-1.0/webinspector/ResourceScriptMapping.js
share/webkitgtk-1.0/webinspector/ResourceTreeModel.js
+share/webkitgtk-1.0/webinspector/ResourceType.js
share/webkitgtk-1.0/webinspector/ResourceUtils.js
share/webkitgtk-1.0/webinspector/ResourceView.js
+share/webkitgtk-1.0/webinspector/ResourceWebSocketFrameView.js
share/webkitgtk-1.0/webinspector/ResourcesPanel.js
+share/webkitgtk-1.0/webinspector/RevisionHistoryView.js
+share/webkitgtk-1.0/webinspector/SASSSourceMapping.js
share/webkitgtk-1.0/webinspector/ScopeChainSidebarPane.js
share/webkitgtk-1.0/webinspector/Script.js
share/webkitgtk-1.0/webinspector/ScriptFormatter.js
share/webkitgtk-1.0/webinspector/ScriptFormatterWorker.js
+share/webkitgtk-1.0/webinspector/ScriptSnippetModel.js
share/webkitgtk-1.0/webinspector/ScriptsNavigator.js
share/webkitgtk-1.0/webinspector/ScriptsPanel.js
share/webkitgtk-1.0/webinspector/ScriptsSearchScope.js
@@ -595,39 +643,52 @@ share/webkitgtk-1.0/webinspector/ShowMoreDataGridNode.js
share/webkitgtk-1.0/webinspector/SidebarOverlay.js
share/webkitgtk-1.0/webinspector/SidebarPane.js
share/webkitgtk-1.0/webinspector/SidebarTreeElement.js
+share/webkitgtk-1.0/webinspector/SnippetJavaScriptSourceFrame.js
+share/webkitgtk-1.0/webinspector/SnippetStorage.js
share/webkitgtk-1.0/webinspector/SoftContextMenu.js
share/webkitgtk-1.0/webinspector/SourceCSSTokenizer.js
share/webkitgtk-1.0/webinspector/SourceFrame.js
share/webkitgtk-1.0/webinspector/SourceHTMLTokenizer.js
share/webkitgtk-1.0/webinspector/SourceJavaScriptTokenizer.js
+share/webkitgtk-1.0/webinspector/SourceMapping.js
share/webkitgtk-1.0/webinspector/SourceTokenizer.js
share/webkitgtk-1.0/webinspector/Spectrum.js
share/webkitgtk-1.0/webinspector/SplitView.js
share/webkitgtk-1.0/webinspector/StatusBarButton.js
+share/webkitgtk-1.0/webinspector/StyleSheetOutlineDialog.js
+share/webkitgtk-1.0/webinspector/StyleSource.js
share/webkitgtk-1.0/webinspector/StylesSidebarPane.js
share/webkitgtk-1.0/webinspector/TabbedEditorContainer.js
share/webkitgtk-1.0/webinspector/TabbedPane.js
share/webkitgtk-1.0/webinspector/TestController.js
+share/webkitgtk-1.0/webinspector/TextEditor.js
share/webkitgtk-1.0/webinspector/TextEditorHighlighter.js
share/webkitgtk-1.0/webinspector/TextEditorModel.js
share/webkitgtk-1.0/webinspector/TextPrompt.js
-share/webkitgtk-1.0/webinspector/TextViewer.js
-share/webkitgtk-1.0/webinspector/TimelineAgent.js
+share/webkitgtk-1.0/webinspector/TimelineFrameController.js
share/webkitgtk-1.0/webinspector/TimelineGrid.js
share/webkitgtk-1.0/webinspector/TimelineManager.js
+share/webkitgtk-1.0/webinspector/TimelineModel.js
share/webkitgtk-1.0/webinspector/TimelineOverviewPane.js
share/webkitgtk-1.0/webinspector/TimelinePanel.js
+share/webkitgtk-1.0/webinspector/TimelinePresentationModel.js
share/webkitgtk-1.0/webinspector/Toolbar.js
share/webkitgtk-1.0/webinspector/TopDownProfileDataGridTree.js
share/webkitgtk-1.0/webinspector/UISourceCode.js
+share/webkitgtk-1.0/webinspector/UISourceCodeFrame.js
+share/webkitgtk-1.0/webinspector/UIString.js
share/webkitgtk-1.0/webinspector/UIUtils.js
share/webkitgtk-1.0/webinspector/UglifyJS/parse-js.js
+share/webkitgtk-1.0/webinspector/UserAgentSupport.js
share/webkitgtk-1.0/webinspector/UserMetrics.js
share/webkitgtk-1.0/webinspector/View.js
share/webkitgtk-1.0/webinspector/WatchExpressionsSidebarPane.js
share/webkitgtk-1.0/webinspector/WorkerManager.js
share/webkitgtk-1.0/webinspector/WorkersSidebarPane.js
+share/webkitgtk-1.0/webinspector/Workspace.js
share/webkitgtk-1.0/webinspector/auditsPanel.css
+share/webkitgtk-1.0/webinspector/breadcrumbList.css
+share/webkitgtk-1.0/webinspector/cmdevtools.css
share/webkitgtk-1.0/webinspector/dataGrid.css
share/webkitgtk-1.0/webinspector/dialog.css
share/webkitgtk-1.0/webinspector/elementsPanel.css
@@ -635,12 +696,16 @@ share/webkitgtk-1.0/webinspector/externs.js
share/webkitgtk-1.0/webinspector/filteredItemSelectionDialog.css
share/webkitgtk-1.0/webinspector/heapProfiler.css
share/webkitgtk-1.0/webinspector/helpScreen.css
+share/webkitgtk-1.0/webinspector/indexedDBViews.css
share/webkitgtk-1.0/webinspector/inspector.css
share/webkitgtk-1.0/webinspector/inspector.html
share/webkitgtk-1.0/webinspector/inspector.js
share/webkitgtk-1.0/webinspector/inspectorCommon.css
share/webkitgtk-1.0/webinspector/inspectorSyntaxHighlight.css
+share/webkitgtk-1.0/webinspector/jsdifflib.js
share/webkitgtk-1.0/webinspector/localizedStrings.js
+share/webkitgtk-1.0/webinspector/nativeMemoryProfiler.css
+share/webkitgtk-1.0/webinspector/navigatorView.css
share/webkitgtk-1.0/webinspector/networkLogView.css
share/webkitgtk-1.0/webinspector/networkPanel.css
share/webkitgtk-1.0/webinspector/panelEnablerView.css
@@ -648,11 +713,13 @@ share/webkitgtk-1.0/webinspector/popover.css
share/webkitgtk-1.0/webinspector/profilesPanel.css
share/webkitgtk-1.0/webinspector/resourceView.css
share/webkitgtk-1.0/webinspector/resourcesPanel.css
+share/webkitgtk-1.0/webinspector/revisionHistory.css
share/webkitgtk-1.0/webinspector/scriptsPanel.css
share/webkitgtk-1.0/webinspector/splitView.css
share/webkitgtk-1.0/webinspector/tabbedPane.css
+share/webkitgtk-1.0/webinspector/test-runner.html
+share/webkitgtk-1.0/webinspector/textEditor.css
share/webkitgtk-1.0/webinspector/textPrompt.css
-share/webkitgtk-1.0/webinspector/textViewer.css
share/webkitgtk-1.0/webinspector/timelinePanel.css
share/webkitgtk-1.0/webinspector/treeoutline.js
share/webkitgtk-1.0/webinspector/utilities.js
diff --git a/www/webkit-gtk/distinfo b/www/webkit-gtk/distinfo
index 04409f2d405..e1431dee60c 100644
--- a/www/webkit-gtk/distinfo
+++ b/www/webkit-gtk/distinfo
@@ -1,18 +1,14 @@
-$NetBSD: distinfo,v 1.54 2012/10/24 15:40:16 joerg Exp $
+$NetBSD: distinfo,v 1.55 2012/10/30 12:46:30 drochner Exp $
-SHA1 (webkit-1.8.3.tar.xz) = ccf567fdfd7fbc63a3340777278e41b17522b80d
-RMD160 (webkit-1.8.3.tar.xz) = a25fe7966630d2a0e0926f565e28a9054d446c14
-Size (webkit-1.8.3.tar.xz) = 7814028 bytes
-SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = a19c152025d16b32cf6e429483d3885bd8243de8
-SHA1 (patch-Source_JavaScriptCore_wtf_MathExtras.h) = a47cf7e70688d46096930b2029d0970576a11b3c
-SHA1 (patch-Source_JavaScriptCore_wtf_Threading.h) = f056b8f08c68d44e1b9dfd2bcf60cb788b05f38f
-SHA1 (patch-Source_WebCore_css_CSSGrammar.y) = 22e704480c4f0045ed9ee20f807ce703f20749e9
-SHA1 (patch-Source_WebCore_css_CSSParser.cpp) = 8a7687bd2361184765f2757335f80a68bdc09bf7
-SHA1 (patch-Source_WebCore_editing_Editor.h) = 80dab9dc483417703b100155816b2a2bedd533e3
-SHA1 (patch-Source_WebCore_xml_XPathGrammar.y) = aa5881029a604673ef3e15be7a8d92ed3489658e
-SHA1 (patch-Source_WebCore_xml_XPathParser.cpp) = 53fec9eb744c9890ba9d2b0511bb917e8c8a1b7f
-SHA1 (patch-ai) = 7b94becb603b88c66d8d8f1619d90dc6553d970c
-SHA1 (patch-aj) = 857bd0111fc6dee35dcf83523ff2438ed71981b7
-SHA1 (patch-ak) = 62135a6e242c2e9c2e8be2d2d00fa1021f9c9525
+SHA1 (webkitgtk-1.10.1.tar.xz) = 3a2df2eb42ffdd7f3b39873d5461c347a6330493
+RMD160 (webkitgtk-1.10.1.tar.xz) = ea246d29a1def4993d592d8464b527b2c9ed1bdc
+Size (webkitgtk-1.10.1.tar.xz) = 8548452 bytes
+SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = c5e1efdac5f6e2a4c035b6a3ce808d0e7a076703
+SHA1 (patch-Source_JavaScriptCore_wtf_Threading.h) = f166335d829aba9051c1aaf1b950ec655deef372
+SHA1 (patch-Source_WebCore_editing_Editor.h) = 43562577dd6432a86fd8ee0a1e7bb0db31f07d2d
+SHA1 (patch-ai) = 8df303ffde5c4398e56601c524e9ab4aff52096c
+SHA1 (patch-aj) = 930d1b5d73028b2f2e5abb33c15f72befadc64ce
+SHA1 (patch-ak) = 64ad843164f1c12968e933080e0966a9019abfdf
SHA1 (patch-al) = 47a931be9ccd0669d77b6e60d5fd098c8d3667ab
-SHA1 (patch-configure) = 5f805583b6292d61a7b13cbf6d35d864774e4cd8
+SHA1 (patch-am) = 9516994b630b43c7c234f61debf8d762cf7aee97
+SHA1 (patch-configure) = 448caea068344fe987e566f73b3f567dad7b93ed
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp
index b6f7f7dcfa6..d94e0dd8438 100644
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp
+++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp
@@ -1,7 +1,7 @@
-$NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.1 2012/02/16 20:47:34 hans Exp $
+$NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.2 2012/10/30 12:46:30 drochner Exp $
---- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig 2011-09-26 22:54:57.000000000 +0200
-+++ Source/JavaScriptCore/heap/MachineStackMarker.cpp 2011-12-08 19:30:49.602746923 +0100
+--- Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig 2012-10-16 15:22:38.000000000 +0000
++++ Source/JavaScriptCore/heap/MachineStackMarker.cpp
@@ -20,6 +20,9 @@
*/
@@ -12,7 +12,7 @@ $NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.1 2012/02/1
#include "MachineStackMarker.h"
#include "ConservativeRoots.h"
-@@ -60,6 +63,10 @@
+@@ -49,6 +52,10 @@
#include <unistd.h>
#if OS(SOLARIS)
@@ -23,7 +23,7 @@ $NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.1 2012/02/1
#include <thread.h>
#else
#include <pthread.h>
-@@ -317,6 +324,7 @@ typedef pthread_attr_t PlatformThreadReg
+@@ -313,6 +320,7 @@ typedef pthread_attr_t PlatformThreadReg
#error Need a thread register struct for this platform
#endif
@@ -31,7 +31,7 @@ $NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.1 2012/02/1
static size_t getPlatformThreadRegisters(const PlatformThread& platformThread, PlatformThreadRegisters& regs)
{
#if OS(DARWIN)
-@@ -377,6 +385,7 @@ static size_t getPlatformThreadRegisters
+@@ -379,6 +387,7 @@ static size_t getPlatformThreadRegisters
#error Need a way to get thread registers on this platform
#endif
}
@@ -39,7 +39,7 @@ $NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.1 2012/02/1
static inline void* otherThreadStackPointer(const PlatformThreadRegisters& regs)
{
-@@ -440,6 +449,7 @@ static inline void* otherThreadStackPoin
+@@ -442,6 +451,7 @@ static inline void* otherThreadStackPoin
#endif
}
@@ -47,7 +47,7 @@ $NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.1 2012/02/1
static void freePlatformThreadRegisters(PlatformThreadRegisters& regs)
{
#if USE(PTHREADS) && !OS(WINDOWS) && !OS(DARWIN) && !OS(QNX)
-@@ -448,24 +458,40 @@ static void freePlatformThreadRegisters(
+@@ -450,20 +460,36 @@ static void freePlatformThreadRegisters(
UNUSED_PARAM(regs);
#endif
}
@@ -55,8 +55,6 @@ $NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.1 2012/02/1
void MachineThreads::gatherFromOtherThread(ConservativeRoots& conservativeRoots, Thread* thread)
{
- suspendThread(thread->platformThread);
-
+#if OS(SOLARIS)
+ struct lwpstatus lwp;
+ char procfile[64];
@@ -83,8 +81,6 @@ $NetBSD: patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp,v 1.1 2012/02/1
void* stackBase = thread->stackBase;
swapIfBackwards(stackPointer, stackBase);
conservativeRoots.add(stackPointer, stackBase);
-
- resumeThread(thread->platformThread);
-
- freePlatformThreadRegisters(regs);
}
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_wtf_MathExtras.h b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_wtf_MathExtras.h
deleted file mode 100644
index 29ab0488c2e..00000000000
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_wtf_MathExtras.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_wtf_MathExtras.h,v 1.2 2012/04/28 14:12:16 drochner Exp $
-
---- Source/JavaScriptCore/wtf/MathExtras.h.orig 2012-04-24 01:38:21.000000000 +0000
-+++ Source/JavaScriptCore/wtf/MathExtras.h
-@@ -277,7 +277,7 @@ inline bool isWithinIntRange(float x)
- return x > static_cast<float>(std::numeric_limits<int>::min()) && x < static_cast<float>(std::numeric_limits<int>::max());
- }
-
--#if !COMPILER(MSVC) && !COMPILER(RVCT) && !OS(SOLARIS)
-+#if !COMPILER(MSVC) && !COMPILER(RVCT) && !(OS(SOLARIS) && COMPILER(GCC) && (GCC_VERSION < 40600))
- using std::isfinite;
- using std::isinf;
- using std::isnan;
diff --git a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_wtf_Threading.h b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_wtf_Threading.h
index 0c94a828c3a..61941ab1a06 100644
--- a/www/webkit-gtk/patches/patch-Source_JavaScriptCore_wtf_Threading.h
+++ b/www/webkit-gtk/patches/patch-Source_JavaScriptCore_wtf_Threading.h
@@ -1,6 +1,8 @@
---- Source/JavaScriptCore/wtf/Threading.h.orig 2011-03-21 19:41:47.000000000 +0100
-+++ Source/JavaScriptCore/wtf/Threading.h 2011-09-13 17:47:57.423475599 +0200
-@@ -113,6 +113,8 @@ using WTF::createThread;
+$NetBSD: patch-Source_JavaScriptCore_wtf_Threading.h,v 1.3 2012/10/30 12:46:30 drochner Exp $
+
+--- Source/WTF/wtf/Threading.h.orig 2012-08-27 19:05:10.000000000 +0000
++++ Source/WTF/wtf/Threading.h
+@@ -112,6 +112,8 @@ using WTF::createThread;
using WTF::currentThread;
using WTF::detachThread;
using WTF::waitForThreadCompletion;
diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_css_CSSGrammar.y b/www/webkit-gtk/patches/patch-Source_WebCore_css_CSSGrammar.y
deleted file mode 100644
index e9ef264d40e..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WebCore_css_CSSGrammar.y
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-Source_WebCore_css_CSSGrammar.y,v 1.1 2012/07/31 13:59:55 prlw1 Exp $
-
-Fix for Bug 92264: Build fix with newer bison 2.6.
-https://bugs.webkit.org/show_bug.cgi?id=92264
-
---- Source/WebCore/css/CSSGrammar.y.orig 2012-04-24 01:35:25.000000000 +0000
-+++ Source/WebCore/css/CSSGrammar.y
-@@ -53,14 +53,13 @@ using namespace HTMLNames;
- #define YYMAXDEPTH 10000
- #define YYDEBUG 0
-
--// FIXME: Replace with %parse-param { CSSParser* parser } once we can depend on bison 2.x
--#define YYPARSE_PARAM parser
--#define YYLEX_PARAM parser
--
- %}
-
- %pure_parser
-
-+%parse-param { CSSParser* parser }
-+%lex-param { CSSParser* parser }
-+
- %union {
- bool boolean;
- char character;
-@@ -88,7 +87,7 @@ using namespace HTMLNames;
-
- %{
-
--static inline int cssyyerror(const char*)
-+static inline int cssyyerror(void*, const char*)
- {
- return 1;
- }
diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_css_CSSParser.cpp b/www/webkit-gtk/patches/patch-Source_WebCore_css_CSSParser.cpp
deleted file mode 100644
index 1bfbfe00c2c..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WebCore_css_CSSParser.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Source_WebCore_css_CSSParser.cpp,v 1.1 2012/07/31 13:59:55 prlw1 Exp $
-
-Fix for Bug 92264: Build fix with newer bison 2.6.
-https://bugs.webkit.org/show_bug.cgi?id=92264
-
---- Source/WebCore/css/CSSParser.cpp.orig 2012-04-24 01:35:25.000000000 +0000
-+++ Source/WebCore/css/CSSParser.cpp
-@@ -101,7 +101,7 @@
- extern int cssyydebug;
- #endif
-
--extern int cssyyparse(void* parser);
-+extern int cssyyparse(WebCore::CSSParser*);
-
- using namespace std;
- using namespace WTF;
diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_editing_Editor.h b/www/webkit-gtk/patches/patch-Source_WebCore_editing_Editor.h
index 8e901f73ee2..7c7de1e7491 100644
--- a/www/webkit-gtk/patches/patch-Source_WebCore_editing_Editor.h
+++ b/www/webkit-gtk/patches/patch-Source_WebCore_editing_Editor.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-Source_WebCore_editing_Editor.h,v 1.1 2012/10/24 15:40:16 joerg Exp $
+$NetBSD: patch-Source_WebCore_editing_Editor.h,v 1.2 2012/10/30 12:46:30 drochner Exp $
---- Source/WebCore/editing/Editor.h.orig 2012-10-23 16:11:11.000000000 +0000
+--- Source/WebCore/editing/Editor.h.orig 2012-10-16 15:22:38.000000000 +0000
+++ Source/WebCore/editing/Editor.h
-@@ -385,7 +385,7 @@ public:
- void deviceScaleFactorChanged();
-
+@@ -398,7 +398,7 @@ public:
+ Vector<String> dictationAlternativesForMarker(const DocumentMarker*);
+ void applyDictationAlternativelternative(const String& alternativeString);
private:
- virtual void willDetachPage() OVERRIDE;
+ virtual void willDetachPage();
diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_xml_XPathGrammar.y b/www/webkit-gtk/patches/patch-Source_WebCore_xml_XPathGrammar.y
deleted file mode 100644
index 781c9cd095d..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WebCore_xml_XPathGrammar.y
+++ /dev/null
@@ -1,472 +0,0 @@
-$NetBSD: patch-Source_WebCore_xml_XPathGrammar.y,v 1.1 2012/07/31 13:59:55 prlw1 Exp $
-
-Fix for Bug 92264: Build fix with newer bison 2.6.
-https://bugs.webkit.org/show_bug.cgi?id=92264
-
---- Source/WebCore/xml/XPathGrammar.y.orig 2012-04-22 23:27:00.000000000 +0000
-+++ Source/WebCore/xml/XPathGrammar.y
-@@ -34,6 +34,7 @@
- #include "XPathParser.h"
- #include "XPathPath.h"
- #include "XPathPredicate.h"
-+#include "XPathStep.h"
- #include "XPathVariableReference.h"
- #include <wtf/FastMalloc.h>
-
-@@ -44,8 +45,6 @@
- #define YYLTYPE_IS_TRIVIAL 1
- #define YYDEBUG 0
- #define YYMAXDEPTH 10000
--#define YYPARSE_PARAM parserParameter
--#define PARSER static_cast<Parser*>(parserParameter)
-
- using namespace WebCore;
- using namespace XPath;
-@@ -53,6 +52,7 @@ using namespace XPath;
- %}
-
- %pure_parser
-+%parse-param { WebCore::XPath::Parser* parser }
-
- %union
- {
-@@ -71,7 +71,7 @@ using namespace XPath;
- %{
-
- static int xpathyylex(YYSTYPE* yylval) { return Parser::current()->lex(yylval); }
--static void xpathyyerror(const char*) { }
-+static void xpathyyerror(void*, const char*) { }
-
- %}
-
-@@ -118,7 +118,7 @@ static void xpathyyerror(const char*) {
- Expr:
- OrExpr
- {
-- PARSER->m_topExpr = $1;
-+ parser->m_topExpr = $1;
- }
- ;
-
-@@ -138,7 +138,7 @@ AbsoluteLocationPath:
- '/'
- {
- $$ = new LocationPath;
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- |
- '/' RelativeLocationPath
-@@ -150,7 +150,7 @@ AbsoluteLocationPath:
- {
- $$ = $2;
- $$->insertFirstStep($1);
-- PARSER->unregisterParseNode($1);
-+ parser->unregisterParseNode($1);
- }
- ;
-
-@@ -159,22 +159,22 @@ RelativeLocationPath:
- {
- $$ = new LocationPath;
- $$->appendStep($1);
-- PARSER->unregisterParseNode($1);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->registerParseNode($$);
- }
- |
- RelativeLocationPath '/' Step
- {
- $$->appendStep($3);
-- PARSER->unregisterParseNode($3);
-+ parser->unregisterParseNode($3);
- }
- |
- RelativeLocationPath DescendantOrSelf Step
- {
- $$->appendStep($2);
- $$->appendStep($3);
-- PARSER->unregisterParseNode($2);
-- PARSER->unregisterParseNode($3);
-+ parser->unregisterParseNode($2);
-+ parser->unregisterParseNode($3);
- }
- ;
-
-@@ -183,58 +183,58 @@ Step:
- {
- if ($2) {
- $$ = new Step(Step::ChildAxis, *$1, *$2);
-- PARSER->deletePredicateVector($2);
-+ parser->deletePredicateVector($2);
- } else
- $$ = new Step(Step::ChildAxis, *$1);
-- PARSER->deleteNodeTest($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteNodeTest($1);
-+ parser->registerParseNode($$);
- }
- |
- NAMETEST OptionalPredicateList
- {
- String localName;
- String namespaceURI;
-- if (!PARSER->expandQName(*$1, localName, namespaceURI)) {
-- PARSER->m_gotNamespaceError = true;
-+ if (!parser->expandQName(*$1, localName, namespaceURI)) {
-+ parser->m_gotNamespaceError = true;
- YYABORT;
- }
-
- if ($2) {
- $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$2);
-- PARSER->deletePredicateVector($2);
-+ parser->deletePredicateVector($2);
- } else
- $$ = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- AxisSpecifier NodeTest OptionalPredicateList
- {
- if ($3) {
- $$ = new Step($1, *$2, *$3);
-- PARSER->deletePredicateVector($3);
-+ parser->deletePredicateVector($3);
- } else
- $$ = new Step($1, *$2);
-- PARSER->deleteNodeTest($2);
-- PARSER->registerParseNode($$);
-+ parser->deleteNodeTest($2);
-+ parser->registerParseNode($$);
- }
- |
- AxisSpecifier NAMETEST OptionalPredicateList
- {
- String localName;
- String namespaceURI;
-- if (!PARSER->expandQName(*$2, localName, namespaceURI)) {
-- PARSER->m_gotNamespaceError = true;
-+ if (!parser->expandQName(*$2, localName, namespaceURI)) {
-+ parser->m_gotNamespaceError = true;
- YYABORT;
- }
-
- if ($3) {
- $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI), *$3);
-- PARSER->deletePredicateVector($3);
-+ parser->deletePredicateVector($3);
- } else
- $$ = new Step($1, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
-- PARSER->deleteString($2);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($2);
-+ parser->registerParseNode($$);
- }
- |
- AbbreviatedStep
-@@ -259,23 +259,23 @@ NodeTest:
- else if (*$1 == "comment")
- $$ = new Step::NodeTest(Step::NodeTest::CommentNodeTest);
-
-- PARSER->deleteString($1);
-- PARSER->registerNodeTest($$);
-+ parser->deleteString($1);
-+ parser->registerNodeTest($$);
- }
- |
- PI '(' ')'
- {
- $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
-- PARSER->deleteString($1);
-- PARSER->registerNodeTest($$);
-+ parser->deleteString($1);
-+ parser->registerNodeTest($$);
- }
- |
- PI '(' LITERAL ')'
- {
- $$ = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, $3->stripWhiteSpace());
-- PARSER->deleteString($1);
-- PARSER->deleteString($3);
-- PARSER->registerNodeTest($$);
-+ parser->deleteString($1);
-+ parser->deleteString($3);
-+ parser->registerNodeTest($$);
- }
- ;
-
-@@ -293,14 +293,14 @@ PredicateList:
- {
- $$ = new Vector<Predicate*>;
- $$->append(new Predicate($1));
-- PARSER->unregisterParseNode($1);
-- PARSER->registerPredicateVector($$);
-+ parser->unregisterParseNode($1);
-+ parser->registerPredicateVector($$);
- }
- |
- PredicateList Predicate
- {
- $$->append(new Predicate($2));
-- PARSER->unregisterParseNode($2);
-+ parser->unregisterParseNode($2);
- }
- ;
-
-@@ -315,7 +315,7 @@ DescendantOrSelf:
- SLASHSLASH
- {
- $$ = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -323,13 +323,13 @@ AbbreviatedStep:
- '.'
- {
- $$ = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- |
- DOTDOT
- {
- $$ = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
-- PARSER->registerParseNode($$);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -337,8 +337,8 @@ PrimaryExpr:
- VARIABLEREFERENCE
- {
- $$ = new VariableReference(*$1);
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- '(' Expr ')'
-@@ -349,15 +349,15 @@ PrimaryExpr:
- LITERAL
- {
- $$ = new StringExpression(*$1);
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- NUMBER
- {
- $$ = new Number($1->toDouble());
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- FunctionCall
-@@ -369,8 +369,8 @@ FunctionCall:
- $$ = createFunction(*$1);
- if (!$$)
- YYABORT;
-- PARSER->deleteString($1);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->registerParseNode($$);
- }
- |
- FUNCTIONNAME '(' ArgumentList ')'
-@@ -378,9 +378,9 @@ FunctionCall:
- $$ = createFunction(*$1, *$3);
- if (!$$)
- YYABORT;
-- PARSER->deleteString($1);
-- PARSER->deleteExpressionVector($3);
-- PARSER->registerParseNode($$);
-+ parser->deleteString($1);
-+ parser->deleteExpressionVector($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -389,14 +389,14 @@ ArgumentList:
- {
- $$ = new Vector<Expression*>;
- $$->append($1);
-- PARSER->unregisterParseNode($1);
-- PARSER->registerExpressionVector($$);
-+ parser->unregisterParseNode($1);
-+ parser->registerExpressionVector($$);
- }
- |
- ArgumentList ',' Argument
- {
- $$->append($3);
-- PARSER->unregisterParseNode($3);
-+ parser->unregisterParseNode($3);
- }
- ;
-
-@@ -412,9 +412,9 @@ UnionExpr:
- $$ = new Union;
- $$->addSubExpression($1);
- $$->addSubExpression($3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -430,9 +430,9 @@ PathExpr:
- {
- $3->setAbsolute(true);
- $$ = new Path(static_cast<Filter*>($1), $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- |
- FilterExpr DescendantOrSelf RelativeLocationPath
-@@ -440,10 +440,10 @@ PathExpr:
- $3->insertFirstStep($2);
- $3->setAbsolute(true);
- $$ = new Path(static_cast<Filter*>($1), $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($2);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($2);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -453,9 +453,9 @@ FilterExpr:
- PrimaryExpr PredicateList
- {
- $$ = new Filter($1, *$2);
-- PARSER->unregisterParseNode($1);
-- PARSER->deletePredicateVector($2);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->deletePredicateVector($2);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -465,9 +465,9 @@ OrExpr:
- OrExpr OR AndExpr
- {
- $$ = new LogicalOp(LogicalOp::OP_Or, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -477,9 +477,9 @@ AndExpr:
- AndExpr AND EqualityExpr
- {
- $$ = new LogicalOp(LogicalOp::OP_And, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -489,9 +489,9 @@ EqualityExpr:
- EqualityExpr EQOP RelationalExpr
- {
- $$ = new EqTestOp($2, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -501,9 +501,9 @@ RelationalExpr:
- RelationalExpr RELOP AdditiveExpr
- {
- $$ = new EqTestOp($2, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -513,17 +513,17 @@ AdditiveExpr:
- AdditiveExpr PLUS MultiplicativeExpr
- {
- $$ = new NumericOp(NumericOp::OP_Add, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- |
- AdditiveExpr MINUS MultiplicativeExpr
- {
- $$ = new NumericOp(NumericOp::OP_Sub, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -533,9 +533,9 @@ MultiplicativeExpr:
- MultiplicativeExpr MULOP UnaryExpr
- {
- $$ = new NumericOp($2, $1, $3);
-- PARSER->unregisterParseNode($1);
-- PARSER->unregisterParseNode($3);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($1);
-+ parser->unregisterParseNode($3);
-+ parser->registerParseNode($$);
- }
- ;
-
-@@ -546,8 +546,8 @@ UnaryExpr:
- {
- $$ = new Negative;
- $$->addSubExpression($2);
-- PARSER->unregisterParseNode($2);
-- PARSER->registerParseNode($$);
-+ parser->unregisterParseNode($2);
-+ parser->registerParseNode($$);
- }
- ;
-
diff --git a/www/webkit-gtk/patches/patch-Source_WebCore_xml_XPathParser.cpp b/www/webkit-gtk/patches/patch-Source_WebCore_xml_XPathParser.cpp
deleted file mode 100644
index b72971f35c6..00000000000
--- a/www/webkit-gtk/patches/patch-Source_WebCore_xml_XPathParser.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-Source_WebCore_xml_XPathParser.cpp,v 1.1 2012/07/31 13:59:55 prlw1 Exp $
-
-Fix for Bug 92264: Build fix with newer bison 2.6.
-https://bugs.webkit.org/show_bug.cgi?id=92264
-
---- Source/WebCore/xml/XPathParser.cpp.orig 2012-04-22 23:27:00.000000000 +0000
-+++ Source/WebCore/xml/XPathParser.cpp
-@@ -32,24 +32,21 @@
- #include "XPathEvaluator.h"
- #include "XPathException.h"
- #include "XPathNSResolver.h"
-+#include "XPathPath.h"
- #include "XPathStep.h"
- #include <wtf/StdLibExtras.h>
- #include <wtf/text/StringHash.h>
-
--int xpathyyparse(void*);
--
-+using namespace WebCore;
- using namespace WTF;
- using namespace Unicode;
-+using namespace XPath;
-
--namespace WebCore {
--namespace XPath {
--
--class LocationPath;
--
--#include "XPathGrammar.h"
-+extern int xpathyyparse(WebCore::XPath::Parser*);
-+#include "XPathGrammar.h"
-
- Parser* Parser::currentParser = 0;
--
-+
- enum XMLCat { NameStart, NameCont, NotPartOfName };
-
- typedef HashMap<String, Step::Axis> AxisNamesMap;
-@@ -630,5 +627,3 @@ void Parser::deleteNodeTest(Step::NodeTe
- delete t;
- }
-
--}
--}
diff --git a/www/webkit-gtk/patches/patch-ai b/www/webkit-gtk/patches/patch-ai
index a9826e5cc01..5ce80446d2f 100644
--- a/www/webkit-gtk/patches/patch-ai
+++ b/www/webkit-gtk/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.2 2012/04/28 14:12:16 drochner Exp $
+$NetBSD: patch-ai,v 1.3 2012/10/30 12:46:30 drochner Exp $
---- Source/JavaScriptCore/wtf/ThreadIdentifierDataPthreads.cpp.orig 2012-04-24 01:38:21.000000000 +0000
-+++ Source/JavaScriptCore/wtf/ThreadIdentifierDataPthreads.cpp
+--- Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp.orig 2012-04-24 01:38:21.000000000 +0000
++++ Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp
@@ -39,6 +39,12 @@
#if OS(ANDROID) || OS(HURD)
// PTHREAD_KEYS_MAX is not defined in bionic nor in Hurd, so explicitly define it here.
diff --git a/www/webkit-gtk/patches/patch-aj b/www/webkit-gtk/patches/patch-aj
index e85a5c156da..fd799101840 100644
--- a/www/webkit-gtk/patches/patch-aj
+++ b/www/webkit-gtk/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.1 2012/04/28 14:12:16 drochner Exp $
+$NetBSD: patch-aj,v 1.2 2012/10/30 12:46:30 drochner Exp $
---- Source/JavaScriptCore/wtf/InlineASM.h.orig 2012-04-25 13:01:47.000000000 +0000
-+++ Source/JavaScriptCore/wtf/InlineASM.h
+--- Source/WTF/wtf/InlineASM.h.orig 2012-10-16 15:22:38.000000000 +0000
++++ Source/WTF/wtf/InlineASM.h
@@ -42,7 +42,7 @@
#define THUMB_FUNC_PARAM(name)
#endif
-#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
+#if (OS(LINUX) || OS(FREEBSD) || OS(NETBSD) || OS(SOLARIS)) && CPU(X86_64) || (OS(SOLARIS) && CPU(X86))
- #define SYMBOL_STRING_RELOCATION(name) #name "@plt"
- #elif OS(DARWIN) || (CPU(X86_64) && COMPILER(MINGW) && !GCC_VERSION_AT_LEAST(4, 5, 0))
- #define SYMBOL_STRING_RELOCATION(name) "_" #name
+ #define GLOBAL_REFERENCE(name) #name "@plt"
+ #elif CPU(X86) && COMPILER(MINGW)
+ #define GLOBAL_REFERENCE(name) "@" #name "@4"
diff --git a/www/webkit-gtk/patches/patch-ak b/www/webkit-gtk/patches/patch-ak
index 201da90d932..7a11a0c4cf2 100644
--- a/www/webkit-gtk/patches/patch-ak
+++ b/www/webkit-gtk/patches/patch-ak
@@ -1,12 +1,12 @@
-$NetBSD: patch-ak,v 1.2 2012/05/06 17:06:37 marino Exp $
+$NetBSD: patch-ak,v 1.3 2012/10/30 12:46:30 drochner Exp $
---- Source/ThirdParty/ANGLE/src/compiler/osinclude.h.orig 2012-04-24 01:35:21.000000000 +0000
+--- Source/ThirdParty/ANGLE/src/compiler/osinclude.h.orig 2012-09-01 14:54:54.000000000 +0000
+++ Source/ThirdParty/ANGLE/src/compiler/osinclude.h
@@ -16,6 +16,7 @@
#define ANGLE_OS_WIN
#elif defined(__APPLE__) || defined(__linux__) || \
defined(__FreeBSD__) || defined(__OpenBSD__) || \
+ defined(__NetBSD__) || defined(__DragonFly__) || \
- defined(__sun) || defined(ANDROID)
- #define ANGLE_OS_POSIX
- #else
+ defined(__sun) || defined(ANDROID) || \
+ defined(__GLIBC__) || defined(__GNU__) || \
+ defined(__QNX__)
diff --git a/www/webkit-gtk/patches/patch-am b/www/webkit-gtk/patches/patch-am
new file mode 100644
index 00000000000..ff522713ace
--- /dev/null
+++ b/www/webkit-gtk/patches/patch-am
@@ -0,0 +1,32 @@
+$NetBSD: patch-am,v 1.1 2012/10/30 12:46:30 drochner Exp $
+
+--- Source/WTF/wtf/RAMSize.cpp.orig 2012-10-19 13:44:57.000000000 +0000
++++ Source/WTF/wtf/RAMSize.cpp
+@@ -27,7 +27,7 @@
+ #include "RAMSize.h"
+
+ #include "StdLibExtras.h"
+-#if OS(DARWIN)
++#if OS(DARWIN) || OS(NETBSD)
+ #include <sys/param.h>
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+@@ -45,13 +45,17 @@ static const size_t ramSizeGuess = 128 *
+
+ static size_t computeRAMSize()
+ {
+-#if OS(DARWIN)
++#if OS(DARWIN) || OS(NETBSD)
+ int mib[2];
+ uint64_t ramSize;
+ size_t length;
+
+ mib[0] = CTL_HW;
++#if OS(DARWIN)
+ mib[1] = HW_MEMSIZE;
++#else
++ mib[1] = HW_PHYSMEM64;
++#endif
+ length = sizeof(int64_t);
+ int sysctlResult = sysctl(mib, 2, &ramSize, &length, 0, 0);
+ if (sysctlResult == -1)
diff --git a/www/webkit-gtk/patches/patch-configure b/www/webkit-gtk/patches/patch-configure
index 5001e294dda..133ff51dd37 100644
--- a/www/webkit-gtk/patches/patch-configure
+++ b/www/webkit-gtk/patches/patch-configure
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.4 2012/04/28 14:12:16 drochner Exp $
+$NetBSD: patch-configure,v 1.5 2012/10/30 12:46:30 drochner Exp $
---- configure.orig 2012-04-24 05:17:08.000000000 +0000
+--- configure.orig 2012-10-16 22:11:45.000000000 +0000
+++ configure
-@@ -19143,10 +19143,6 @@ install-data-am: install-gsettings-schem
+@@ -18587,10 +18587,6 @@ install-data-am: install-gsettings-schem
.SECONDARY: $(gsettings_SCHEMAS)
@@ -13,7 +13,7 @@ $NetBSD: patch-configure,v 1.4 2012/04/28 14:12:16 drochner Exp $
install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
@$(NORMAL_INSTALL)
test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"
-@@ -19154,7 +19150,7 @@ install-gsettings-schemas: $(gsettings_S
+@@ -18598,7 +18594,7 @@ install-gsettings-schemas: $(gsettings_S
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
@@ -22,10 +22,10 @@ $NetBSD: patch-configure,v 1.4 2012/04/28 14:12:16 drochner Exp $
while read files; do \
echo " $(INSTALL_DATA) $$files '\''$(DESTDIR)$(gsettingsschemadir)'\''"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(gsettingsschemadir)" || exit $$?; \
-@@ -20440,7 +20436,7 @@ fi
-
- done
+@@ -22297,7 +22293,7 @@ fi
+ fi
+ if test "$with_acceleration_backend" = "opengl"; then
- OPENGL_LIBS="-lGL -ldl"
+ OPENGL_LIBS="-lGL"
fi