Hi,
here's the update to webkit-gtk 1.4.1, only built-tested on amd64 for
both flavors. See https://trac.webkit.org/wiki/WebKitGTK/1.4.1 for a
list of changes. Please test on other archs, esp sparc64/macppc. 1.4.0
was known to randomly fail/get stuck during build at g-ir-scanner, i
doubt that update fixes it but who knows..
Landry
? filt-libwebkitgtk-1.0.so.0.0
? filt-libwebkitgtk-1.0.so.0.0-old
? libwebkit-1.0.so.2.1
? libwebkit-1.0.so.2.2
? libwebkit-1.0.so.2.2-old
? libwebkitgtk-1.0.so.0.0
? libwebkitgtk-1.0.so.0.0-old
Index: Makefile
===================================================================
RCS file: /cvs/ports/www/webkit/Makefile,v
retrieving revision 1.49
diff -u -r1.49 Makefile
--- Makefile 30 May 2011 20:29:05 -0000 1.49
+++ Makefile 7 Jun 2011 13:39:11 -0000
@@ -2,9 +2,8 @@
COMMENT = open source web browser engine for Gtk+
-V = 1.4.0
+V = 1.4.1
DISTNAME = webkit-${V}
-REVISION = 2
EPOCH = 0
CATEGORIES = www
@@ -13,8 +12,9 @@
MAINTAINER = Landry Breuil <[email protected]>
-SHARED_LIBS += webkitgtk-1.0 0.0 # .7.0
-SHARED_LIBS += webkitgtk-3.0 0.0 # .7.0
+# XXX should be handled in .if FLAVOR block
+SHARED_LIBS += webkitgtk-1.0 0.1 # .7.0
+SHARED_LIBS += webkitgtk-3.0 0.1 # .7.0
# LGPLv2 and BSD
PERMIT_PACKAGE_CDROM = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/webkit/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo 11 May 2011 06:00:08 -0000 1.19
+++ distinfo 7 Jun 2011 13:39:11 -0000
@@ -1,5 +1,5 @@
-MD5 (webkit-1.4.0.tar.gz) = EMlp2ztUhMcd8aqaM4N3/w==
-RMD160 (webkit-1.4.0.tar.gz) = hu1j9cVGfdUGfzew5nO9WY7+LoQ=
-SHA1 (webkit-1.4.0.tar.gz) = mQ3ypy2slKGrwmRBKDuCKxdHNyQ=
-SHA256 (webkit-1.4.0.tar.gz) = PrD+BqmYeKMvGKd82q9aM84q827jPCUa4U9OSz+lf4g=
-SIZE (webkit-1.4.0.tar.gz) = 8474824
+MD5 (webkit-1.4.1.tar.gz) = waT3Mqd9b4GXQ3tQZ409vA==
+RMD160 (webkit-1.4.1.tar.gz) = 2nfuprersOH/6zItdHOGosS3zJw=
+SHA1 (webkit-1.4.1.tar.gz) = WBMRLpQxXbdHxo1rRcp2OkV3Q1c=
+SHA256 (webkit-1.4.1.tar.gz) = 0NtPbI5N1z67f9NMjKIbCzskWscWLYhOeJohBMpjHGQ=
+SIZE (webkit-1.4.1.tar.gz) = 8494373
Index: patches/patch-GNUmakefile_in
===================================================================
RCS file: /cvs/ports/www/webkit/patches/patch-GNUmakefile_in,v
retrieving revision 1.10
diff -u -r1.10 patch-GNUmakefile_in
--- patches/patch-GNUmakefile_in 11 May 2011 06:00:08 -0000 1.10
+++ patches/patch-GNUmakefile_in 7 Jun 2011 13:39:11 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-GNUmakefile_in,v 1.10 2011/05/11 06:00:08 ajacoutot Exp $
install GtkLauncher, remove silent build lines, fix lpthread/pthread
---- GNUmakefile.in.orig Tue Apr 26 03:30:49 2011
-+++ GNUmakefile.in Sat May 7 10:00:31 2011
+--- GNUmakefile.in.orig Sun Jun 5 19:14:10 2011
++++ GNUmakefile.in Tue Jun 7 09:12:33 2011
@@ -78,9 +78,9 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@@ -14,7 +14,7 @@
# For the Gtk port we want to use XP_UNIX both in X11 and Mac
@TARGET_WIN32_FALSE@am__append_1 = \
-@@ -15085,7 +15085,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
+@@ -15086,7 +15086,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))
@@ -23,7 +23,7 @@
AM_V_at = $(am__v_at_$(V))
am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
am__v_at_0 = @
-@@ -15095,22 +15095,22 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC
$(AM_LIBTOOLFLAG
+@@ -15096,22 +15096,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))
@@ -50,7 +50,7 @@
SOURCES = $(TestNetscapePlugin_libtestnetscapeplugin_la_SOURCES) \
$(libJavaScriptCore_la_SOURCES) \
$(nodist_libJavaScriptCore_la_SOURCES) \
-@@ -20126,9 +20126,10 @@ libJavaScriptCore_la_SOURCES = \
+@@ -20130,9 +20130,10 @@ libJavaScriptCore_la_SOURCES = \
libJavaScriptCore_la_LIBADD = \
$(UNICODE_LIBS) \
@@ -63,7 +63,7 @@
libJavaScriptCore_la_CXXFLAGS = \
$(global_cxxflags) \
$(libJavaScriptCore_la_CFLAGS)
-@@ -20171,7 +20172,7 @@ Programs_minidom_LDADD = \
+@@ -20175,7 +20176,7 @@ Programs_minidom_LDADD = \
libJavaScriptCore.la \
$(WINMM_LIBS) \
-lm \
@@ -72,7 +72,7 @@
Programs_minidom_LDFLAGS = \
-no-install \
-@@ -21233,12 +21234,13 @@ dist_webresources_DATA = \
+@@ -21237,12 +21238,13 @@ dist_webresources_DATA = \
@ENABLE_WEBKIT2_FALSE@ $(XT_CFLAGS)
@ENABLE_WEBKIT2_FALSE@libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS
= \
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/www/webkit/patches/patch-configure,v
retrieving revision 1.3
diff -u -r1.3 patch-configure
--- patches/patch-configure 11 May 2011 06:00:08 -0000 1.3
+++ patches/patch-configure 7 Jun 2011 13:39:11 -0000
@@ -6,9 +6,9 @@
Don't force the use of -O2, the ports infrastructure
takes care of that
---- configure.orig Tue Apr 26 03:30:21 2011
-+++ configure Mon May 9 07:28:58 2011
-@@ -18310,22 +18310,10 @@ install-data-am: install-gsettings-schemas
+--- configure.orig Sun Jun 5 19:13:51 2011
++++ configure Tue Jun 7 09:12:35 2011
+@@ -18412,22 +18412,10 @@ install-data-am: install-gsettings-schemas
.SECONDARY: $(gsettings_SCHEMAS)
@@ -33,7 +33,7 @@
test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" ||
$(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
uninstall-gsettings-schemas:
-@@ -20123,7 +20111,7 @@ $as_echo "#define ENABLE_YARR 1" >>confdefs.h
+@@ -20213,7 +20201,7 @@ $as_echo "#define ENABLE_YARR 1" >>confdefs.h
$as_echo "#define ENABLE_YARR_JIT 1" >>confdefs.h
;;
@@ -42,7 +42,7 @@
$as_echo "#define ENABLE_JIT 1" >>confdefs.h
-@@ -20148,7 +20136,7 @@ $as_echo "#define ENABLE_JIT_OPTIMIZE_ARITHMETIC 1" >>
+@@ -20238,7 +20226,7 @@ $as_echo "#define ENABLE_JIT_OPTIMIZE_ARITHMETIC 1" >>
$as_echo "#define WTF_USE_JIT_STUB_ARGUMENT_VA_LIST 1" >>confdefs.h
;;
@@ -51,7 +51,7 @@
$as_echo "#define WTF_USE_JIT_STUB_ARGUMENT_REGISTER 1" >>confdefs.h
-@@ -20366,8 +20354,8 @@ fi
+@@ -20455,8 +20443,8 @@ fi
# Add the appropriate 'O' level for optimized builds
if test "$enable_optimizations" = "yes"; then
