Yo, so here's a diff for the latest and greatest webkit, currently still building on sparc64/powerpc, builds and runs f...@amd64. Give it a shot with the usual suspects building against it.
Landry
? libwebkit-1.0.so.2.0 Index: Makefile =================================================================== RCS file: /cvs/ports/www/webkit/Makefile,v retrieving revision 1.24 diff -u -r1.24 Makefile --- Makefile 5 Apr 2010 21:44:41 -0000 1.24 +++ Makefile 21 Apr 2010 13:02:18 -0000 @@ -2,10 +2,10 @@ COMMENT = open source web browser engine -V = 1.1.18 +V = 1.2.0 DISTNAME = webkit-${V} # XXX do not remove v0. pX comes before vX. -PKGNAME = webkit-${V}p1v0 +PKGNAME = webkit-${V}v0 CATEGORIES = www HOMEPAGE = http://webkitgtk.org/ @@ -13,7 +13,7 @@ MAINTAINER = Landry Breuil <gas...@gcu.info> -SHARED_LIBS = webkit-1.0 2.0 #.16.0 +SHARED_LIBS = webkit-1.0 2.1 #.19.2 # LGPLv2 / BSD PERMIT_PACKAGE_CDROM = Yes @@ -54,7 +54,7 @@ LIB_DEPENDS = gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0,gailutil::x11/gtk+2,-main \ gstreamer-0.10,gstbase-0.10::multimedia/gstreamer-0.10/core \ - gstvideo-0.10,gstpbutils-0.10::multimedia/gstreamer-0.10/plugins-base \ + gstvideo-0.10,gstapp-0.10,gstpbutils-0.10::multimedia/gstreamer-0.10/plugins-base \ icudata,icui18n,icuuc::textproc/icu4c \ sqlite3::databases/sqlite3 \ xslt::textproc/libxslt \ Index: distinfo =================================================================== RCS file: /cvs/ports/www/webkit/distinfo,v retrieving revision 1.11 diff -u -r1.11 distinfo --- distinfo 10 Jan 2010 20:06:17 -0000 1.11 +++ distinfo 21 Apr 2010 13:02:18 -0000 @@ -1,5 +1,5 @@ -MD5 (webkit-1.1.18.tar.gz) = EOUsMIN/4OKsZj/LQpDh0w== -RMD160 (webkit-1.1.18.tar.gz) = LB1pxeWO7tqfg2XRJLozdP+qCRw= -SHA1 (webkit-1.1.18.tar.gz) = AJCMLzlqUHmA5BhCHgzWoR5u0CY= -SHA256 (webkit-1.1.18.tar.gz) = jOUPwkHo8KO/rsnQ3aGRSZrT9wRjybqaaxpvfknixGk= -SIZE (webkit-1.1.18.tar.gz) = 6745038 +MD5 (webkit-1.2.0.tar.gz) = sr/LxLvx0KUfhIy1TCHuZg== +RMD160 (webkit-1.2.0.tar.gz) = EitA8tEDQGpC5TQPpmYngaDjVuI= +SHA1 (webkit-1.2.0.tar.gz) = rJ23wlRx7tnQPqkM6hwLM3i21H4= +SHA256 (webkit-1.2.0.tar.gz) = DOSSeJcIV9s3TTH9GDG/Qv+x3KR5fvOZEaltAdjF4fc= +SIZE (webkit-1.2.0.tar.gz) = 7554632 Index: patches/patch-GNUmakefile_in =================================================================== RCS file: /cvs/ports/www/webkit/patches/patch-GNUmakefile_in,v retrieving revision 1.5 diff -u -r1.5 patch-GNUmakefile_in --- patches/patch-GNUmakefile_in 10 Jan 2010 20:06:17 -0000 1.5 +++ patches/patch-GNUmakefile_in 21 Apr 2010 13:02:18 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.5 2010/01/10 20:06:17 landry Exp $ ---- GNUmakefile.in.orig Tue Jan 5 17:50:30 2010 -+++ GNUmakefile.in Tue Jan 5 23:00:36 2010 -@@ -5642,7 +5642,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES +--- GNUmakefile.in.orig Mon Apr 5 14:55:24 2010 ++++ GNUmakefile.in Tue Apr 20 21:06:39 2010 +@@ -5877,7 +5877,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) AM_V_CC = $(am__v_CC_$(V)) am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) @@ -10,7 +10,7 @@ AM_V_at = $(am__v_at_$(V)) am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ -@@ -5652,22 +5652,22 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG +@@ -5887,22 +5887,22 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG $(AM_LDFLAGS) $(LDFLAGS) -o $@ AM_V_CCLD = $(am__v_CCLD_$(V)) am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) @@ -37,7 +37,7 @@ SOURCES = $(TestNetscapePlugin_libtestnetscapeplugin_la_SOURCES) \ $(libJavaScriptCore_la_SOURCES) \ $(nodist_libJavaScriptCore_la_SOURCES) \ -@@ -8650,9 +8650,10 @@ libJavaScriptCore_la_SOURCES = \ +@@ -8956,9 +8956,10 @@ libJavaScriptCore_la_SOURCES = \ libJavaScriptCore_la_LIBADD = \ $(UNICODE_LIBS) \ @@ -50,7 +50,7 @@ libJavaScriptCore_la_CXXFLAGS = \ $(global_cxxflags) \ $(libJavaScriptCore_la_CFLAGS) -@@ -8718,12 +8719,12 @@ libwebkit_1_0_la_CPPFLAGS = \ +@@ -9007,12 +9008,12 @@ libwebkit_1_0_la_CPPFLAGS = \ $(HILDON_CPPFLAGS) libwebkit_1_0_la_LDFLAGS = \ @@ -62,9 +62,9 @@ libwebkit_1_0_la_LIBADD = \ - -lpthread \ libJavaScriptCore.la \ - libWebCore.la \ libWebCoreJS.la \ -@@ -8786,7 +8787,7 @@ Programs_minidom_CFLAGS = \ + $(webcore_ldflags) \ +@@ -9074,7 +9075,7 @@ Programs_minidom_CFLAGS = \ Programs_minidom_LDADD = \ libJavaScriptCore.la \ -lm \ Index: patches/patch-JavaScriptCore_wtf_Platform_h =================================================================== RCS file: patches/patch-JavaScriptCore_wtf_Platform_h diff -N patches/patch-JavaScriptCore_wtf_Platform_h --- patches/patch-JavaScriptCore_wtf_Platform_h 10 Jan 2010 20:06:17 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-JavaScriptCore_wtf_Platform_h,v 1.2 2010/01/10 20:06:17 landry Exp $ -Fixes SIGBUS at runtime : https://bugs.webkit.org/show_bug.cgi?id=19775 ---- JavaScriptCore/wtf/Platform.h.orig Tue Jan 5 17:07:27 2010 -+++ JavaScriptCore/wtf/Platform.h Tue Jan 5 23:03:33 2010 -@@ -804,7 +804,7 @@ - #endif - - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) --#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) || CPU(IA64) || CPU(ALPHA) -+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) || CPU(IA64) || CPU(ALPHA) || CPU(SPARC64) - #define WTF_USE_JSVALUE64 1 - #elif CPU(ARM) || CPU(PPC64) - #define WTF_USE_JSVALUE32 1 Index: patches/patch-JavaScriptCore_wtf_TCSpinLock_h =================================================================== RCS file: /cvs/ports/www/webkit/patches/patch-JavaScriptCore_wtf_TCSpinLock_h,v retrieving revision 1.1 diff -u -r1.1 patch-JavaScriptCore_wtf_TCSpinLock_h --- patches/patch-JavaScriptCore_wtf_TCSpinLock_h 10 Jan 2010 20:06:17 -0000 1.1 +++ patches/patch-JavaScriptCore_wtf_TCSpinLock_h 21 Apr 2010 13:02:18 -0000 @@ -7,14 +7,14 @@ .if ${MACHINE_ARCH} == "powerpc" CONFIGURE_ARGS += --enable-optimizations=no .endif ---- JavaScriptCore/wtf/TCSpinLock.h.orig Sat Jan 9 15:20:30 2010 -+++ JavaScriptCore/wtf/TCSpinLock.h Sat Jan 9 15:20:48 2010 +--- JavaScriptCore/wtf/TCSpinLock.h.orig Fri Mar 19 16:20:53 2010 ++++ JavaScriptCore/wtf/TCSpinLock.h Tue Apr 20 21:09:25 2010 @@ -33,7 +33,7 @@ #ifndef TCMALLOC_INTERNAL_SPINLOCK_H__ #define TCMALLOC_INTERNAL_SPINLOCK_H__ --#if (CPU(X86) || CPU(PPC)) && (COMPILER(GCC) || COMPILER(MSVC)) -+#if CPU(X86) && (COMPILER(GCC) || COMPILER(MSVC)) +-#if (CPU(X86) || CPU(X86_64) || CPU(PPC)) && (COMPILER(GCC) || COMPILER(MSVC)) ++#if (CPU(X86) || CPU(X86_64)) && (COMPILER(GCC) || COMPILER(MSVC)) #include <time.h> /* For nanosleep() */ Index: patches/patch-WebCore_plugins_PluginDatabase_cpp =================================================================== RCS file: /cvs/ports/www/webkit/patches/patch-WebCore_plugins_PluginDatabase_cpp,v retrieving revision 1.2 diff -u -r1.2 patch-WebCore_plugins_PluginDatabase_cpp --- patches/patch-WebCore_plugins_PluginDatabase_cpp 5 Apr 2010 21:44:41 -0000 1.2 +++ patches/patch-WebCore_plugins_PluginDatabase_cpp 21 Apr 2010 13:02:18 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-WebCore_plugins_PluginDatabase_cpp,v 1.2 2010/04/05 21:44:41 landry Exp $ ---- WebCore/plugins/PluginDatabase.cpp.orig Tue Jan 5 17:07:28 2010 -+++ WebCore/plugins/PluginDatabase.cpp Wed Mar 24 17:42:53 2010 -@@ -339,6 +339,7 @@ Vector<String> PluginDatabase::defaultPluginDirectorie +--- WebCore/plugins/PluginDatabase.cpp.orig Fri Mar 19 16:20:54 2010 ++++ WebCore/plugins/PluginDatabase.cpp Tue Apr 20 21:06:39 2010 +@@ -340,6 +340,7 @@ Vector<String> PluginDatabase::defaultPluginDirectorie userPluginPath.append(String("/.netscape/plugins")); paths.append(userPluginPath); Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/www/webkit/pkg/PLIST,v retrieving revision 1.11 diff -u -r1.11 PLIST --- pkg/PLIST 10 Jan 2010 20:06:17 -0000 1.11 +++ pkg/PLIST 21 Apr 2010 13:02:18 -0000 @@ -19,6 +19,7 @@ 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/webkitgeolocationpolicydecision.h include/webkit-1.0/webkit/webkithittestresult.h include/webkit-1.0/webkit/webkitnetworkrequest.h include/webkit-1.0/webkit/webkitnetworkresponse.h @@ -39,47 +40,28 @@ include/webkit-1.0/webkit/webkitwebwindowfeatures.h lib/libwebkit-1.0.a lib/libwebkit-1.0.la -lib/pkgconfig/ lib/pkgconfig/webkit-1.0.pc -share/locale/ -share/locale/de/ -share/locale/de/LC_MESSAGES/ +share/locale/cs/LC_MESSAGES/webkit.mo share/locale/de/LC_MESSAGES/webkit.mo -share/locale/en_GB/ -share/locale/en_GB/LC_MESSAGES/ share/locale/en_GB/LC_MESSAGES/webkit.mo -share/locale/es/ -share/locale/es/LC_MESSAGES/ share/locale/es/LC_MESSAGES/webkit.mo -share/locale/it/ -share/locale/it/LC_MESSAGES/ +share/locale/et/LC_MESSAGES/webkit.mo +share/locale/gu/LC_MESSAGES/webkit.mo +share/locale/he/LC_MESSAGES/webkit.mo share/locale/it/LC_MESSAGES/webkit.mo -share/locale/lt/ -share/locale/lt/LC_MESSAGES/ share/locale/lt/LC_MESSAGES/webkit.mo -share/locale/nl/ -share/locale/nl/LC_MESSAGES/ +share/locale/lv/LC_MESSAGES/webkit.mo share/locale/nl/LC_MESSAGES/webkit.mo -share/locale/pt_BR/ -share/locale/pt_BR/LC_MESSAGES/ +share/locale/pa/LC_MESSAGES/webkit.mo +share/locale/pt/LC_MESSAGES/webkit.mo 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/sr/ -share/locale/sr/LC_MESSAGES/ +share/locale/sl/LC_MESSAGES/webkit.mo share/locale/sr/LC_MESSAGES/webkit.mo -share/locale/s...@latin/ -share/locale/s...@latin/LC_MESSAGES/ share/locale/s...@latin/LC_MESSAGES/webkit.mo -share/locale/sv/ -share/locale/sv/LC_MESSAGES/ share/locale/sv/LC_MESSAGES/webkit.mo -share/locale/vi/ -share/locale/vi/LC_MESSAGES/ +share/locale/uk/LC_MESSAGES/webkit.mo share/locale/vi/LC_MESSAGES/webkit.mo -share/locale/zh_CN/ -share/locale/zh_CN/LC_MESSAGES/ share/locale/zh_CN/LC_MESSAGES/webkit.mo share/webkit-1.0/ share/webkit-1.0/images/ @@ -93,16 +75,18 @@ share/webkit-1.0/resources/error.html share/webkit-1.0/webinspector/ share/webkit-1.0/webinspector/AbstractTimelinePanel.js +share/webkit-1.0/webinspector/AuditCategories.js share/webkit-1.0/webinspector/AuditLauncherView.js share/webkit-1.0/webinspector/AuditResultView.js +share/webkit-1.0/webinspector/AuditRules.js share/webkit-1.0/webinspector/AuditsPanel.js 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/CSSSourceSyntaxHighlighter.js share/webkit-1.0/webinspector/CallStackSidebarPane.js share/webkit-1.0/webinspector/Callback.js share/webkit-1.0/webinspector/ChangesView.js +share/webkit-1.0/webinspector/Checkbox.js share/webkit-1.0/webinspector/Color.js share/webkit-1.0/webinspector/ConsolePanel.js share/webkit-1.0/webinspector/ConsoleView.js @@ -111,6 +95,7 @@ share/webkit-1.0/webinspector/DOMAgent.js share/webkit-1.0/webinspector/DOMStorage.js share/webkit-1.0/webinspector/DOMStorageItemsView.js +share/webkit-1.0/webinspector/DOMSyntaxHighlighter.js share/webkit-1.0/webinspector/DataGrid.js share/webkit-1.0/webinspector/Database.js share/webkit-1.0/webinspector/DatabaseQueryView.js @@ -122,7 +107,14 @@ share/webkit-1.0/webinspector/FontView.js share/webkit-1.0/webinspector/ImageView.js share/webkit-1.0/webinspector/Images/ +share/webkit-1.0/webinspector/Images/auditsIcon.png share/webkit-1.0/webinspector/Images/back.png +share/webkit-1.0/webinspector/Images/breakpointBorder.png +share/webkit-1.0/webinspector/Images/breakpointConditionalBorder.png +share/webkit-1.0/webinspector/Images/breakpointConditionalCounterBorder.png +share/webkit-1.0/webinspector/Images/breakpointCounterBorder.png +share/webkit-1.0/webinspector/Images/breakpointsActivateButtonGlyph.png +share/webkit-1.0/webinspector/Images/breakpointsDeactivateButtonGlyph.png share/webkit-1.0/webinspector/Images/checker.png share/webkit-1.0/webinspector/Images/clearConsoleButtonGlyph.png share/webkit-1.0/webinspector/Images/closeButtons.png @@ -155,6 +147,7 @@ share/webkit-1.0/webinspector/Images/excludeButtonGlyph.png share/webkit-1.0/webinspector/Images/focusButtonGlyph.png share/webkit-1.0/webinspector/Images/forward.png +share/webkit-1.0/webinspector/Images/gearButtonGlyph.png share/webkit-1.0/webinspector/Images/glossyHeader.png share/webkit-1.0/webinspector/Images/glossyHeaderPressed.png share/webkit-1.0/webinspector/Images/glossyHeaderSelected.png @@ -172,11 +165,14 @@ share/webkit-1.0/webinspector/Images/paneSettingsButtons.png share/webkit-1.0/webinspector/Images/pauseOnExceptionButtonGlyph.png share/webkit-1.0/webinspector/Images/percentButtonGlyph.png +share/webkit-1.0/webinspector/Images/popoverArrows.png +share/webkit-1.0/webinspector/Images/popoverBackground.png share/webkit-1.0/webinspector/Images/profileGroupIcon.png share/webkit-1.0/webinspector/Images/profileIcon.png share/webkit-1.0/webinspector/Images/profileSmallIcon.png share/webkit-1.0/webinspector/Images/profilesIcon.png share/webkit-1.0/webinspector/Images/profilesSilhouette.png +share/webkit-1.0/webinspector/Images/programCounterBorder.png share/webkit-1.0/webinspector/Images/radioDot.png share/webkit-1.0/webinspector/Images/recordButtonGlyph.png share/webkit-1.0/webinspector/Images/recordToggledButtonGlyph.png @@ -204,6 +200,7 @@ share/webkit-1.0/webinspector/Images/segmentSelected.png share/webkit-1.0/webinspector/Images/segmentSelectedEnd.png share/webkit-1.0/webinspector/Images/sessionStorage.png +share/webkit-1.0/webinspector/Images/spinner.gif share/webkit-1.0/webinspector/Images/splitviewDimple.png share/webkit-1.0/webinspector/Images/splitviewDividerBackground.png share/webkit-1.0/webinspector/Images/statusbarBackground.png @@ -215,6 +212,12 @@ share/webkit-1.0/webinspector/Images/statusbarResizerVertical.png share/webkit-1.0/webinspector/Images/storageIcon.png share/webkit-1.0/webinspector/Images/successGreenDot.png +share/webkit-1.0/webinspector/Images/thumbActiveHoriz.png +share/webkit-1.0/webinspector/Images/thumbActiveVert.png +share/webkit-1.0/webinspector/Images/thumbHoriz.png +share/webkit-1.0/webinspector/Images/thumbHoverHoriz.png +share/webkit-1.0/webinspector/Images/thumbHoverVert.png +share/webkit-1.0/webinspector/Images/thumbVert.png share/webkit-1.0/webinspector/Images/timelineBarBlue.png share/webkit-1.0/webinspector/Images/timelineBarGray.png share/webkit-1.0/webinspector/Images/timelineBarGreen.png @@ -240,6 +243,8 @@ share/webkit-1.0/webinspector/Images/timelinePillRed.png share/webkit-1.0/webinspector/Images/timelinePillYellow.png share/webkit-1.0/webinspector/Images/toolbarItemSelected.png +share/webkit-1.0/webinspector/Images/trackHoriz.png +share/webkit-1.0/webinspector/Images/trackVert.png share/webkit-1.0/webinspector/Images/treeDownTriangleBlack.png share/webkit-1.0/webinspector/Images/treeDownTriangleWhite.png share/webkit-1.0/webinspector/Images/treeRightTriangleBlack.png @@ -255,11 +260,11 @@ share/webkit-1.0/webinspector/Images/warningOrangeDot.png share/webkit-1.0/webinspector/Images/warningsErrors.png share/webkit-1.0/webinspector/Images/whiteConnectorPoint.png +share/webkit-1.0/webinspector/InjectedFakeWorker.js share/webkit-1.0/webinspector/InjectedScript.js share/webkit-1.0/webinspector/InjectedScriptAccess.js share/webkit-1.0/webinspector/InspectorBackendStub.js share/webkit-1.0/webinspector/InspectorFrontendHostStub.js -share/webkit-1.0/webinspector/JavaScriptSourceSyntaxHighlighter.js share/webkit-1.0/webinspector/KeyboardShortcut.js share/webkit-1.0/webinspector/MetricsSidebarPane.js share/webkit-1.0/webinspector/Object.js @@ -268,7 +273,7 @@ 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/Popup.js +share/webkit-1.0/webinspector/Popover.js share/webkit-1.0/webinspector/ProfileDataGridTree.js share/webkit-1.0/webinspector/ProfileView.js share/webkit-1.0/webinspector/ProfilesPanel.js @@ -286,15 +291,21 @@ share/webkit-1.0/webinspector/Settings.js share/webkit-1.0/webinspector/SidebarPane.js share/webkit-1.0/webinspector/SidebarTreeElement.js +share/webkit-1.0/webinspector/SourceCSSTokenizer.js share/webkit-1.0/webinspector/SourceFrame.js -share/webkit-1.0/webinspector/SourceSyntaxHighlighter.js +share/webkit-1.0/webinspector/SourceHTMLTokenizer.js +share/webkit-1.0/webinspector/SourceJavaScriptTokenizer.js +share/webkit-1.0/webinspector/SourceTokenizer.js share/webkit-1.0/webinspector/SourceView.js share/webkit-1.0/webinspector/StatusBarButton.js share/webkit-1.0/webinspector/StoragePanel.js share/webkit-1.0/webinspector/StylesSidebarPane.js share/webkit-1.0/webinspector/SummaryBar.js share/webkit-1.0/webinspector/TestController.js +share/webkit-1.0/webinspector/TextEditorHighlighter.js +share/webkit-1.0/webinspector/TextEditorModel.js share/webkit-1.0/webinspector/TextPrompt.js +share/webkit-1.0/webinspector/TextViewer.js share/webkit-1.0/webinspector/TimelineAgent.js share/webkit-1.0/webinspector/TimelineGrid.js share/webkit-1.0/webinspector/TimelineOverviewPane.js @@ -302,11 +313,15 @@ share/webkit-1.0/webinspector/TopDownProfileDataGridTree.js share/webkit-1.0/webinspector/View.js share/webkit-1.0/webinspector/WatchExpressionsSidebarPane.js +share/webkit-1.0/webinspector/WelcomeView.js +share/webkit-1.0/webinspector/WorkersSidebarPane.js share/webkit-1.0/webinspector/audits.css 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/inspectorSyntaxHighlight.css share/webkit-1.0/webinspector/localizedStrings.js +share/webkit-1.0/webinspector/popover.css +share/webkit-1.0/webinspector/textViewer.css share/webkit-1.0/webinspector/treeoutline.js share/webkit-1.0/webinspector/utilities.js