Mon Oct 10 21:11:48 2016 UTC ()
Help GCC 4.8 to find the right method.


(joerg)
diff -r1.92 -r1.93 pkgsrc/www/webkit-gtk/distinfo
diff -r0 -r1.1 pkgsrc/www/webkit-gtk/patches/patch-Source_WebKit2_UIProcess_UserContent_WebUserContentControllerProxy.cpp
cvs diff -r1.92 -r1.93 pkgsrc/www/webkit-gtk/distinfo (expand / switch to unified diff)

--- pkgsrc/www/webkit-gtk/distinfo 2016/09/05 08:06:24 1.92
+++ pkgsrc/www/webkit-gtk/distinfo 2016/10/10 21:11:48 1.93
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1$NetBSD: distinfo,v 1.92 2016/09/05 08:06:24 leot Exp $ 1$NetBSD: distinfo,v 1.93 2016/10/10 21:11:48 joerg Exp $
2 2
3SHA1 (webkitgtk-2.12.4.tar.xz) = ebfe6015d81129b6a13a9596d065c54e9c1b93f6 3SHA1 (webkitgtk-2.12.4.tar.xz) = ebfe6015d81129b6a13a9596d065c54e9c1b93f6
4RMD160 (webkitgtk-2.12.4.tar.xz) = 9bccd3c05f3c6a28d36f2bb5fdb3a9a58be10539 4RMD160 (webkitgtk-2.12.4.tar.xz) = 9bccd3c05f3c6a28d36f2bb5fdb3a9a58be10539
5SHA512 (webkitgtk-2.12.4.tar.xz) = c512f36679e0f8278544faad70e3b79108ddb4cd52339c5fb784cbb83857c2d30fd240b3e91dd9ecc1b1195f3086844e0716c8284d992b75b4feffda749d73be 5SHA512 (webkitgtk-2.12.4.tar.xz) = c512f36679e0f8278544faad70e3b79108ddb4cd52339c5fb784cbb83857c2d30fd240b3e91dd9ecc1b1195f3086844e0716c8284d992b75b4feffda749d73be
6Size (webkitgtk-2.12.4.tar.xz) = 11708368 bytes 6Size (webkitgtk-2.12.4.tar.xz) = 11708368 bytes
7SHA1 (patch-CMakeLists.txt) = c48c0e5d33f378b7ecf31fffef609fb2501e5cd3 7SHA1 (patch-CMakeLists.txt) = c48c0e5d33f378b7ecf31fffef609fb2501e5cd3
8SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 99e46f9d9b26a8d9ba6b29c66d7ce5326c4ffeb6 8SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 99e46f9d9b26a8d9ba6b29c66d7ce5326c4ffeb6
9SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = f78e6150ed8901b3fe046b2ef182f50f1c7500a4 9SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = f78e6150ed8901b3fe046b2ef182f50f1c7500a4
10SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 0d82552c6cc1f4885a2bcc539963c966216c977c 10SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = 0d82552c6cc1f4885a2bcc539963c966216c977c
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_Compiler.h) = f4f7771e4b421dddf9f73c7131e671d0c34b906c 12SHA1 (patch-Source_WTF_wtf_Compiler.h) = f4f7771e4b421dddf9f73c7131e671d0c34b906c
13SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 01195978abe07154fbc28de9efc47b3f3105fd89 13SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 01195978abe07154fbc28de9efc47b3f3105fd89
 14SHA1 (patch-Source_WebKit2_UIProcess_UserContent_WebUserContentControllerProxy.cpp) = 8af6225e01c0fbae866110c3aad46eae5c55ac9e
14SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 09a837ee65cdc79cc22220ce713e346fe8752c50 15SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 09a837ee65cdc79cc22220ce713e346fe8752c50
15SHA1 (patch-Source_cmake_OptionsGTK.cmake) = bb73f6bf759ca0f4b53ccfe8433d89efdfb1b009 16SHA1 (patch-Source_cmake_OptionsGTK.cmake) = bb73f6bf759ca0f4b53ccfe8433d89efdfb1b009
16SHA1 (patch-ai) = b8a45f2f5c1aa5aed178527ecd6cbd93baf76f8e 17SHA1 (patch-ai) = b8a45f2f5c1aa5aed178527ecd6cbd93baf76f8e
17SHA1 (patch-aj) = 8247194bd8d62fcc356650c946756898fbe22982 18SHA1 (patch-aj) = 8247194bd8d62fcc356650c946756898fbe22982
File Added: pkgsrc/www/webkit-gtk/patches/Attic/patch-Source_WebKit2_UIProcess_UserContent_WebUserContentControllerProxy.cpp
$NetBSD: patch-Source_WebKit2_UIProcess_UserContent_WebUserContentControllerProxy.cpp,v 1.1 2016/10/10 21:11:48 joerg Exp $

--- Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp.orig	2016-10-09 14:17:57.000000000 +0000
+++ Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp
@@ -116,7 +116,7 @@ void WebUserContentControllerProxy::addU
 void WebUserContentControllerProxy::removeUserScript(const API::UserScript& userScript)
 {
     for (WebProcessProxy* process : m_processes)
-        process->connection()->send(Messages::WebUserContentController::RemoveUserScript({ userScript.userScript().url().string() }), m_identifier);
+        process->connection()->send(Messages::WebUserContentController::RemoveUserScript(userScript.userScript().url()), m_identifier);
 
     m_userScripts->elements().removeAll(&userScript);
 }
@@ -140,7 +140,7 @@ void WebUserContentControllerProxy::addU
 void WebUserContentControllerProxy::removeUserStyleSheet(const API::UserStyleSheet& userStyleSheet)
 {
     for (WebProcessProxy* process : m_processes)
-        process->connection()->send(Messages::WebUserContentController::RemoveUserStyleSheet({ userStyleSheet.userStyleSheet().url().string() }), m_identifier);
+        process->connection()->send(Messages::WebUserContentController::RemoveUserStyleSheet(userStyleSheet.userStyleSheet().url()), m_identifier);
 
     m_userStyleSheets->elements().removeAll(&userStyleSheet);
 }