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

Update Webkit to r40000 svn snapshot.

Browse Source 
While here, link with -pthread instead of -lpthread, spotted by
ajacoutot@.
Remove the BROKEN marker on sparc64 upon jasper@'s request to let
gnome/devhelp build, although it still SIGBUS'es badly at runtime
(which is being worked on, and driving me nuts)
This commit is contained in:
landry 2009-01-25 22:16:40 +00:00
parent efa57df643
commit 0380bbd32c
5 changed files with 207 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
www/webkit/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.6 2008/12/19 11:52:55 sthen Exp $
# $OpenBSD: Makefile,v 1.7 2009/01/25 22:16:40 landry Exp $
COMMENT = open source web browser engine
V = 37790
V = 40000
DISTNAME = WebKit-r${V}
PKGNAME = webkit-${V}
CATEGORIES = www
@ -13,7 +13,8 @@ MASTER_SITES = http://builds.nightly.webkit.org/files/trunk/src/
MAINTAINER = Landry Breuil <gaston@gcu.info>
SHARED_LIBS = webkit-1.0 0.0
SHARED_LIBS = webkit-1.0 0.0 \
testnetscapeplugin 0.0
# LGPLv2 / BSD
PERMIT_PACKAGE_CDROM = Yes
@ -27,11 +28,6 @@ USE_X11 = Yes
USE_GMAKE = Yes
USE_LIBTOOL = Yes
.if ${MACHINE_ARCH} == "sparc64"
BROKEN = SIGBUS at runtime, being worked on
# please update list in www/kazehakase if fixed
.endif
MODULES = converters/libiconv \
textproc/intltool \
gcc4
@ -42,11 +38,14 @@ AUTOMAKE_VERSION = 1.9
AUTOCONF_VERSION = 2.59
CONFIGURE_STYLE = gnu
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include/libpng -I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib -lX11"
MAKE_FILE = GNUmakefile
WANTLIB = ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
Xfixes Xi Xinerama Xrandr Xrender Xt atk-1.0 c crypto \
expat fontconfig freetype glib-2.0 glitz gmodule-2.0 \
expat fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 \
gobject-2.0 gthread-2.0 idn intl jpeg m pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pcre pthread ssl z cairo pixman-1 png xml2

10
www/webkit/distinfo
View File

@ -1,5 +1,5 @@
MD5 (WebKit-r37790.tar.bz2) = SYc0hu6s5mEaX6E4hFqauw==
RMD160 (WebKit-r37790.tar.bz2) = /PVYESkaYzDKyYWIjfEslFguGDY=
SHA1 (WebKit-r37790.tar.bz2) = /U3ubxGXKRxMer9jjBJ9qR+UBM8=
SHA256 (WebKit-r37790.tar.bz2) = swvv34YqEwtT997JbMvKsBcSuRtctbRSKb2W6GvReNg=
SIZE (WebKit-r37790.tar.bz2) = 9587638
MD5 (WebKit-r40000.tar.bz2) = pi5aeR01LnRVhpY/RQOAnA==
RMD160 (WebKit-r40000.tar.bz2) = vMqUAmgtkpGeXufBWm/KBcTVHc8=
SHA1 (WebKit-r40000.tar.bz2) = SLzLz1Cab/HRiWYe5K6RsQnruTE=
SHA256 (WebKit-r40000.tar.bz2) = 6SqJcRDkoHDYxZV8xfOd23KPaQJRHsVQ242S6wyJVGU=
SIZE (WebKit-r40000.tar.bz2) = 10232349

28
www/webkit/patches/patch-GNUmakefile_am Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-GNUmakefile_am,v 1.1 2009/01/25 22:16:40 landry Exp $
--- GNUmakefile.am.orig Mon Dec 22 06:55:15 2008
+++ GNUmakefile.am Wed Jan 21 21:24:49 2009
@@ -121,9 +121,10 @@ libJavaScriptCore_la_SOURCES = \
libJavaScriptCore_la_LIBADD = \
$(UNICODE_LIBS) \
- $(GLOBALDEPS_LIBS) \
- -lpthread
+ $(GLOBALDEPS_LIBS)
+libJavaScriptCore_la_LDFLAGS = -pthread
+
libJavaScriptCore_la_CXXFLAGS = \
$(global_cxxflags) \
$(libJavaScriptCore_la_CFLAGS)
@@ -209,8 +210,9 @@ libWebCore_la_LIBADD = \
$(LIBXSLT_LIBS) \
$(HILDON_LIBS) \
$(JPEG_LIBS) \
- $(PNG_LIBS) \
- -lpthread
+ $(PNG_LIBS)
+
+libWebCore_la_LDFLAGS = -pthread
# WebKit
webkitgtk_h_api :=

8
www/webkit/patches/patch-JavaScriptCore_GNUmakefile_am
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-JavaScriptCore_GNUmakefile_am,v 1.2 2008/10/26 12:59:02 landry Exp $
--- JavaScriptCore/GNUmakefile.am.orig Wed Oct 22 01:10:20 2008
+++ JavaScriptCore/GNUmakefile.am Sat Oct 25 15:59:55 2008
@@ -438,7 +438,7 @@ Programs_minidom_CFLAGS = \
$OpenBSD: patch-JavaScriptCore_GNUmakefile_am,v 1.3 2009/01/25 22:16:40 landry Exp $
--- JavaScriptCore/GNUmakefile.am.orig Tue Jan 13 00:58:11 2009
+++ JavaScriptCore/GNUmakefile.am Mon Jan 19 10:09:55 2009
@@ -487,7 +487,7 @@ Programs_minidom_CFLAGS = \
Programs_minidom_LDADD = \
libJavaScriptCore.la \
-lm \

163
www/webkit/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2008/10/26 12:59:02 landry Exp $
@comment $OpenBSD: PLIST,v 1.3 2009/01/25 22:16:40 landry Exp $
%%SHARED%%
@bin bin/jsc
include/webkit-1.0/
@ -22,9 +22,170 @@ include/webkit-1.0/webkit/webkitversion.h
include/webkit-1.0/webkit/webkitwebbackforwardlist.h
include/webkit-1.0/webkit/webkitwebframe.h
include/webkit-1.0/webkit/webkitwebhistoryitem.h
include/webkit-1.0/webkit/webkitwebinspector.h
include/webkit-1.0/webkit/webkitwebnavigationaction.h
include/webkit-1.0/webkit/webkitwebpolicydecision.h
include/webkit-1.0/webkit/webkitwebsettings.h
include/webkit-1.0/webkit/webkitwebview.h
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/webkit-1.0/
share/webkit-1.0/webinspector/
share/webkit-1.0/webinspector/Breakpoint.js
share/webkit-1.0/webinspector/BreakpointsSidebarPane.js
share/webkit-1.0/webinspector/CallStackSidebarPane.js
share/webkit-1.0/webinspector/Console.js
share/webkit-1.0/webinspector/DataGrid.js
share/webkit-1.0/webinspector/Database.js
share/webkit-1.0/webinspector/DatabaseQueryView.js
share/webkit-1.0/webinspector/DatabaseTableView.js
share/webkit-1.0/webinspector/DatabasesPanel.js
share/webkit-1.0/webinspector/ElementsPanel.js
share/webkit-1.0/webinspector/ElementsTreeOutline.js
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/back.png
share/webkit-1.0/webinspector/Images/checker.png
share/webkit-1.0/webinspector/Images/clearConsoleButtons.png
share/webkit-1.0/webinspector/Images/closeButtons.png
share/webkit-1.0/webinspector/Images/consoleButtons.png
share/webkit-1.0/webinspector/Images/database.png
share/webkit-1.0/webinspector/Images/databaseTable.png
share/webkit-1.0/webinspector/Images/databasesIcon.png
share/webkit-1.0/webinspector/Images/debuggerContinue.png
share/webkit-1.0/webinspector/Images/debuggerPause.png
share/webkit-1.0/webinspector/Images/debuggerStepInto.png
share/webkit-1.0/webinspector/Images/debuggerStepOut.png
share/webkit-1.0/webinspector/Images/debuggerStepOver.png
share/webkit-1.0/webinspector/Images/disclosureTriangleSmallDown.png
share/webkit-1.0/webinspector/Images/disclosureTriangleSmallDownBlack.png
share/webkit-1.0/webinspector/Images/disclosureTriangleSmallDownWhite.png
share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRight.png
share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightBlack.png
share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightDown.png
share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightDownBlack.png
share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightDownWhite.png
share/webkit-1.0/webinspector/Images/disclosureTriangleSmallRightWhite.png
share/webkit-1.0/webinspector/Images/dockButtons.png
share/webkit-1.0/webinspector/Images/elementsIcon.png
share/webkit-1.0/webinspector/Images/enableButtons.png
share/webkit-1.0/webinspector/Images/errorIcon.png
share/webkit-1.0/webinspector/Images/errorMediumIcon.png
share/webkit-1.0/webinspector/Images/excludeButtons.png
share/webkit-1.0/webinspector/Images/focusButtons.png
share/webkit-1.0/webinspector/Images/forward.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
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/largerResourcesButtons.png
share/webkit-1.0/webinspector/Images/nodeSearchButtons.png
share/webkit-1.0/webinspector/Images/paneBottomGrow.png
share/webkit-1.0/webinspector/Images/paneBottomGrowActive.png
share/webkit-1.0/webinspector/Images/paneGrowHandleLine.png
share/webkit-1.0/webinspector/Images/pauseOnExceptionButtons.png
share/webkit-1.0/webinspector/Images/percentButtons.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/recordButtons.png
share/webkit-1.0/webinspector/Images/reloadButtons.png
share/webkit-1.0/webinspector/Images/resourceCSSIcon.png
share/webkit-1.0/webinspector/Images/resourceDocumentIcon.png
share/webkit-1.0/webinspector/Images/resourceDocumentIconSmall.png
share/webkit-1.0/webinspector/Images/resourceJSIcon.png
share/webkit-1.0/webinspector/Images/resourcePlainIcon.png
share/webkit-1.0/webinspector/Images/resourcePlainIconSmall.png
share/webkit-1.0/webinspector/Images/resourcesIcon.png
share/webkit-1.0/webinspector/Images/resourcesSizeGraphIcon.png
share/webkit-1.0/webinspector/Images/resourcesTimeGraphIcon.png
share/webkit-1.0/webinspector/Images/scriptsIcon.png
share/webkit-1.0/webinspector/Images/scriptsSilhouette.png
share/webkit-1.0/webinspector/Images/searchSmallBlue.png
share/webkit-1.0/webinspector/Images/searchSmallBrightBlue.png
share/webkit-1.0/webinspector/Images/searchSmallGray.png
share/webkit-1.0/webinspector/Images/searchSmallWhite.png
share/webkit-1.0/webinspector/Images/segment.png
share/webkit-1.0/webinspector/Images/segmentEnd.png
share/webkit-1.0/webinspector/Images/segmentHover.png
share/webkit-1.0/webinspector/Images/segmentHoverEnd.png
share/webkit-1.0/webinspector/Images/segmentSelected.png
share/webkit-1.0/webinspector/Images/segmentSelectedEnd.png
share/webkit-1.0/webinspector/Images/splitviewDimple.png
share/webkit-1.0/webinspector/Images/splitviewDividerBackground.png
share/webkit-1.0/webinspector/Images/statusbarBackground.png
share/webkit-1.0/webinspector/Images/statusbarBottomBackground.png
share/webkit-1.0/webinspector/Images/statusbarButtons.png
share/webkit-1.0/webinspector/Images/statusbarMenuButton.png
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/timelineHollowPillBlue.png
share/webkit-1.0/webinspector/Images/timelineHollowPillGray.png
share/webkit-1.0/webinspector/Images/timelineHollowPillGreen.png
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/timelinePillBlue.png
share/webkit-1.0/webinspector/Images/timelinePillGray.png
share/webkit-1.0/webinspector/Images/timelinePillGreen.png
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
share/webkit-1.0/webinspector/Images/treeRightTriangleBlack.png
share/webkit-1.0/webinspector/Images/treeRightTriangleWhite.png
share/webkit-1.0/webinspector/Images/treeUpTriangleBlack.png
share/webkit-1.0/webinspector/Images/treeUpTriangleWhite.png
share/webkit-1.0/webinspector/Images/userInputIcon.png
share/webkit-1.0/webinspector/Images/userInputPreviousIcon.png
share/webkit-1.0/webinspector/Images/warningIcon.png
share/webkit-1.0/webinspector/Images/warningMediumIcon.png
share/webkit-1.0/webinspector/Images/warningsErrors.png
share/webkit-1.0/webinspector/MetricsSidebarPane.js
share/webkit-1.0/webinspector/Object.js
share/webkit-1.0/webinspector/ObjectPropertiesSection.js
share/webkit-1.0/webinspector/Panel.js
share/webkit-1.0/webinspector/PanelEnablerView.js
share/webkit-1.0/webinspector/Placard.js
share/webkit-1.0/webinspector/ProfileView.js
share/webkit-1.0/webinspector/ProfilesPanel.js
share/webkit-1.0/webinspector/PropertiesSection.js
share/webkit-1.0/webinspector/PropertiesSidebarPane.js
share/webkit-1.0/webinspector/Resource.js
share/webkit-1.0/webinspector/ResourceCategory.js
share/webkit-1.0/webinspector/ResourceView.js
share/webkit-1.0/webinspector/ResourcesPanel.js
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/SidebarPane.js
share/webkit-1.0/webinspector/SidebarTreeElement.js
share/webkit-1.0/webinspector/SourceFrame.js
share/webkit-1.0/webinspector/SourceView.js
share/webkit-1.0/webinspector/StylesSidebarPane.js
share/webkit-1.0/webinspector/TextPrompt.js
share/webkit-1.0/webinspector/View.js
share/webkit-1.0/webinspector/inspector.css
share/webkit-1.0/webinspector/inspector.html
share/webkit-1.0/webinspector/inspector.js
share/webkit-1.0/webinspector/treeoutline.js
share/webkit-1.0/webinspector/utilities.js