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

Update to webkit r41894, taking advantage of libsoup 2.26 update..

Browse Source 
Regen patches while here.
Tested in a bulk build by and ok jasper@
This commit is contained in:
landry 2009-04-04 10:35:26 +00:00
parent 4cd52927d1
commit 23efee8f19
6 changed files with 26 additions and 20 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.9 2009/03/08 20:00:41 landry Exp $ # $OpenBSD: Makefile,v 1.10 2009/04/04 10:35:26 landry Exp $
COMMENT = open source web browser engine COMMENT = open source web browser engine
V = 41121 V = 41894
DISTNAME = WebKit-r${V} DISTNAME = WebKit-r${V}
PKGNAME = webkit-${V} PKGNAME = webkit-${V}
CATEGORIES = www CATEGORIES = www
@ -39,6 +39,8 @@ AUTOMAKE_VERSION = 1.9
AUTOCONF_VERSION = 2.59 AUTOCONF_VERSION = 2.59
CONFIGURE_STYLE = gnu CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --disable-video
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${X11BASE}/include" \ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lX11" LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lX11"

10
www/webkit/distinfo
View File

@ -1,5 +1,5 @@
MD5 (WebKit-r41121.tar.bz2) = CRtjKulXZbPbjS6nqE37Ow== MD5 (WebKit-r41894.tar.bz2) = zklaQuxP6+RPYEcIE06k5Q==
RMD160 (WebKit-r41121.tar.bz2) = 89Xq1YuVy6uMpLO/veJSRoe1t4o= RMD160 (WebKit-r41894.tar.bz2) = wG6e+dLXFUsCb8lYPIssWh+BbZg=
SHA1 (WebKit-r41121.tar.bz2) = f2i+JKKXDGAzZaClFV1fn+wF3gw= SHA1 (WebKit-r41894.tar.bz2) = 0AWry+MFwqeoAM9yIgG1Sw1WttM=
SHA256 (WebKit-r41121.tar.bz2) = tUE85qqk/ZBEIQ/a6IUnaFXmRZm7vxVVEKwwBzUlIL4= SHA256 (WebKit-r41894.tar.bz2) = MN1Ngi5iiuBiexeLm5ACaS8kv7voOQPqiUUzAKJd3Iw=
SIZE (WebKit-r41121.tar.bz2) = 10435553 SIZE (WebKit-r41894.tar.bz2) = 10553068

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

@ -1,7 +1,7 @@
$OpenBSD: patch-GNUmakefile_am,v 1.2 2009/03/08 20:00:41 landry Exp $ $OpenBSD: patch-GNUmakefile_am,v 1.3 2009/04/04 10:35:26 landry Exp $
--- GNUmakefile.am.orig Sat Feb 21 04:38:12 2009 --- GNUmakefile.am.orig Sun Mar 22 03:21:11 2009
+++ GNUmakefile.am Thu Mar 5 21:41:28 2009 +++ GNUmakefile.am Mon Mar 23 23:08:39 2009
@@ -121,9 +121,10 @@ libJavaScriptCore_la_SOURCES = \ @@ -123,9 +123,10 @@ libJavaScriptCore_la_SOURCES = \
libJavaScriptCore_la_LIBADD = \ libJavaScriptCore_la_LIBADD = \
$(UNICODE_LIBS) \ $(UNICODE_LIBS) \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-JavaScriptCore_GNUmakefile_am,v 1.4 2009/03/08 20:00:41 landry Exp $ $OpenBSD: patch-JavaScriptCore_GNUmakefile_am,v 1.5 2009/04/04 10:35:26 landry Exp $
--- JavaScriptCore/GNUmakefile.am.orig Sat Feb 21 04:38:12 2009 --- JavaScriptCore/GNUmakefile.am.orig Thu Feb 26 07:17:57 2009
+++ JavaScriptCore/GNUmakefile.am Thu Mar 5 21:40:38 2009 +++ JavaScriptCore/GNUmakefile.am Mon Mar 23 23:08:39 2009
@@ -493,7 +493,7 @@ Programs_minidom_CFLAGS = \ @@ -495,7 +495,7 @@ Programs_minidom_CFLAGS = \
Programs_minidom_LDADD = \ Programs_minidom_LDADD = \
libJavaScriptCore.la \ libJavaScriptCore.la \
-lm \ -lm \

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

@ -1,9 +1,9 @@
$OpenBSD: patch-JavaScriptCore_wtf_Threading_h,v 1.2 2009/03/08 20:00:41 landry Exp $ $OpenBSD: patch-JavaScriptCore_wtf_Threading_h,v 1.3 2009/04/04 10:35:26 landry Exp $
Sparc64 definitely doesn't like __gnu_cxx::__atomic_add. Sparc64 definitely doesn't like __gnu_cxx::__atomic_add.
--- JavaScriptCore/wtf/Threading.h.orig Sun Jan 25 03:24:37 2009 --- JavaScriptCore/wtf/Threading.h.orig Sat Mar 14 11:04:35 2009
+++ JavaScriptCore/wtf/Threading.h Sun Feb 22 22:38:46 2009 +++ JavaScriptCore/wtf/Threading.h Mon Mar 23 23:08:39 2009
@@ -197,7 +197,7 @@ inline int atomicDecrement(int volatile* addend) { ret @@ -204,7 +204,7 @@ inline int atomicDecrement(int volatile* addend) { ret
inline void atomicIncrement(int volatile* addend) { OSAtomicIncrement32Barrier(const_cast<int*>(addend)); } inline void atomicIncrement(int volatile* addend) { OSAtomicIncrement32Barrier(const_cast<int*>(addend)); }
inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Barrier(const_cast<int*>(addend)); } inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Barrier(const_cast<int*>(addend)); }

6
www/webkit/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2009/03/08 20:00:41 landry Exp $ @comment $OpenBSD: PLIST,v 1.5 2009/04/04 10:35:26 landry Exp $
%%SHARED%% %%SHARED%%
@bin bin/jsc @bin bin/jsc
include/webkit-1.0/ include/webkit-1.0/
@ -16,8 +16,10 @@ include/webkit-1.0/JavaScriptCore/WebKitAvailability.h
include/webkit-1.0/webkit/ include/webkit-1.0/webkit/
include/webkit-1.0/webkit/webkit.h include/webkit-1.0/webkit/webkit.h
include/webkit-1.0/webkit/webkitdefines.h include/webkit-1.0/webkit/webkitdefines.h
include/webkit-1.0/webkit/webkitdownload.h
include/webkit-1.0/webkit/webkitenumtypes.h include/webkit-1.0/webkit/webkitenumtypes.h
include/webkit-1.0/webkit/webkitnetworkrequest.h include/webkit-1.0/webkit/webkitnetworkrequest.h
include/webkit-1.0/webkit/webkitsoupauthdialog.h
include/webkit-1.0/webkit/webkitversion.h include/webkit-1.0/webkit/webkitversion.h
include/webkit-1.0/webkit/webkitwebbackforwardlist.h include/webkit-1.0/webkit/webkitwebbackforwardlist.h
include/webkit-1.0/webkit/webkitwebframe.h include/webkit-1.0/webkit/webkitwebframe.h
@ -39,6 +41,7 @@ share/webkit-1.0/webinspector/BreakpointsSidebarPane.js
share/webkit-1.0/webinspector/CallStackSidebarPane.js share/webkit-1.0/webinspector/CallStackSidebarPane.js
share/webkit-1.0/webinspector/Console.js share/webkit-1.0/webinspector/Console.js
share/webkit-1.0/webinspector/DOMStorage.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/DOMStorageItemsView.js
share/webkit-1.0/webinspector/DataGrid.js share/webkit-1.0/webinspector/DataGrid.js
share/webkit-1.0/webinspector/Database.js share/webkit-1.0/webinspector/Database.js
@ -159,6 +162,7 @@ share/webkit-1.0/webinspector/Images/treeUpTriangleBlack.png
share/webkit-1.0/webinspector/Images/treeUpTriangleWhite.png share/webkit-1.0/webinspector/Images/treeUpTriangleWhite.png
share/webkit-1.0/webinspector/Images/userInputIcon.png share/webkit-1.0/webinspector/Images/userInputIcon.png
share/webkit-1.0/webinspector/Images/userInputPreviousIcon.png 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/warningIcon.png
share/webkit-1.0/webinspector/Images/warningMediumIcon.png share/webkit-1.0/webinspector/Images/warningMediumIcon.png
share/webkit-1.0/webinspector/Images/warningsErrors.png share/webkit-1.0/webinspector/Images/warningsErrors.png