Thu Jan 21 13:42:33 2016 UTC ()
Update www/webkit-gtk to 2.10.5.

Changes:
  - Disable DNS prefetch when a proxy is configured.
  - Reduce the maximum simultaneous network connections to match other browsers.
  - Make WebKitWebView always propagate motion-notify-event signal.
  - Add a way to force accelerating compositing mode at runtime using an environment variable.
  - Fix input elements and scrollbars rendering with GTK+ 3.19.
  - Fix rendering of lines when using solid colors.
  - Fix UI process crashes related to not having a main resource response when the load is
    committed for pages restored from the history cache.
  - Fix a WebProcess crash when loading large contents with custom URI schemes API.
  - Fix a crash in the UI process when the WebView is destroyed while the screensaver DBus proxy
    is being created.
  - Fix WebProcess crashes due to BadDrawable X errors in accelerated compositing mode.
  - Fix crashes on PPC64 due to mprotect() on address not aligned to the page size.
  - Fix std::bad_function_call exception raised in dispatchDecidePolicyForNavigationAction.
  - Fix downloads of data URLs.
  - Fix runtime critical warnings when closing a page containing windowed plugins.
  - Fix several crashes and rendering issues.
  - Translation updates: French, German, Italian, Turkish.
  - Security fixes: CVE-2015-7096, CVE-2015-7098.


(leot)
diff -r1.107 -r1.108 pkgsrc/www/webkit-gtk/Makefile
diff -r1.30 -r1.31 pkgsrc/www/webkit-gtk/PLIST
diff -r1.86 -r1.87 pkgsrc/www/webkit-gtk/distinfo
diff -r1.1 -r1.2 pkgsrc/www/webkit-gtk/patches/patch-CMakeLists.txt
diff -r1.1 -r1.2 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_Options.cpp
diff -r1.5 -r1.6 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
diff -r1.5 -r1.6 pkgsrc/www/webkit-gtk/patches/patch-Source_WTF_wtf_MathExtras.h
diff -r1.4 -r1.5 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp
diff -r1.4 -r1.5 pkgsrc/www/webkit-gtk/patches/patch-Source_JavaScriptCore_dfg_DFGNode.h
diff -r1.4 -r1.5 pkgsrc/www/webkit-gtk/patches/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp
diff -r1.2 -r1.3 pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake
diff -r1.6 -r1.7 pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsGTK.cmake
diff -r1.6 -r1.7 pkgsrc/www/webkit-gtk/patches/patch-ai
cvs diff -r1.107 -r1.108 pkgsrc/www/webkit-gtk/Makefile (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/Makefile 2016/01/06 10:46:50 1.107
+++ pkgsrc/www/webkit-gtk/Makefile 2016/01/21 13:42:32 1.108
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.107 2016/01/06 10:46:50 adam Exp $ 1# $NetBSD: Makefile,v 1.108 2016/01/21 13:42:32 leot Exp $
2 2
3DISTNAME= webkitgtk-2.10.4 3DISTNAME= webkitgtk-2.10.5
4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/} 4PKGNAME= ${DISTNAME:S/webkitgtk/webkit-gtk/}
5PKGREVISION= 1 
6CATEGORIES= www 5CATEGORIES= www
7MASTER_SITES= http://www.webkitgtk.org/releases/ 6MASTER_SITES= http://www.webkitgtk.org/releases/
8EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.webkitgtk.org/ 10HOMEPAGE= http://www.webkitgtk.org/
12COMMENT= GTK port of the WebKit browser engine 11COMMENT= GTK port of the WebKit browser engine
13LICENSE= 2-clause-bsd AND gnu-lgpl-v2 12LICENSE= 2-clause-bsd AND gnu-lgpl-v2
14 13
15# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0 14# shm_open(3) and shm_unlink(3) appeared in NetBSD 7.0
16NOT_FOR_PLATFORM= NetBSD-[1-6]*-* 15NOT_FOR_PLATFORM= NetBSD-[1-6]*-*
17 16
18BUILD_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools 17BUILD_DEPENDS+= gettext-tools>=0.18:../../devel/gettext-tools
cvs diff -r1.30 -r1.31 pkgsrc/www/webkit-gtk/PLIST (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/PLIST 2015/11/22 08:46:35 1.30
+++ pkgsrc/www/webkit-gtk/PLIST 2016/01/21 13:42:32 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.30 2015/11/22 08:46:35 leot Exp $ 1@comment $NetBSD: PLIST,v 1.31 2016/01/21 13:42:32 leot Exp $
2bin/MiniBrowser 2bin/MiniBrowser
3bin/jsc 3bin/jsc
4include/webkitgtk-4.0/JavaScriptCore/JSBase.h 4include/webkitgtk-4.0/JavaScriptCore/JSBase.h
5include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h 5include/webkitgtk-4.0/JavaScriptCore/JSContextRef.h
6include/webkitgtk-4.0/JavaScriptCore/JSObjectRef.h 6include/webkitgtk-4.0/JavaScriptCore/JSObjectRef.h
7include/webkitgtk-4.0/JavaScriptCore/JSStringRef.h 7include/webkitgtk-4.0/JavaScriptCore/JSStringRef.h
8include/webkitgtk-4.0/JavaScriptCore/JSValueRef.h 8include/webkitgtk-4.0/JavaScriptCore/JSValueRef.h
9include/webkitgtk-4.0/JavaScriptCore/JavaScript.h 9include/webkitgtk-4.0/JavaScriptCore/JavaScript.h
10include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h 10include/webkitgtk-4.0/JavaScriptCore/WebKitAvailability.h
11include/webkitgtk-4.0/webkit2/WebKitAuthenticationRequest.h 11include/webkitgtk-4.0/webkit2/WebKitAuthenticationRequest.h
12include/webkitgtk-4.0/webkit2/WebKitBackForwardList.h 12include/webkitgtk-4.0/webkit2/WebKitBackForwardList.h
13include/webkitgtk-4.0/webkit2/WebKitBackForwardListItem.h 13include/webkitgtk-4.0/webkit2/WebKitBackForwardListItem.h
14include/webkitgtk-4.0/webkit2/WebKitColorChooserRequest.h 14include/webkitgtk-4.0/webkit2/WebKitColorChooserRequest.h
@@ -270,30 +270,30 @@ include/webkitgtk-4.0/webkitdom/WebKitDO @@ -270,30 +270,30 @@ include/webkitgtk-4.0/webkitdom/WebKitDO
270include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEvent.h 270include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEvent.h
271include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEventUnstable.h 271include/webkitgtk-4.0/webkitdom/WebKitDOMWheelEventUnstable.h
272include/webkitgtk-4.0/webkitdom/WebKitDOMXPathExpression.h 272include/webkitgtk-4.0/webkitdom/WebKitDOMXPathExpression.h
273include/webkitgtk-4.0/webkitdom/WebKitDOMXPathNSResolver.h 273include/webkitgtk-4.0/webkitdom/WebKitDOMXPathNSResolver.h
274include/webkitgtk-4.0/webkitdom/WebKitDOMXPathResult.h 274include/webkitgtk-4.0/webkitdom/WebKitDOMXPathResult.h
275include/webkitgtk-4.0/webkitdom/webkitdom.h 275include/webkitgtk-4.0/webkitdom/webkitdom.h
276include/webkitgtk-4.0/webkitdom/webkitdomdefines-unstable.h 276include/webkitgtk-4.0/webkitdom/webkitdomdefines-unstable.h
277include/webkitgtk-4.0/webkitdom/webkitdomdefines.h 277include/webkitgtk-4.0/webkitdom/webkitdomdefines.h
278lib/girepository-1.0/JavaScriptCore-4.0.typelib 278lib/girepository-1.0/JavaScriptCore-4.0.typelib
279lib/girepository-1.0/WebKit2-4.0.typelib 279lib/girepository-1.0/WebKit2-4.0.typelib
280lib/girepository-1.0/WebKit2WebExtension-4.0.typelib 280lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
281lib/libjavascriptcoregtk-4.0.so 281lib/libjavascriptcoregtk-4.0.so
282lib/libjavascriptcoregtk-4.0.so.18 282lib/libjavascriptcoregtk-4.0.so.18
283lib/libjavascriptcoregtk-4.0.so.18.2.12 283lib/libjavascriptcoregtk-4.0.so.18.2.13
284lib/libwebkit2gtk-4.0.so 284lib/libwebkit2gtk-4.0.so
285lib/libwebkit2gtk-4.0.so.37 285lib/libwebkit2gtk-4.0.so.37
286lib/libwebkit2gtk-4.0.so.37.11.7 286lib/libwebkit2gtk-4.0.so.37.11.8
287lib/pkgconfig/javascriptcoregtk-4.0.pc 287lib/pkgconfig/javascriptcoregtk-4.0.pc
288lib/pkgconfig/webkit2gtk-4.0.pc 288lib/pkgconfig/webkit2gtk-4.0.pc
289lib/pkgconfig/webkit2gtk-web-extension-4.0.pc 289lib/pkgconfig/webkit2gtk-web-extension-4.0.pc
290lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so 290lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
291libexec/webkit2gtk-4.0/WebKitNetworkProcess 291libexec/webkit2gtk-4.0/WebKitNetworkProcess
292libexec/webkit2gtk-4.0/WebKitPluginProcess 292libexec/webkit2gtk-4.0/WebKitPluginProcess
293libexec/webkit2gtk-4.0/WebKitPluginProcess2 293libexec/webkit2gtk-4.0/WebKitPluginProcess2
294libexec/webkit2gtk-4.0/WebKitWebProcess 294libexec/webkit2gtk-4.0/WebKitWebProcess
295share/gir-1.0/JavaScriptCore-4.0.gir 295share/gir-1.0/JavaScriptCore-4.0.gir
296share/gir-1.0/WebKit2-4.0.gir 296share/gir-1.0/WebKit2-4.0.gir
297share/gir-1.0/WebKit2WebExtension-4.0.gir 297share/gir-1.0/WebKit2WebExtension-4.0.gir
298share/locale/ar/LC_MESSAGES/WebKit2GTK-4.0.mo 298share/locale/ar/LC_MESSAGES/WebKit2GTK-4.0.mo
299share/locale/as/LC_MESSAGES/WebKit2GTK-4.0.mo 299share/locale/as/LC_MESSAGES/WebKit2GTK-4.0.mo
cvs diff -r1.86 -r1.87 pkgsrc/www/webkit-gtk/distinfo (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/distinfo 2015/11/22 08:46:35 1.86
+++ pkgsrc/www/webkit-gtk/distinfo 2016/01/21 13:42:32 1.87
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.86 2015/11/22 08:46:35 leot Exp $ 1$NetBSD: distinfo,v 1.87 2016/01/21 13:42:32 leot Exp $
2 2
3SHA1 (webkitgtk-2.10.4.tar.xz) = 45f368823c806542b24db3fd06442c0ccedc875f 3SHA1 (webkitgtk-2.10.5.tar.xz) = 337225d2f132c797f30430be0283b9555cbecceb
4RMD160 (webkitgtk-2.10.4.tar.xz) = 99dc267c6fb5690b394e2541520c42bcfa53be58 4RMD160 (webkitgtk-2.10.5.tar.xz) = 343e98fc2698cdf4f7ff615e7c1fd97bd02fc2c7
5SHA512 (webkitgtk-2.10.4.tar.xz) = 1d1c79fb863be192639304c5616fb875ccfe541617fdc5c973e79d8159131080ba734199959a01760b9d06accaae7e2e87bec3bcc42dcd2e6b0d19a5b82ed039 5SHA512 (webkitgtk-2.10.5.tar.xz) = 51a5c469b1251b643055a1fb9d7b7be6e5497ebaba93d08d03f4e34a8c708666c3f18c1ddc1faa51af8200bf823f075a0fd031bb390a3fd92e17b51b0f0ccdc4
6Size (webkitgtk-2.10.4.tar.xz) = 11015164 bytes 6Size (webkitgtk-2.10.5.tar.xz) = 10986648 bytes
7SHA1 (patch-CMakeLists.txt) = e5834d3935c4a25ab4aeb7210d0ccbffc012b670 7SHA1 (patch-CMakeLists.txt) = c48c0e5d33f378b7ecf31fffef609fb2501e5cd3
8SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 2b1eadc7a11b37dc36a7491f30bf72a6dddf5725 8SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 99e46f9d9b26a8d9ba6b29c66d7ce5326c4ffeb6
9SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 1c5e0113e939163a69115809148dc184e64839ae 9SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = f78e6150ed8901b3fe046b2ef182f50f1c7500a4
10SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 9b36b50f28bcb9421ac8b0ed17bba02de6d34e16 10SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 0d82552c6cc1f4885a2bcc539963c966216c977c
11SHA1 (patch-Source_JavaScriptCore_runtime_Options.cpp) = f8244c0f22bdb1ad29cb9abcfe0654173cedbe04 11SHA1 (patch-Source_JavaScriptCore_runtime_Options.cpp) = 3f3e5b0e3c944656fc614bad9578e625be0296d2
12SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092 12SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
13SHA1 (patch-Source_WTF_wtf_MathExtras.h) = ba957541a8b70e77707013bb5a93abbeb1829c75 13SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 01195978abe07154fbc28de9efc47b3f3105fd89
14SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = dfc5d06c3ec7112bdacabd0e66dd2ee6564f4ab3 14SHA1 (patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 67bac371dff2afd7a1c7fad8763e05b722a11424
15SHA1 (patch-Source_cmake_OptionsCommon.cmake) = f7b869cc197e9f2341566e5bcd4c4190e394ea29 15SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 09a837ee65cdc79cc22220ce713e346fe8752c50
16SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 18f161fd72dd8d95ab382ca077f3773f0762a2a1 16SHA1 (patch-Source_cmake_OptionsGTK.cmake) = 475fda65f9ffd157a12306f6be71026e5602850e
17SHA1 (patch-ai) = f0b059fe71022e961903655f5c2a5205fe452968 17SHA1 (patch-ai) = b8a45f2f5c1aa5aed178527ecd6cbd93baf76f8e
18SHA1 (patch-aj) = 8247194bd8d62fcc356650c946756898fbe22982 18SHA1 (patch-aj) = 8247194bd8d62fcc356650c946756898fbe22982
cvs diff -r1.1 -r1.2 pkgsrc/www/webkit-gtk/patches/Attic/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/Attic/patch-CMakeLists.txt 2015/10/26 10:53:25 1.1
+++ pkgsrc/www/webkit-gtk/patches/Attic/patch-CMakeLists.txt 2016/01/21 13:42:33 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-CMakeLists.txt,v 1.1 2015/10/26 10:53:25 jmcneill Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.2 2016/01/21 13:42:33 leot Exp $
2 2
3--- CMakeLists.txt.orig 2015-10-25 17:30:21.000000000 +0000 3--- CMakeLists.txt.orig 2016-01-20 12:12:59.000000000 +0000
4+++ CMakeLists.txt 4+++ CMakeLists.txt
5@@ -87,6 +87,8 @@ else () 5@@ -87,6 +87,8 @@ else ()
6 endif () 6 endif ()
7 if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") 7 if (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
8 set(WTF_CPU_ARM 1) 8 set(WTF_CPU_ARM 1)
9+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^earm") 9+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^earm")
10+ set(WTF_CPU_ARM 1) 10+ set(WTF_CPU_ARM 1)
11 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") 11 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
12 set(WTF_CPU_ARM64 1) 12 set(WTF_CPU_ARM64 1)
13 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") 13 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
cvs diff -r1.1 -r1.2 pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_runtime_Options.cpp (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_runtime_Options.cpp 2015/09/26 10:16:38 1.1
+++ pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_runtime_Options.cpp 2016/01/21 13:42:33 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-Source_JavaScriptCore_runtime_Options.cpp,v 1.1 2015/09/26 10:16:38 leot Exp $ 1$NetBSD: patch-Source_JavaScriptCore_runtime_Options.cpp,v 1.2 2016/01/21 13:42:33 leot Exp $
2 2
3--- Source/JavaScriptCore/runtime/Options.cpp.orig 2015-09-21 07:29:46.000000000 +0000 3--- Source/JavaScriptCore/runtime/Options.cpp.orig 2016-01-20 12:13:00.000000000 +0000
4+++ Source/JavaScriptCore/runtime/Options.cpp 4+++ Source/JavaScriptCore/runtime/Options.cpp
5@@ -610,7 +610,7 @@ bool Option::operator==(const Option& ot 5@@ -610,7 +610,7 @@ bool Option::operator==(const Option& ot
6 case Options::Type::unsignedType: 6 case Options::Type::unsignedType:
7 return m_entry.unsignedVal == other.m_entry.unsignedVal; 7 return m_entry.unsignedVal == other.m_entry.unsignedVal;
8 case Options::Type::doubleType: 8 case Options::Type::doubleType:
9- return (m_entry.doubleVal == other.m_entry.doubleVal) || (isnan(m_entry.doubleVal) && isnan(other.m_entry.doubleVal)); 9- return (m_entry.doubleVal == other.m_entry.doubleVal) || (isnan(m_entry.doubleVal) && isnan(other.m_entry.doubleVal));
10+ return (m_entry.doubleVal == other.m_entry.doubleVal) || (std::isnan(m_entry.doubleVal) && std::isnan(other.m_entry.doubleVal)); 10+ return (m_entry.doubleVal == other.m_entry.doubleVal) || (std::isnan(m_entry.doubleVal) && std::isnan(other.m_entry.doubleVal));
11 case Options::Type::int32Type: 11 case Options::Type::int32Type:
12 return m_entry.int32Val == other.m_entry.int32Val; 12 return m_entry.int32Val == other.m_entry.int32Val;
13 case Options::Type::optionRangeType: 13 case Options::Type::optionRangeType:
cvs diff -r1.5 -r1.6 pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_assembler_ARMAssembler.h (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_assembler_ARMAssembler.h 2015/10/26 10:53:25 1.5
+++ pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_assembler_ARMAssembler.h 2016/01/21 13:42:33 1.6
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.5 2015/10/26 10:53:25 jmcneill Exp $ 1$NetBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.6 2016/01/21 13:42:33 leot Exp $
2 2
3--- Source/JavaScriptCore/assembler/ARMAssembler.h.orig 2015-10-15 08:20:12.000000000 +0000 3--- Source/JavaScriptCore/assembler/ARMAssembler.h.orig 2016-01-20 12:12:59.000000000 +0000
4+++ Source/JavaScriptCore/assembler/ARMAssembler.h 4+++ Source/JavaScriptCore/assembler/ARMAssembler.h
5@@ -29,6 +29,11 @@ 5@@ -29,6 +29,11 @@
6  6
7 #if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL) 7 #if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
8  8
9+#if defined(__NetBSD__) 9+#if defined(__NetBSD__)
10+#include <sys/types.h> 10+#include <sys/types.h>
11+#include <machine/sysarch.h> 11+#include <machine/sysarch.h>
12+#endif 12+#endif
13+ 13+
14 #include "AssemblerBufferWithConstantPool.h" 14 #include "AssemblerBufferWithConstantPool.h"
15 #include "JITCompilationEffort.h" 15 #include "JITCompilationEffort.h"
16 #include <wtf/Assertions.h> 16 #include <wtf/Assertions.h>
cvs diff -r1.5 -r1.6 pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WTF_wtf_MathExtras.h (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WTF_wtf_MathExtras.h 2015/09/26 10:16:38 1.5
+++ pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WTF_wtf_MathExtras.h 2016/01/21 13:42:33 1.6
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-Source_WTF_wtf_MathExtras.h,v 1.5 2015/09/26 10:16:38 leot Exp $ 1$NetBSD: patch-Source_WTF_wtf_MathExtras.h,v 1.6 2016/01/21 13:42:33 leot Exp $
2 2
3Avoid broken section for SunOS/gcc. 3Avoid broken section for SunOS/gcc.
4 4
5--- Source/WTF/wtf/MathExtras.h.orig 2015-09-14 07:08:10.000000000 +0000 5--- Source/WTF/wtf/MathExtras.h.orig 2016-01-20 12:13:00.000000000 +0000
6+++ Source/WTF/wtf/MathExtras.h 6+++ Source/WTF/wtf/MathExtras.h
7@@ -75,7 +75,7 @@ const double sqrtOfTwoDouble = M_SQRT2; 7@@ -75,7 +75,7 @@ const double sqrtOfTwoDouble = M_SQRT2;
8 const float sqrtOfTwoFloat = static_cast<float>(M_SQRT2); 8 const float sqrtOfTwoFloat = static_cast<float>(M_SQRT2);
9 #endif 9 #endif
10  10
11-#if OS(SOLARIS) 11-#if OS(SOLARIS)
12+#if OS(notSOLARIS) 12+#if OS(notSOLARIS)
13  13
14 namespace std { 14 namespace std {
15  15
cvs diff -r1.4 -r1.5 pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp 2015/09/26 10:16:38 1.4
+++ pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp 2016/01/21 13:42:33 1.5
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.4 2015/09/26 10:16:38 leot Exp $ 1$NetBSD: patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp,v 1.5 2016/01/21 13:42:33 leot Exp $
2 2
3--- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig 2015-09-21 07:29:46.000000000 +0000 3--- Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp.orig 2016-01-20 12:12:59.000000000 +0000
4+++ Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp 4+++ Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp
5@@ -38,6 +38,8 @@ 5@@ -38,6 +38,8 @@
6 #include <unistd.h> 6 #include <unistd.h>
7 #include <elf.h> 7 #include <elf.h>
8 #include <asm/hwcap.h> 8 #include <asm/hwcap.h>
9+#elif OS(NETBSD) 9+#elif OS(NETBSD)
10+#include <sys/sysctl.h> 10+#include <sys/sysctl.h>
11 #endif 11 #endif
12  12
13 namespace JSC { 13 namespace JSC {
14@@ -57,6 +59,16 @@ static bool isVFPPresent() 14@@ -57,6 +59,16 @@ static bool isVFPPresent()
15 close(fd); 15 close(fd);
16 } 16 }
cvs diff -r1.4 -r1.5 pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_dfg_DFGNode.h (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_dfg_DFGNode.h 2015/09/26 10:16:38 1.4
+++ pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_JavaScriptCore_dfg_DFGNode.h 2016/01/21 13:42:33 1.5
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-Source_JavaScriptCore_dfg_DFGNode.h,v 1.4 2015/09/26 10:16:38 leot Exp $ 1$NetBSD: patch-Source_JavaScriptCore_dfg_DFGNode.h,v 1.5 2016/01/21 13:42:33 leot Exp $
2 2
3--- Source/JavaScriptCore/dfg/DFGNode.h.orig 2015-09-21 07:29:46.000000000 +0000 3--- Source/JavaScriptCore/dfg/DFGNode.h.orig 2016-01-20 12:12:59.000000000 +0000
4+++ Source/JavaScriptCore/dfg/DFGNode.h 4+++ Source/JavaScriptCore/dfg/DFGNode.h
5@@ -221,7 +221,7 @@ struct OpInfo { 5@@ -221,7 +221,7 @@ struct OpInfo {
6 OpInfo() : m_value(0) { } 6 OpInfo() : m_value(0) { }
7 explicit OpInfo(int32_t value) : m_value(static_cast<uintptr_t>(value)) { } 7 explicit OpInfo(int32_t value) : m_value(static_cast<uintptr_t>(value)) { }
8 explicit OpInfo(uint32_t value) : m_value(static_cast<uintptr_t>(value)) { } 8 explicit OpInfo(uint32_t value) : m_value(static_cast<uintptr_t>(value)) { }
9-#if OS(DARWIN) || USE(JSVALUE64) 9-#if OS(DARWIN) || USE(JSVALUE64)
10+#if OS(DARWIN) || (CPU(ARM) && OS(NETBSD)) || USE(JSVALUE64) 10+#if OS(DARWIN) || (CPU(ARM) && OS(NETBSD)) || USE(JSVALUE64)
11 explicit OpInfo(size_t value) : m_value(static_cast<uintptr_t>(value)) { } 11 explicit OpInfo(size_t value) : m_value(static_cast<uintptr_t>(value)) { }
12 #endif 12 #endif
13 explicit OpInfo(void* value) : m_value(reinterpret_cast<uintptr_t>(value)) { } 13 explicit OpInfo(void* value) : m_value(reinterpret_cast<uintptr_t>(value)) { }
cvs diff -r1.4 -r1.5 pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp 2015/09/26 10:16:38 1.4
+++ pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp 2016/01/21 13:42:33 1.5
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp,v 1.4 2015/09/26 10:16:38 leot Exp $ 1$NetBSD: patch-Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp,v 1.5 2016/01/21 13:42:33 leot Exp $
2 2
3--- Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp.orig 2015-09-21 07:29:46.000000000 +0000 3--- Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp.orig 2016-01-20 12:13:00.000000000 +0000
4+++ Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp 4+++ Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp
5@@ -59,6 +59,8 @@ JSValue JSInspectorFrontendHost::platfor 5@@ -59,6 +59,8 @@ JSValue JSInspectorFrontendHost::platfor
6 DEPRECATED_DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("linux"))); 6 DEPRECATED_DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("linux")));
7 #elif OS(FREEBSD) 7 #elif OS(FREEBSD)
8 DEPRECATED_DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("freebsd"))); 8 DEPRECATED_DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("freebsd")));
9+#elif OS(NETBSD) 9+#elif OS(NETBSD)
10+ DEPRECATED_DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("netbsd"))); 10+ DEPRECATED_DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("netbsd")));
11 #elif OS(OPENBSD) 11 #elif OS(OPENBSD)
12 DEPRECATED_DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("openbsd"))); 12 DEPRECATED_DEFINE_STATIC_LOCAL(const String, platform, (ASCIILiteral("openbsd")));
13 #elif OS(SOLARIS) 13 #elif OS(SOLARIS)
cvs diff -r1.2 -r1.3 pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake 2015/09/26 10:16:38 1.2
+++ pkgsrc/www/webkit-gtk/patches/patch-Source_cmake_OptionsCommon.cmake 2016/01/21 13:42:33 1.3
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.2 2015/09/26 10:16:38 leot Exp $ 1$NetBSD: patch-Source_cmake_OptionsCommon.cmake,v 1.3 2016/01/21 13:42:33 leot Exp $
2 2
3Using the T option of GNU ar lead to malformed .a archive on NetBSD. Disable it. 3Using the T option of GNU ar lead to malformed .a archive on NetBSD. Disable it.
4 4
5--- Source/cmake/OptionsCommon.cmake.orig 2015-09-21 07:29:46.000000000 +0000 5--- Source/cmake/OptionsCommon.cmake.orig 2016-01-20 12:13:00.000000000 +0000
6+++ Source/cmake/OptionsCommon.cmake 6+++ Source/cmake/OptionsCommon.cmake
7@@ -17,10 +17,10 @@ endif () 7@@ -17,10 +17,10 @@ endif ()
8  8
9 execute_process(COMMAND ${CMAKE_AR} -V OUTPUT_VARIABLE AR_VERSION) 9 execute_process(COMMAND ${CMAKE_AR} -V OUTPUT_VARIABLE AR_VERSION)
10 if ("${AR_VERSION}" MATCHES "^GNU ar") 10 if ("${AR_VERSION}" MATCHES "^GNU ar")
11- set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>") 11- set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>")
12- set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>") 12- set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> crT <TARGET> <LINK_FLAGS> <OBJECTS>")
13- set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>") 13- set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>")
14- set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>") 14- set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> rT <TARGET> <LINK_FLAGS> <OBJECTS>")
15+ set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>") 15+ set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>")
16+ set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>") 16+ set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> cr <TARGET> <LINK_FLAGS> <OBJECTS>")
17+ set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>") 17+ set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>")
18+ set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>") 18+ set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> r <TARGET> <LINK_FLAGS> <OBJECTS>")
cvs diff -r1.6 -r1.7 pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_cmake_OptionsGTK.cmake (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_cmake_OptionsGTK.cmake 2015/11/22 08:46:35 1.6
+++ pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_cmake_OptionsGTK.cmake 2016/01/21 13:42:33 1.7
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1$NetBSD: patch-Source_cmake_OptionsGTK.cmake,v 1.6 2015/11/22 08:46:35 leot Exp $ 1$NetBSD: patch-Source_cmake_OptionsGTK.cmake,v 1.7 2016/01/21 13:42:33 leot Exp $
2 2
3o Do not require GCC 4.9.0 (should be build *without* IndexedDB support) 3o Do not require GCC 4.9.0 (should be build *without* IndexedDB support)
4o Do not conflict with CMAKE_MODULE_PATH during the linking phase of 4o Do not conflict with CMAKE_MODULE_PATH during the linking phase of
5 libwebkit2gtk-4.0.so: 5 libwebkit2gtk-4.0.so:
6 6
7 Linking CXX shared library ../../lib/libwebkit2gtk-4.0.so 7 Linking CXX shared library ../../lib/libwebkit2gtk-4.0.so
8 ld:/usr/pkgsrc/wip/webkit-gtk/work/.buildlink/cmake-Modules:1: ignoring invalid character `3' in script 8 ld:/usr/pkgsrc/wip/webkit-gtk/work/.buildlink/cmake-Modules:1: ignoring invalid character `3' in script
9 [...] 9 [...]
10 ld:/usr/pkgsrc/wip/webkit-gtk/work/.buildlink/cmake-Modules:1: syntax error in VERSION script 10 ld:/usr/pkgsrc/wip/webkit-gtk/work/.buildlink/cmake-Modules:1: syntax error in VERSION script
11 Source/WebKit2/CMakeFiles/WebKit2.dir/build.make:16139: recipe for target 'lib/libwebkit2gtk-4.0.so.37.2.6' failed 11 Source/WebKit2/CMakeFiles/WebKit2.dir/build.make:16139: recipe for target 'lib/libwebkit2gtk-4.0.so.37.2.6' failed
12 [...] 12 [...]
13 13
14o Disable DatabaseProcess and IndexedDB support. 14o Disable DatabaseProcess and IndexedDB support.
15 15
16--- Source/cmake/OptionsGTK.cmake.orig 2015-11-11 09:22:48.000000000 +0000 16--- Source/cmake/OptionsGTK.cmake.orig 2016-01-20 12:45:56.000000000 +0000
17+++ Source/cmake/OptionsGTK.cmake 17+++ Source/cmake/OptionsGTK.cmake
18@@ -6,13 +6,6 @@ set(PROJECT_VERSION_MICRO 4) 18@@ -6,13 +6,6 @@ set(PROJECT_VERSION_MICRO 5)
19 set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO}) 19 set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_MICRO})
20 set(WEBKITGTK_API_VERSION 4.0) 20 set(WEBKITGTK_API_VERSION 4.0)
21  21
22-# IndexedDB support requires GCC 4.9, see https://bugs.webkit.org/show_bug.cgi?id=98932. 22-# IndexedDB support requires GCC 4.9, see https://bugs.webkit.org/show_bug.cgi?id=98932.
23-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") 23-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
24- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9.0") 24- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9.0")
25- message(FATAL_ERROR "GCC 4.9.0 is required to build WebKitGTK+, use a newer GCC version or clang") 25- message(FATAL_ERROR "GCC 4.9.0 is required to build WebKitGTK+, use a newer GCC version or clang")
26- endif () 26- endif ()
27-endif () 27-endif ()
28- 28-
29 # Libtool library version, not to be confused with API version. 29 # Libtool library version, not to be confused with API version.
30 # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html 30 # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
31 CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 48 7 11) 31 CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 48 8 11)
32@@ -106,7 +99,7 @@ else () 32@@ -106,7 +99,7 @@ else ()
33 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC OFF) 33 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC OFF)
34 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE OFF) 34 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE OFF)
35 if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") 35 if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
36- set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter") 36- set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter")
37+ set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_SOURCE_DIR}/Source/cmake/gtksymbols.filter") 37+ set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_SOURCE_DIR}/Source/cmake/gtksymbols.filter")
38 endif () 38 endif ()
39 endif () 39 endif ()
40  40
41@@ -141,7 +134,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ 41@@ -141,7 +134,7 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_
42 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON) 42 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS PRIVATE ON)
43 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON) 43 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_SELECTORS_LEVEL4 PRIVATE ON)
44 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER PRIVATE OFF) 44 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER PRIVATE OFF)
cvs diff -r1.6 -r1.7 pkgsrc/www/webkit-gtk/patches/Attic/patch-ai (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/patches/Attic/patch-ai 2015/09/26 10:16:38 1.6
+++ pkgsrc/www/webkit-gtk/patches/Attic/patch-ai 2016/01/21 13:42:33 1.7
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ai,v 1.6 2015/09/26 10:16:38 leot Exp $ 1$NetBSD: patch-ai,v 1.7 2016/01/21 13:42:33 leot Exp $
2 2
3--- Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp.orig 2015-09-14 07:08:10.000000000 +0000 3--- Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp.orig 2016-01-04 10:38:34.000000000 +0000
4+++ Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp 4+++ Source/WTF/wtf/ThreadIdentifierDataPthreads.cpp
5@@ -39,6 +39,12 @@ 5@@ -39,6 +39,12 @@
6 #if OS(HURD) 6 #if OS(HURD)
7 // PTHREAD_KEYS_MAX is not defined in bionic nor in Hurd, so explicitly define it here. 7 // PTHREAD_KEYS_MAX is not defined in bionic nor in Hurd, so explicitly define it here.
8 #define PTHREAD_KEYS_MAX 1024 8 #define PTHREAD_KEYS_MAX 1024
9+#elif OS(NETBSD)  9+#elif OS(NETBSD)
10+#include <limits.h> 10+#include <limits.h>
11+// PTHREAD_KEYS_MAX is not defined in 5.x 11+// PTHREAD_KEYS_MAX is not defined in 5.x
12+#ifndef PTHREAD_KEYS_MAX 12+#ifndef PTHREAD_KEYS_MAX
13+#define PTHREAD_KEYS_MAX 256 13+#define PTHREAD_KEYS_MAX 256
14+#endif  14+#endif
15 #else 15 #else
16 #include <limits.h> 16 #include <limits.h>