From 7c74f6a901fde2a52062b03abf6d4f06caaba164 Mon Sep 17 00:00:00 2001 From: landry Date: Tue, 5 Jul 2011 11:34:27 +0000 Subject: [PATCH] Update to webkit 1.4.2, see http://trac.webkit.org/wiki/WebKitGTK/1.4.2 for a list of changes. ok jasper@, tested by a few on ports@ --- www/webkit/Makefile | 4 ++-- www/webkit/distinfo | 10 +++++----- www/webkit/patches/patch-GNUmakefile_in | 16 ++++++++-------- www/webkit/patches/patch-configure | 14 +++++++------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/www/webkit/Makefile b/www/webkit/Makefile index 932c6fb14e9..0273c79cdf6 100644 --- a/www/webkit/Makefile +++ b/www/webkit/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.51 2011/06/17 22:10:40 landry Exp $ +# $OpenBSD: Makefile,v 1.52 2011/07/05 11:34:27 landry Exp $ COMMENT = open source web browser engine for Gtk+ -V = 1.4.1 +V = 1.4.2 DISTNAME = webkit-${V} EPOCH = 0 CATEGORIES = www diff --git a/www/webkit/distinfo b/www/webkit/distinfo index 5c76e8b2141..f2c94430ece 100644 --- a/www/webkit/distinfo +++ b/www/webkit/distinfo @@ -1,5 +1,5 @@ -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 +MD5 (webkit-1.4.2.tar.gz) = Nh+EIOk9EhAdZQdY/sCfoA== +RMD160 (webkit-1.4.2.tar.gz) = 4d481VdtfMx3FHXNqMDjtZq6Gvc= +SHA1 (webkit-1.4.2.tar.gz) = Z1rgv+9WuFGfPwCwT8e69yIVvTs= +SHA256 (webkit-1.4.2.tar.gz) = 3uYza1Nm6VL2ehimbcou3OlajnD1kdvH/DDPMLX9ubo= +SIZE (webkit-1.4.2.tar.gz) = 8504310 diff --git a/www/webkit/patches/patch-GNUmakefile_in b/www/webkit/patches/patch-GNUmakefile_in index f48d9ebcf8b..963598a51e2 100644 --- a/www/webkit/patches/patch-GNUmakefile_in +++ b/www/webkit/patches/patch-GNUmakefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-GNUmakefile_in,v 1.11 2011/06/17 22:10:40 landry Exp $ +$OpenBSD: patch-GNUmakefile_in,v 1.12 2011/07/05 11:34:27 landry Exp $ install GtkLauncher, remove silent build lines, fix lpthread/pthread ---- GNUmakefile.in.orig Sun Jun 5 19:14:10 2011 -+++ GNUmakefile.in Tue Jun 7 09:12:33 2011 +--- GNUmakefile.in.orig Fri Jul 1 01:08:07 2011 ++++ GNUmakefile.in Fri Jul 1 09:26:33 2011 @@ -78,9 +78,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ @@ -14,7 +14,7 @@ install GtkLauncher, remove silent build lines, fix lpthread/pthread # For the Gtk port we want to use XP_UNIX both in X11 and Mac @TARGET_WIN32_FALSE@am__append_1 = \ -@@ -15086,7 +15086,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES +@@ -15090,7 +15090,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 @@ install GtkLauncher, remove silent build lines, fix lpthread/pthread AM_V_at = $(am__v_at_$(V)) am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) am__v_at_0 = @ -@@ -15096,22 +15096,22 @@ LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAG +@@ -15100,22 +15100,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 @@ install GtkLauncher, remove silent build lines, fix lpthread/pthread SOURCES = $(TestNetscapePlugin_libtestnetscapeplugin_la_SOURCES) \ $(libJavaScriptCore_la_SOURCES) \ $(nodist_libJavaScriptCore_la_SOURCES) \ -@@ -20130,9 +20130,10 @@ libJavaScriptCore_la_SOURCES = \ +@@ -20137,9 +20137,10 @@ libJavaScriptCore_la_SOURCES = \ libJavaScriptCore_la_LIBADD = \ $(UNICODE_LIBS) \ @@ -63,7 +63,7 @@ install GtkLauncher, remove silent build lines, fix lpthread/pthread libJavaScriptCore_la_CXXFLAGS = \ $(global_cxxflags) \ $(libJavaScriptCore_la_CFLAGS) -@@ -20175,7 +20176,7 @@ Programs_minidom_LDADD = \ +@@ -20182,7 +20183,7 @@ Programs_minidom_LDADD = \ libJavaScriptCore.la \ $(WINMM_LIBS) \ -lm \ @@ -72,7 +72,7 @@ install GtkLauncher, remove silent build lines, fix lpthread/pthread Programs_minidom_LDFLAGS = \ -no-install \ -@@ -21237,12 +21238,13 @@ dist_webresources_DATA = \ +@@ -21245,12 +21246,13 @@ dist_webresources_DATA = \ @ENABLE_WEBKIT2_FALSE@ $(XT_CFLAGS) @ENABLE_WEBKIT2_FALSE@libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \ diff --git a/www/webkit/patches/patch-configure b/www/webkit/patches/patch-configure index ca71d857287..8ad46ed7dd4 100644 --- a/www/webkit/patches/patch-configure +++ b/www/webkit/patches/patch-configure @@ -1,4 +1,4 @@ -$OpenBSD: patch-configure,v 1.4 2011/06/17 22:10:40 landry Exp $ +$OpenBSD: patch-configure,v 1.5 2011/07/05 11:34:27 landry Exp $ GNOME Bug 627126 - gsettings schema files don't get installed on FreeBSD glib commit 136e705e8383ff8848e425ac01278102d7badc52 @@ -6,9 +6,9 @@ Add amd64 to x86_64 host_cpu. Don't force the use of -O2, the ports infrastructure takes care of that ---- 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 +--- configure.orig Fri Jul 1 01:07:47 2011 ++++ configure Fri Jul 1 09:26:34 2011 +@@ -18420,22 +18420,10 @@ install-data-am: install-gsettings-schemas .SECONDARY: $(gsettings_SCHEMAS) @@ -33,7 +33,7 @@ takes care of that test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) uninstall-gsettings-schemas: -@@ -20213,7 +20201,7 @@ $as_echo "#define ENABLE_YARR 1" >>confdefs.h +@@ -20221,7 +20209,7 @@ $as_echo "#define ENABLE_YARR 1" >>confdefs.h $as_echo "#define ENABLE_YARR_JIT 1" >>confdefs.h ;; @@ -42,7 +42,7 @@ takes care of that $as_echo "#define ENABLE_JIT 1" >>confdefs.h -@@ -20238,7 +20226,7 @@ $as_echo "#define ENABLE_JIT_OPTIMIZE_ARITHMETIC 1" >> +@@ -20246,7 +20234,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 @@ takes care of that $as_echo "#define WTF_USE_JIT_STUB_ARGUMENT_REGISTER 1" >>confdefs.h -@@ -20455,8 +20443,8 @@ fi +@@ -20463,8 +20451,8 @@ fi # Add the appropriate 'O' level for optimized builds if test "$enable_optimizations" = "yes"; then