cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to webkit 1.1.18:

Browse Source 
- add a pair of patches to make it finally run without SIGBUS on sparc64
  (yay!), reported as https://bugs.webkit.org/show_bug.cgi?id=19775
- add a patch to disable some optimizations on ppc, so that it finally
  builds fine, reported as https://bugs.webkit.org/show_bug.cgi?id=33451
This commit is contained in:
landry 2010-01-10 20:06:17 +00:00
parent 57afa508a2
commit ca1f030fd3
8 changed files with 107 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/webkit/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.21 2009/11/29 10:08:26 landry Exp $
# $OpenBSD: Makefile,v 1.22 2010/01/10 20:06:17 landry Exp $
COMMENT = open source web browser engine
V = 1.1.15.4
V = 1.1.18
DISTNAME = webkit-${V}
# XXX do not remove v0. pX comes before vX.
PKGNAME = webkit-${V}v0
@ -13,7 +13,7 @@ MASTER_SITES = ${HOMEPAGE}
MAINTAINER = Landry Breuil <gaston@gcu.info>
SHARED_LIBS = webkit-1.0 1.0
SHARED_LIBS = webkit-1.0 2.0 #.16.0
# LGPLv2 / BSD
PERMIT_PACKAGE_CDROM = Yes

10
www/webkit/distinfo
View File

@ -1,5 +1,5 @@
MD5 (webkit-1.1.15.4.tar.gz) = RzAftxIEIaw4v3FNuPXUKA==
RMD160 (webkit-1.1.15.4.tar.gz) = 3Prob3ovxjtHh0GzcKxiDRZZUT4=
SHA1 (webkit-1.1.15.4.tar.gz) = B3ixMHIHVtiAwrvp7u9581vPhho=
SHA256 (webkit-1.1.15.4.tar.gz) = 7CUR/B1KHmRTRXTNX5srxVLem7Itezg33RcUb7XxyQ8=
SIZE (webkit-1.1.15.4.tar.gz) = 6093252
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

16
www/webkit/patches/patch-GNUmakefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-GNUmakefile_in,v 1.4 2009/11/29 10:08:26 landry Exp $
--- GNUmakefile.in.orig Tue Oct 6 15:18:56 2009
+++ GNUmakefile.in Sat Oct 10 10:31:55 2009
@@ -5622,7 +5622,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
$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
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_$(V))
am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
@ -10,7 +10,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.4 2009/11/29 10:08:26 landry Exp $
AM_V_at = $(am__v_at_$(V))
am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
am__v_at_0 = @
@@ -5632,22 +5632,22 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG
@@ -5652,22 +5652,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 @@ $OpenBSD: patch-GNUmakefile_in,v 1.4 2009/11/29 10:08:26 landry Exp $
SOURCES = $(TestNetscapePlugin_libtestnetscapeplugin_la_SOURCES) \
$(libJavaScriptCore_la_SOURCES) \
$(nodist_libJavaScriptCore_la_SOURCES) \
@@ -8308,9 +8308,10 @@ libJavaScriptCore_la_SOURCES = \
@@ -8650,9 +8650,10 @@ libJavaScriptCore_la_SOURCES = \
libJavaScriptCore_la_LIBADD = \
$(UNICODE_LIBS) \
@ -50,7 +50,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.4 2009/11/29 10:08:26 landry Exp $
libJavaScriptCore_la_CXXFLAGS = \
$(global_cxxflags) \
$(libJavaScriptCore_la_CFLAGS)
@@ -8376,12 +8377,12 @@ libwebkit_1_0_la_CPPFLAGS = \
@@ -8718,12 +8719,12 @@ libwebkit_1_0_la_CPPFLAGS = \
$(HILDON_CPPFLAGS)
libwebkit_1_0_la_LDFLAGS = \
@ -64,7 +64,7 @@ $OpenBSD: patch-GNUmakefile_in,v 1.4 2009/11/29 10:08:26 landry Exp $
libJavaScriptCore.la \
libWebCore.la \
libWebCoreJS.la \
@@ -8498,7 +8499,7 @@ Programs_minidom_CFLAGS = \
@@ -8786,7 +8787,7 @@ Programs_minidom_CFLAGS = \
Programs_minidom_LDADD = \
libJavaScriptCore.la \
-lm \

15
www/webkit/patches/patch-JavaScriptCore_wtf_Platform_h
View File

@ -1,12 +1,13 @@
$OpenBSD: patch-JavaScriptCore_wtf_Platform_h,v 1.1 2009/10/14 11:17:58 landry Exp $
--- JavaScriptCore/wtf/Platform.h.orig Sat Oct 10 10:52:41 2009
+++ JavaScriptCore/wtf/Platform.h Sat Oct 10 10:53:23 2009
@@ -630,7 +630,7 @@
$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 PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX))
+#if (PLATFORM(SPARC64) || PLATFORM(X86_64)) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(OPENBSD))
-#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 PLATFORM(ARM) || PLATFORM(PPC64)
#elif CPU(ARM) || CPU(PPC64)
#define WTF_USE_JSVALUE32 1

20
www/webkit/patches/patch-JavaScriptCore_wtf_TCSpinLock_h Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-JavaScriptCore_wtf_TCSpinLock_h,v 1.1 2010/01/10 20:06:17 landry Exp $
workaround for a g++4 regression(?) on powerpc, reported as
https://bugs.webkit.org/show_bug.cgi?id=33451 :
JavaScriptCore/wtf/TCSpinLock.h:112: error: 'asm' operand requires impossible reload"
also reported in http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=438415
Another option is :
.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
@@ -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))
#include <time.h> /* For nanosleep() */

13
www/webkit/patches/patch-WebCore_platform_text_AtomicString_cpp Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-WebCore_platform_text_AtomicString_cpp,v 1.1 2010/01/10 20:06:17 landry Exp $
Fixes SIGBUS at runtime : https://bugs.webkit.org/show_bug.cgi?id=19775
--- WebCore/platform/text/AtomicString.cpp.orig Thu Jan 7 18:44:45 2010
+++ WebCore/platform/text/AtomicString.cpp Thu Jan 7 18:44:58 2010
@@ -105,7 +105,7 @@ static inline bool equal(StringImpl* string, const UCh
// FIXME: perhaps we should have a more abstract macro that indicates when
// going 4 bytes at a time is unsafe
-#if CPU(ARM) || CPU(SH4)
+#if CPU(ARM) || CPU(SH4) || CPU(SPARC64)
const UChar* stringCharacters = string->characters();
for (unsigned i = 0; i != length; ++i) {
if (*stringCharacters++ != *characters++)

13
www/webkit/patches/patch-WebCore_platform_text_StringHash_h Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-WebCore_platform_text_StringHash_h,v 1.1 2010/01/10 20:06:17 landry Exp $
Fixes SIGBUS at runtime : https://bugs.webkit.org/show_bug.cgi?id=19775
--- WebCore/platform/text/StringHash.h.orig Thu Jan 7 18:44:20 2010
+++ WebCore/platform/text/StringHash.h Thu Jan 7 18:44:40 2010
@@ -54,7 +54,7 @@ namespace WebCore {
// FIXME: perhaps we should have a more abstract macro that indicates when
// going 4 bytes at a time is unsafe
-#if CPU(ARM) || CPU(SH4)
+#if CPU(ARM) || CPU(SH4) || CPU(SPARC64)
const UChar* aChars = a->characters();
const UChar* bChars = b->characters();
for (unsigned i = 0; i != aLength; ++i) {

43
www/webkit/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2009/11/29 10:08:26 landry Exp $
@comment $OpenBSD: PLIST,v 1.11 2010/01/10 20:06:17 landry Exp $
%%SHARED%%
@bin bin/jsc
include/webkit-1.0/
@ -92,18 +92,24 @@ 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/AbstractTimelinePanel.js
share/webkit-1.0/webinspector/AuditLauncherView.js
share/webkit-1.0/webinspector/AuditResultView.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/Color.js
share/webkit-1.0/webinspector/ConsolePanel.js
share/webkit-1.0/webinspector/ConsoleView.js
share/webkit-1.0/webinspector/ContextMenu.js
share/webkit-1.0/webinspector/CookieItemsView.js
share/webkit-1.0/webinspector/DOMAgent.js
share/webkit-1.0/webinspector/DOMStorage.js
share/webkit-1.0/webinspector/DOMStorageDataGrid.js
share/webkit-1.0/webinspector/DOMStorageItemsView.js
share/webkit-1.0/webinspector/DataGrid.js
share/webkit-1.0/webinspector/Database.js
@ -112,6 +118,7 @@ share/webkit-1.0/webinspector/DatabaseTableView.js
share/webkit-1.0/webinspector/Drawer.js
share/webkit-1.0/webinspector/ElementsPanel.js
share/webkit-1.0/webinspector/ElementsTreeOutline.js
share/webkit-1.0/webinspector/EventListenersSidebarPane.js
share/webkit-1.0/webinspector/FontView.js
share/webkit-1.0/webinspector/ImageView.js
share/webkit-1.0/webinspector/Images/
@ -120,6 +127,7 @@ share/webkit-1.0/webinspector/Images/checker.png
share/webkit-1.0/webinspector/Images/clearConsoleButtonGlyph.png
share/webkit-1.0/webinspector/Images/closeButtons.png
share/webkit-1.0/webinspector/Images/consoleButtonGlyph.png
share/webkit-1.0/webinspector/Images/consoleIcon.png
share/webkit-1.0/webinspector/Images/cookie.png
share/webkit-1.0/webinspector/Images/database.png
share/webkit-1.0/webinspector/Images/databaseTable.png
@ -143,6 +151,7 @@ share/webkit-1.0/webinspector/Images/enableOutlineButtonGlyph.png
share/webkit-1.0/webinspector/Images/enableSolidButtonGlyph.png
share/webkit-1.0/webinspector/Images/errorIcon.png
share/webkit-1.0/webinspector/Images/errorMediumIcon.png
share/webkit-1.0/webinspector/Images/errorRedDot.png
share/webkit-1.0/webinspector/Images/excludeButtonGlyph.png
share/webkit-1.0/webinspector/Images/focusButtonGlyph.png
share/webkit-1.0/webinspector/Images/forward.png
@ -153,6 +162,7 @@ share/webkit-1.0/webinspector/Images/glossyHeaderSelectedPressed.png
share/webkit-1.0/webinspector/Images/goArrow.png
share/webkit-1.0/webinspector/Images/graphLabelCalloutLeft.png
share/webkit-1.0/webinspector/Images/graphLabelCalloutRight.png
share/webkit-1.0/webinspector/Images/grayConnectorPoint.png
share/webkit-1.0/webinspector/Images/largerResourcesButtonGlyph.png
share/webkit-1.0/webinspector/Images/localStorage.png
share/webkit-1.0/webinspector/Images/nodeSearchButtonGlyph.png
@ -204,6 +214,16 @@ share/webkit-1.0/webinspector/Images/statusbarMenuButtonSelected.png
share/webkit-1.0/webinspector/Images/statusbarResizerHorizontal.png
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/timelineBarBlue.png
share/webkit-1.0/webinspector/Images/timelineBarGray.png
share/webkit-1.0/webinspector/Images/timelineBarGreen.png
share/webkit-1.0/webinspector/Images/timelineBarOrange.png
share/webkit-1.0/webinspector/Images/timelineBarPurple.png
share/webkit-1.0/webinspector/Images/timelineBarRed.png
share/webkit-1.0/webinspector/Images/timelineBarYellow.png
share/webkit-1.0/webinspector/Images/timelineCheckmarks.png
share/webkit-1.0/webinspector/Images/timelineDots.png
share/webkit-1.0/webinspector/Images/timelineHollowPillBlue.png
share/webkit-1.0/webinspector/Images/timelineHollowPillGray.png
share/webkit-1.0/webinspector/Images/timelineHollowPillGreen.png
@ -211,6 +231,7 @@ share/webkit-1.0/webinspector/Images/timelineHollowPillOrange.png
share/webkit-1.0/webinspector/Images/timelineHollowPillPurple.png
share/webkit-1.0/webinspector/Images/timelineHollowPillRed.png
share/webkit-1.0/webinspector/Images/timelineHollowPillYellow.png
share/webkit-1.0/webinspector/Images/timelineIcon.png
share/webkit-1.0/webinspector/Images/timelinePillBlue.png
share/webkit-1.0/webinspector/Images/timelinePillGray.png
share/webkit-1.0/webinspector/Images/timelinePillGreen.png
@ -218,10 +239,6 @@ share/webkit-1.0/webinspector/Images/timelinePillOrange.png
share/webkit-1.0/webinspector/Images/timelinePillPurple.png
share/webkit-1.0/webinspector/Images/timelinePillRed.png
share/webkit-1.0/webinspector/Images/timelinePillYellow.png
share/webkit-1.0/webinspector/Images/tipBalloon.png
share/webkit-1.0/webinspector/Images/tipBalloonBottom.png
share/webkit-1.0/webinspector/Images/tipIcon.png
share/webkit-1.0/webinspector/Images/tipIconPressed.png
share/webkit-1.0/webinspector/Images/toolbarItemSelected.png
share/webkit-1.0/webinspector/Images/treeDownTriangleBlack.png
share/webkit-1.0/webinspector/Images/treeDownTriangleWhite.png
@ -235,9 +252,14 @@ share/webkit-1.0/webinspector/Images/userInputPreviousIcon.png
share/webkit-1.0/webinspector/Images/userInputResultIcon.png
share/webkit-1.0/webinspector/Images/warningIcon.png
share/webkit-1.0/webinspector/Images/warningMediumIcon.png
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/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
@ -260,22 +282,31 @@ share/webkit-1.0/webinspector/ScopeChainSidebarPane.js
share/webkit-1.0/webinspector/Script.js
share/webkit-1.0/webinspector/ScriptView.js
share/webkit-1.0/webinspector/ScriptsPanel.js
share/webkit-1.0/webinspector/Section.js
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/SourceFrame.js
share/webkit-1.0/webinspector/SourceSyntaxHighlighter.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/TextPrompt.js
share/webkit-1.0/webinspector/TimelineAgent.js
share/webkit-1.0/webinspector/TimelineGrid.js
share/webkit-1.0/webinspector/TimelineOverviewPane.js
share/webkit-1.0/webinspector/TimelinePanel.js
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/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/treeoutline.js
share/webkit-1.0/webinspector/utilities.js