Thu May 28 05:30:51 2015 UTC ()
Update to 2.4.9. From Leonardo Taccari in PR 49920.

WebKitGTK+ 2.4.9 released!
This is a bug fix release in the stable 2.4 series.

What窶冱 new in the WebKitGTK+ 2.4.9 release?
o Check TLS errors as soon as they are set in the SoupMessage to prevent any
  data from being sent to the server in case of invalid certificate.
o Clear the GObject DOM bindings internal cache when frames are destroyed or web
  view contents are updated.
o Add HighDPI support for non-accelerated compositing contents.
o Fix some transfer annotations used in GObject DOM bindings.
o Use latin1 instead of UTF-8 for HTTP header values.
o Fix synchronous loads when maximum connection limits are reached.
o Fix a crash ScrollView::contentsToWindow() when GtkPluginWidget doesn窶冲 have a
  parent.
o Fix a memory leak in webkit_web_policy_decision_new.
o Fix g_closure_unref runtime warning.
o Fix a crash due to empty drag image during drag and drop.
o Fix rendering of scrollbars with GTK+ >= 3.16.
o Fix the build on mingw32/msys.
o Fix the build with WebKit2 disabled.
o Fix the build with accelerated compositing disabled.
o Fix clang version check in configure.
o Fix the build with recent versions of GLib that have GMutexLocker.
o Fix the build for Linux/MIPS64EL.


(wiz)
diff -r1.89 -r1.90 pkgsrc/www/webkit-gtk/Makefile
diff -r1.40 -r1.41 pkgsrc/www/webkit-gtk/Makefile.common
diff -r1.74 -r1.75 pkgsrc/www/webkit-gtk/distinfo
diff -r1.7 -r1.8 pkgsrc/www/webkit-gtk/patches/patch-configure
cvs diff -r1.89 -r1.90 pkgsrc/www/webkit-gtk/Makefile (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/Makefile 2015/04/25 14:25:02 1.89
+++ pkgsrc/www/webkit-gtk/Makefile 2015/05/28 05:30:51 1.90
@@ -1,16 +1,15 @@ @@ -1,16 +1,15 @@
1# $NetBSD: Makefile,v 1.89 2015/04/25 14:25:02 tnn Exp $ 1# $NetBSD: Makefile,v 1.90 2015/05/28 05:30:51 wiz Exp $
2 2
3PKGREVISION= 2 
4.include "Makefile.common" 3.include "Makefile.common"
5 4
6PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} 5PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
7 6
8COMMENT= GTK2 port of the WebKit browser engine 7COMMENT= GTK2 port of the WebKit browser engine
9 8
10CONFIGURE_ARGS+= --with-gtk=2.0 9CONFIGURE_ARGS+= --with-gtk=2.0
11CONFIGURE_ARGS+= --disable-webkit2 10CONFIGURE_ARGS+= --disable-webkit2
12 11
13.if ${OPSYS} == "NetBSD" && ${MACHINE_CPU:U} == "arm" 12.if ${OPSYS} == "NetBSD" && ${MACHINE_CPU:U} == "arm"
14LDFLAGS+= -Wl,-no-keep-memory -Wl,-reduce-memory 13LDFLAGS+= -Wl,-no-keep-memory -Wl,-reduce-memory
15.endif 14.endif
16 15
cvs diff -r1.40 -r1.41 pkgsrc/www/webkit-gtk/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/Attic/Makefile.common 2015/03/31 15:55:44 1.40
+++ pkgsrc/www/webkit-gtk/Attic/Makefile.common 2015/05/28 05:30:51 1.41
@@ -1,23 +1,24 @@ @@ -1,23 +1,24 @@
1# $NetBSD: Makefile.common,v 1.40 2015/03/31 15:55:44 joerg Exp $ 1# $NetBSD: Makefile.common,v 1.41 2015/05/28 05:30:51 wiz Exp $
2# used by www/webkit-gtk/Makefile 2# used by www/webkit-gtk/Makefile
3 3
4DISTNAME= webkitgtk-2.4.8 4DISTNAME= webkitgtk-2.4.9
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://www.webkitgtk.org/releases/ 6MASTER_SITES= http://www.webkitgtk.org/releases/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.webkitgtk.org/ 10HOMEPAGE= http://www.webkitgtk.org/
 11LICENSE= 2-clause-bsd AND gnu-lgpl-v2
11 12
12DISTINFO_FILE= ${.CURDIR}/../../www/webkit-gtk/distinfo 13DISTINFO_FILE= ${.CURDIR}/../../www/webkit-gtk/distinfo
13PATCHDIR= ${.CURDIR}/../../www/webkit-gtk/patches 14PATCHDIR= ${.CURDIR}/../../www/webkit-gtk/patches
14 15
15USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
16USE_LIBTOOL= yes 17USE_LIBTOOL= yes
17USE_TOOLS+= automake bison gmake perl:build pkg-config msgfmt 18USE_TOOLS+= automake bison gmake perl:build pkg-config msgfmt
18 19
19# GCC >= 4.8 (for std::this_thread::yield() at least) or Clang >= 3.3 20# GCC >= 4.8 (for std::this_thread::yield() at least) or Clang >= 3.3
20GCC_REQD+= 4.8 21GCC_REQD+= 4.8
21 22
22PKGCONFIG_OVERRIDE= Source/WebKit/gtk/webkit.pc.in 23PKGCONFIG_OVERRIDE= Source/WebKit/gtk/webkit.pc.in
23 24
cvs diff -r1.74 -r1.75 pkgsrc/www/webkit-gtk/distinfo (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/distinfo 2015/03/24 14:30:29 1.74
+++ pkgsrc/www/webkit-gtk/distinfo 2015/05/28 05:30:51 1.75
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.74 2015/03/24 14:30:29 joerg Exp $ 1$NetBSD: distinfo,v 1.75 2015/05/28 05:30:51 wiz Exp $
2 2
3SHA1 (webkitgtk-2.4.8.tar.xz) = 44c6bbe52108297126830525619c1df047886a6f 3SHA1 (webkitgtk-2.4.9.tar.xz) = fbe02db8a4f01a70e7cdf0d16f8a18463e18b104
4RMD160 (webkitgtk-2.4.8.tar.xz) = 24f812f3989baa67e165c1076923020c37df9501 4RMD160 (webkitgtk-2.4.9.tar.xz) = 122468435539d69665d5206ae266fb36ff2d86c2
5Size (webkitgtk-2.4.8.tar.xz) = 9827632 bytes 5Size (webkitgtk-2.4.9.tar.xz) = 9840740 bytes
6SHA1 (patch-Source_JavaScriptCore_ForwardingHeaders_JavaScriptCore_JSCallbackFunction.h) = 79122450435eb12a57086d18e5410eec131c33b2 6SHA1 (patch-Source_JavaScriptCore_ForwardingHeaders_JavaScriptCore_JSCallbackFunction.h) = 79122450435eb12a57086d18e5410eec131c33b2
7SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 2ff343ac53b14af0692754a44059e7d2ea969b96 7SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 2ff343ac53b14af0692754a44059e7d2ea969b96
8SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 69221390dd5fdac55abf341c5ae3a03267e38ae6 8SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 69221390dd5fdac55abf341c5ae3a03267e38ae6
9SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = fdd31fcf6c745394499570397c82fe3dfce02e1d 9SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = fdd31fcf6c745394499570397c82fe3dfce02e1d
10SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 67f66ca254f958c0650249485a64982b40f92621 10SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 67f66ca254f958c0650249485a64982b40f92621
11SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092 11SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
12SHA1 (patch-Source_WTF_wtf_MathExtras.h) = bce39efce126793c2a33ab99224ca44860273a5b 12SHA1 (patch-Source_WTF_wtf_MathExtras.h) = bce39efce126793c2a33ab99224ca44860273a5b
13SHA1 (patch-Source_WTF_wtf_Platform.h) = 6471907359806a180df3e2082b0e54109cb40955 13SHA1 (patch-Source_WTF_wtf_Platform.h) = 6471907359806a180df3e2082b0e54109cb40955
14SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 2835657e04cdbc0cc7be8a6793061f0b98f84224 14SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 2835657e04cdbc0cc7be8a6793061f0b98f84224
15SHA1 (patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp) = 6d3b9ee1559a18c17229698e44246f13c77278c9 15SHA1 (patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp) = 6d3b9ee1559a18c17229698e44246f13c77278c9
16SHA1 (patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp) = 994d1671ff2d8e3a961b9b7ed34f69215ed46f91 16SHA1 (patch-Tools_DumpRenderTree_gtk_DumpRenderTree.cpp) = 994d1671ff2d8e3a961b9b7ed34f69215ed46f91
17SHA1 (patch-ai) = 8e174c68e4ba06fdd6edd64fd6df3328faf9055f 17SHA1 (patch-ai) = 8e174c68e4ba06fdd6edd64fd6df3328faf9055f
18SHA1 (patch-aj) = d35a4b26e2104cdf7f3be81b020aabb4779dfaad 18SHA1 (patch-aj) = d35a4b26e2104cdf7f3be81b020aabb4779dfaad
19SHA1 (patch-ak) = 477fd5c05abee8f47842a6ad5aba00e3e4628c45 19SHA1 (patch-ak) = 477fd5c05abee8f47842a6ad5aba00e3e4628c45
20SHA1 (patch-am) = e0a350feb14d739010000e3887971bd535a647a7 20SHA1 (patch-am) = e0a350feb14d739010000e3887971bd535a647a7
21SHA1 (patch-configure) = a64ca0729ab3011e64045b683aed63f89811a4a0 21SHA1 (patch-configure) = 19f28160d9da63d98dac4eadbb30f5e8250ffcbe
cvs diff -r1.7 -r1.8 pkgsrc/www/webkit-gtk/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/Attic/patch-configure 2014/08/21 04:51:08 1.7
+++ pkgsrc/www/webkit-gtk/patches/Attic/patch-configure 2015/05/28 05:30:51 1.8
@@ -1,91 +1,73 @@ @@ -1,91 +1,73 @@
1$NetBSD: patch-configure,v 1.7 2014/08/21 04:51:08 dbj Exp $ 1$NetBSD: patch-configure,v 1.8 2015/05/28 05:30:51 wiz Exp $
2 2
3--- configure.orig 2014-07-08 09:44:12.000000000 +0000 3--- configure.orig 2015-05-20 09:29:21.000000000 +0000
4+++ configure 4+++ configure
5@@ -4703,7 +4703,7 @@ else 5@@ -4709,7 +4709,7 @@ else
6 We can't simply define LARGE_OFF_T to be 9223372036854775807, 6 We can't simply define LARGE_OFF_T to be 9223372036854775807,
7 since some C++ compilers masquerading as C compilers 7 since some C++ compilers masquerading as C compilers
8 incorrectly reject 9223372036854775807. */ 8 incorrectly reject 9223372036854775807. */
9-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) 9-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
10+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) 10+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
11 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 11 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
12 && LARGE_OFF_T % 2147483647 == 1) 12 && LARGE_OFF_T % 2147483647 == 1)
13 ? 1 : -1]; 13 ? 1 : -1];
14@@ -4749,7 +4749,7 @@ else 14@@ -4755,7 +4755,7 @@ else
15 We can't simply define LARGE_OFF_T to be 9223372036854775807, 15 We can't simply define LARGE_OFF_T to be 9223372036854775807,
16 since some C++ compilers masquerading as C compilers 16 since some C++ compilers masquerading as C compilers
17 incorrectly reject 9223372036854775807. */ 17 incorrectly reject 9223372036854775807. */
18-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) 18-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
19+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) 19+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
20 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 20 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
21 && LARGE_OFF_T % 2147483647 == 1) 21 && LARGE_OFF_T % 2147483647 == 1)
22 ? 1 : -1]; 22 ? 1 : -1];
23@@ -4773,7 +4773,7 @@ rm -f core conftest.err conftest.$ac_obj 23@@ -4779,7 +4779,7 @@ rm -f core conftest.err conftest.$ac_obj
24 We can't simply define LARGE_OFF_T to be 9223372036854775807, 24 We can't simply define LARGE_OFF_T to be 9223372036854775807,
25 since some C++ compilers masquerading as C compilers 25 since some C++ compilers masquerading as C compilers
26 incorrectly reject 9223372036854775807. */ 26 incorrectly reject 9223372036854775807. */
27-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) 27-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
28+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) 28+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
29 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 29 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
30 && LARGE_OFF_T % 2147483647 == 1) 30 && LARGE_OFF_T % 2147483647 == 1)
31 ? 1 : -1]; 31 ? 1 : -1];
32@@ -4818,7 +4818,7 @@ else 32@@ -4824,7 +4824,7 @@ else
33 We can't simply define LARGE_OFF_T to be 9223372036854775807, 33 We can't simply define LARGE_OFF_T to be 9223372036854775807,
34 since some C++ compilers masquerading as C compilers 34 since some C++ compilers masquerading as C compilers
35 incorrectly reject 9223372036854775807. */ 35 incorrectly reject 9223372036854775807. */
36-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) 36-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
37+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) 37+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
38 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 38 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
39 && LARGE_OFF_T % 2147483647 == 1) 39 && LARGE_OFF_T % 2147483647 == 1)
40 ? 1 : -1]; 40 ? 1 : -1];
41@@ -4842,7 +4842,7 @@ rm -f core conftest.err conftest.$ac_obj 41@@ -4848,7 +4848,7 @@ rm -f core conftest.err conftest.$ac_obj
42 We can't simply define LARGE_OFF_T to be 9223372036854775807, 42 We can't simply define LARGE_OFF_T to be 9223372036854775807,
43 since some C++ compilers masquerading as C compilers 43 since some C++ compilers masquerading as C compilers
44 incorrectly reject 9223372036854775807. */ 44 incorrectly reject 9223372036854775807. */
45-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) 45-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
46+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) 46+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
47 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 47 int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
48 && LARGE_OFF_T % 2147483647 == 1) 48 && LARGE_OFF_T % 2147483647 == 1)
49 ? 1 : -1]; 49 ? 1 : -1];
50@@ -4909,7 +4909,7 @@ rm -f core conftest.err conftest.$ac_obj 50@@ -17318,10 +17318,13 @@ int
51 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 
52 /* end confdefs.h. */ 
53  
54-#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3) 
55+#if !(defined(__clang__) && __clang_major__ >= 3 && (__clang_major__ > 3 || __clang_minor__ >= 3)) 
56 #error Not a supported Clang compiler 
57 #endif 
58  
59@@ -4967,7 +4967,7 @@ rm -f core conftest.err conftest.$ac_obj 
60 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 
61 /* end confdefs.h. */ 
62  
63-#if !(defined(__clang__) && __clang_major__ >= 3 && __clang_minor__ >= 3) 
64+#if !(defined(__clang__) && __clang_major__ >= 3 && (__clang_major__ > 3 || __clang_minor__ >= 3)) 
65 #error Not a supported Clang++ compiler 
66 #endif 
67  
68@@ -17312,10 +17312,13 @@ int 
69 main () 51 main ()
70 { 52 {
71 unsigned int major, minor, micro; 53 unsigned int major, minor, micro;
72+ char *tmp_version; 54+ char *tmp_version;
73  55
74 fclose (fopen ("conf.glibtest", "w")); 56 fclose (fopen ("conf.glibtest", "w"));
75  57
76- if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, &micro) != 3) { 58- if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, &micro) != 3) {
77+ /* HP/UX 9 (%@#!) writes to sscanf strings */ 59+ /* HP/UX 9 (%@#!) writes to sscanf strings */
78+ tmp_version = g_strdup("$min_glib_version"); 60+ tmp_version = g_strdup("$min_glib_version");
79+ if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, &micro) != 3) { 61+ if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, &micro) != 3) {
80 printf("%s, bad version string\n", "$min_glib_version"); 62 printf("%s, bad version string\n", "$min_glib_version");
81 exit(1); 63 exit(1);
82 } 64 }
83@@ -21110,7 +21113,7 @@ fi 65@@ -21217,7 +21220,7 @@ fi
84  66
85  67
86 # On some Linux/Unix platforms, shm_* may only be available if linking against librt 68 # On some Linux/Unix platforms, shm_* may only be available if linking against librt
87- if test "$os_win32" = "no"; then 69- if test "$os_win32" = "no"; then
88+ if test "$os_win32" = "no" && test "$os_openbsd" = "no" && test "$os_netbsd" = "no"; then 70+ if test "$os_win32" = "no" && test "$os_openbsd" = "no" && test "$os_netbsd" = "no"; then
89 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5 71 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shm_open" >&5
90 $as_echo_n "checking for library containing shm_open... " >&6; } 72 $as_echo_n "checking for library containing shm_open... " >&6; }
91 if ${ac_cv_search_shm_open+:} false; then : 73 if ${ac_cv_search_shm_open+:} false; then :