Hi,
here's an update to webkit 1.6.3, based on a diff from marco. It
includes a fix for twitter website from
https://bugs.webkit.org/show_bug.cgi?id=68314. Please test it with your
favourite webkit-browser/app on i386 & amd64, ppc testing welcomed too.
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/webkit/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- Makefile 17 Nov 2011 11:42:31 -0000 1.60
+++ Makefile 21 Feb 2012 09:55:08 -0000
@@ -4,17 +4,16 @@
COMMENT = open source web browser engine for Gtk+
-V = 1.6.1
+V = 1.6.3
DISTNAME = webkit-${V}
EPOCH = 0
CATEGORIES = www
-
-REVISION = 0
+EXTRACT_SUFX= .tar.xz
HOMEPAGE = http://webkitgtk.org/
MASTER_SITES = ${HOMEPAGE}
-MAINTAINER = Landry Breuil <[email protected]>
+MAINTAINER = Landry Breuil <[email protected]>
# LGPLv2 and BSD
PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/webkit/distinfo,v
retrieving revision 1.23
diff -u -r1.23 distinfo
--- distinfo 13 Oct 2011 06:52:49 -0000 1.23
+++ distinfo 21 Feb 2012 09:55:08 -0000
@@ -1,5 +1,5 @@
-MD5 (webkit-1.6.1.tar.gz) = wRdDaUsbcdrSh7Lnqec7BQ==
-RMD160 (webkit-1.6.1.tar.gz) = CMa8P0DGo9n6WZe7dQhF6ZzbVkM=
-SHA1 (webkit-1.6.1.tar.gz) = 2rO9oHCKXgWVWEylqjPqa/0k/9M=
-SHA256 (webkit-1.6.1.tar.gz) = BbCdhRoEWX1Q/cpx7YsJ9aAzfWlrFBpDUlWuIJXhQK0=
-SIZE (webkit-1.6.1.tar.gz) = 10129874
+MD5 (webkit-1.6.3.tar.xz) = xHbZM1QZ3wYVENMeIRdd8Q==
+RMD160 (webkit-1.6.3.tar.xz) = zDGf/kwoEGY64FuQ5p2UlfXD8Ko=
+SHA1 (webkit-1.6.3.tar.xz) = ffaWCO8s6d1zKDU7TuNPaScc1Ds=
+SHA256 (webkit-1.6.3.tar.xz) = EtDbzmqJXHqEkaAo40odxVrhOrdqxiArLkidqUaAd8M=
+SIZE (webkit-1.6.3.tar.xz) = 6794004
Index: patches/patch-GNUmakefile_in
===================================================================
RCS file: /cvs/ports/www/webkit/patches/patch-GNUmakefile_in,v
retrieving revision 1.14
diff -u -r1.14 patch-GNUmakefile_in
--- patches/patch-GNUmakefile_in 13 Oct 2011 06:52:49 -0000 1.14
+++ patches/patch-GNUmakefile_in 21 Feb 2012 09:55:08 -0000
@@ -4,9 +4,9 @@
- append extra cflags for sparc64 which otherwise result in overoptimization
by emitting a fdtox %r8, %r7 call, whose second operatand isn't even and
thus invalid.
---- GNUmakefile.in.orig Tue Sep 27 12:41:43 2011
-+++ GNUmakefile.in Mon Oct 10 14:34:20 2011
-@@ -78,7 +78,7 @@ POST_UNINSTALL = :
+--- GNUmakefile.in.orig Wed Feb 1 14:49:37 2012
++++ GNUmakefile.in Fri Feb 3 14:25:45 2012
+@@ -85,7 +85,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = Programs/jsc-@WEBKITGTK_API_MAJOR_VERSION@$(EXEEXT) \
@@ -15,7 +15,7 @@
noinst_PROGRAMS = Programs/jsc$(EXEEXT) Programs/minidom$(EXEEXT) \
$(am__EXEEXT_4) Programs/DumpRenderTree$(EXEEXT) \
Programs/GtkLauncher$(EXEEXT) $(am__EXEEXT_5) \
-@@ -10563,7 +10563,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
+@@ -10572,7 +10572,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))
@@ -24,7 +24,7 @@
AM_V_at = $(am__v_at_$(V))
am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
am__v_at_0 = @
-@@ -10573,12 +10573,12 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC
$(AM_LIBTOOLFLAG
+@@ -10582,12 +10582,12 @@ 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))
@@ -39,7 +39,7 @@
CXXLD = $(CXX)
CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-@@ -16635,9 +16635,10 @@ libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WE
+@@ -16654,9 +16654,10 @@ libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WE
libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD
= \
$(UNICODE_LIBS) \
$(GLIB_LIBS) \
@@ -52,7 +52,7 @@
libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS
= \
$(global_cxxflags) \
$(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS)
-@@ -16665,7 +16666,7 @@ Programs_minidom_LDADD = \
+@@ -16684,7 +16685,7 @@ Programs_minidom_LDADD = \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
\
$(WINMM_LIBS) \
-lm \
@@ -61,7 +61,7 @@
-lstdc++
Programs_minidom_LDFLAGS = \
-@@ -16686,7 +16687,7 @@ Programs_jsc_@WEBKITGTK_API_MAJOR_VERSION@_CXXFLAGS =
+@@ -16705,7 +16706,7 @@ Programs_jsc_@WEBKITGTK_API_MAJOR_VERSION@_CXXFLAGS =
$(UNICODE_CFLAGS)
Programs_jsc_@WEBKITGTK_API_MAJOR_VERSION@_LDADD = \
@@ -70,7 +70,7 @@
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
\
$(WINMM_LIBS)
-@@ -16911,12 +16912,13 @@
libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_
+@@ -16930,12 +16931,13 @@
libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_
$(ZLIB_CFLAGS)
libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS
= \
@@ -85,7 +85,7 @@
libWebCore.la \
libWebCoreGtk.la \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
\
-@@ -59167,7 +59169,7 @@ Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WE
+@@ -59308,7 +59310,7 @@ Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WE
@am__fastdepCXX_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CXX
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS)
$(DEFAULT_INCLUDES) $(INCLUDES)
$(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS)
$(CPPFLAGS)
$(libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS)
$(CXXFLAGS) -c -o
Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberObject.lo
`test -f 'Source/JavaScriptCore/runtime/NumberObject.cpp' || echo
'$(srcdir)/'`Source/JavaScriptCore/runtime/NumberObject.cpp
Source/JavaScriptCore/runtime/libjavascriptcoregtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la-NumberPrototype.lo:
Source/JavaScriptCore/runtime/NumberPrototype.cpp
Index: patches/patch-Source_WebCore_rendering_RenderLayer_cpp
===================================================================
RCS file: patches/patch-Source_WebCore_rendering_RenderLayer_cpp
diff -N patches/patch-Source_WebCore_rendering_RenderLayer_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_WebCore_rendering_RenderLayer_cpp 21 Feb 2012
09:55:08 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+Backport
http://trac.webkit.org/changeset/95567/trunk/Source/WebCore/rendering/RenderLayer.cpp
+https://bugs.webkit.org/show_bug.cgi?id=68314, issue seen on twitter
+--- Source/WebCore/rendering/RenderLayer.cpp.orig Sat Oct 15 07:27:19 2011
++++ Source/WebCore/rendering/RenderLayer.cpp Tue Feb 21 10:40:13 2012
+@@ -2559,7 +2559,8 @@ static bool inContainingBlockChain(RenderLayer* startL
+ if (startLayer == endLayer)
+ return true;
+
+- for (RenderBlock* currentBlock =
startLayer->renderer()->containingBlock(); currentBlock; currentBlock =
currentBlock->containingBlock()) {
++ RenderView* view = startLayer->renderer()->view();
++ for (RenderBlock* currentBlock =
startLayer->renderer()->containingBlock(); currentBlock && currentBlock !=
view; currentBlock = currentBlock->containingBlock()) {
+ if (currentBlock->layer() == endLayer)
+ return true;
+ }
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/www/webkit/patches/patch-configure,v
retrieving revision 1.6
diff -u -r1.6 patch-configure
--- patches/patch-configure 13 Oct 2011 06:52:49 -0000 1.6
+++ patches/patch-configure 21 Feb 2012 09:55:08 -0000
@@ -8,9 +8,9 @@
Don't force the use of -O2, the ports infrastructure
takes care of that
---- configure.orig Tue Sep 27 12:41:23 2011
-+++ configure Fri Oct 7 10:03:03 2011
-@@ -19061,22 +19061,10 @@ install-data-am: install-gsettings-schemas
+--- configure.orig Wed Feb 1 14:49:20 2012
++++ configure Fri Feb 3 14:25:45 2012
+@@ -19142,22 +19142,10 @@ install-data-am: install-gsettings-schemas
.SECONDARY: $(gsettings_SCHEMAS)
@@ -35,7 +35,7 @@
test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" ||
$(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
uninstall-gsettings-schemas:
-@@ -21029,7 +21017,7 @@ $as_echo "#define ENABLE_YARR 1" >>confdefs.h
+@@ -21114,7 +21102,7 @@ $as_echo "#define ENABLE_YARR 1" >>confdefs.h
$as_echo "#define ENABLE_YARR_JIT 1" >>confdefs.h
;;
@@ -44,7 +44,7 @@
$as_echo "#define ENABLE_JIT 1" >>confdefs.h
-@@ -21054,7 +21042,7 @@ $as_echo "#define ENABLE_JIT_OPTIMIZE_ARITHMETIC 1" >>
+@@ -21139,7 +21127,7 @@ $as_echo "#define ENABLE_JIT_OPTIMIZE_ARITHMETIC 1" >>
$as_echo "#define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1" >>confdefs.h
;;
@@ -53,7 +53,7 @@
$as_echo "#define WTF_USE_JIT_STUB_ARGUMENT_REGISTER 1" >>confdefs.h
-@@ -21346,8 +21334,8 @@ fi
+@@ -21431,8 +21419,8 @@ fi
# Add the appropriate 'O' level for optimized builds
if test "$enable_optimizations" = "yes"; then
