Fri Mar 18 07:37:38 2016 UTC ()
fix bad macro parenthesis


(dbj)
diff -r1.6 -r1.7 pkgsrc/x11/qt5-qtwebkit/distinfo
diff -r1.2 -r1.3 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp
cvs diff -r1.6 -r1.7 pkgsrc/x11/qt5-qtwebkit/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtwebkit/distinfo 2016/03/15 00:19:00 1.6
+++ pkgsrc/x11/qt5-qtwebkit/distinfo 2016/03/18 07:37:38 1.7
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: distinfo,v 1.6 2016/03/15 00:19:00 tnn Exp $ 1$NetBSD: distinfo,v 1.7 2016/03/18 07:37:38 dbj Exp $
2 2
3SHA1 (qtwebkit-opensource-src-5.5.1.tar.xz) = e1e16f3eb48c1ce863b9ab33364e4ac178ae51a7 3SHA1 (qtwebkit-opensource-src-5.5.1.tar.xz) = e1e16f3eb48c1ce863b9ab33364e4ac178ae51a7
4RMD160 (qtwebkit-opensource-src-5.5.1.tar.xz) = 0594ec1150f7899d72f57d8ff2f108f3f75faaf9 4RMD160 (qtwebkit-opensource-src-5.5.1.tar.xz) = 0594ec1150f7899d72f57d8ff2f108f3f75faaf9
5SHA512 (qtwebkit-opensource-src-5.5.1.tar.xz) = a44ca088fee7dbf0b10df7e1f6c914f37b31cf7c3b95156c32e5b8373a8de54013cd51cdf5b18b72f165d60c21ce55bceca86b038de68b1eb78ae0cd4bb8228a 5SHA512 (qtwebkit-opensource-src-5.5.1.tar.xz) = a44ca088fee7dbf0b10df7e1f6c914f37b31cf7c3b95156c32e5b8373a8de54013cd51cdf5b18b72f165d60c21ce55bceca86b038de68b1eb78ae0cd4bb8228a
6Size (qtwebkit-opensource-src-5.5.1.tar.xz) = 33489924 bytes 6Size (qtwebkit-opensource-src-5.5.1.tar.xz) = 33489924 bytes
7SHA1 (patch-Source_JavaScriptCore_API_ObjCCallbackFunction.h) = be77c4b19f5f97c12180c1b7d3b72968364f3229 7SHA1 (patch-Source_JavaScriptCore_API_ObjCCallbackFunction.h) = be77c4b19f5f97c12180c1b7d3b72968364f3229
8SHA1 (patch-Source_JavaScriptCore_DerivedSources.pri) = b7a81c85257ddebd7bdff546a6d6720c9a2c5b56 8SHA1 (patch-Source_JavaScriptCore_DerivedSources.pri) = b7a81c85257ddebd7bdff546a6d6720c9a2c5b56
9SHA1 (patch-Source_JavaScriptCore_JavaScriptCore.pri) = ccf64d0df1c61ff5c31c000636f3b64460562314 9SHA1 (patch-Source_JavaScriptCore_JavaScriptCore.pri) = ccf64d0df1c61ff5c31c000636f3b64460562314
10SHA1 (patch-Source_JavaScriptCore_Target.pri) = 2635cb0b9193fcf2ad55f01099341f4e140ab19b 10SHA1 (patch-Source_JavaScriptCore_Target.pri) = 2635cb0b9193fcf2ad55f01099341f4e140ab19b
11SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = a6cfdbced0bb528f47e4c0279ca03898780578cb 11SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = a6cfdbced0bb528f47e4c0279ca03898780578cb
12SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 2ed23192d9a4ec2c0f7b7b9a48bed664adbc7fb3 12SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 2ed23192d9a4ec2c0f7b7b9a48bed664adbc7fb3
13SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = cf39645a9b61299bb7b5b700a4cf2af68aa2f9f6 13SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = cf39645a9b61299bb7b5b700a4cf2af68aa2f9f6
14SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 09bfdb6e63b835fb50611289d4a1c50cd18c9e37 14SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 09bfdb6e63b835fb50611289d4a1c50cd18c9e37
15SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 6dbdaf1aad0fbbe39f8a3e5fb48be38e3ac67aa8 15SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = da6e2627337be1d6a4692697f23381b1bc80d08a
16SHA1 (patch-Source_QtWebKit.pro) = cfa9b6a36ce63f7655a164bbc696db2c0a44d288 16SHA1 (patch-Source_QtWebKit.pro) = cfa9b6a36ce63f7655a164bbc696db2c0a44d288
17SHA1 (patch-Source_ThirdParty_ANGLE_Target.pri) = 33473cbae5e2f835b0cea6cfd5fe50f031bea60c 17SHA1 (patch-Source_ThirdParty_ANGLE_Target.pri) = 33473cbae5e2f835b0cea6cfd5fe50f031bea60c
18SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y) = 875cfb3a98b943a78bf87e91d724d067b5bd2523 18SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_glslang.y) = 875cfb3a98b943a78bf87e91d724d067b5bd2523
19SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_osinclude.h) = a09b19f661c17a65f733a08822199b28eb51aed9 19SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_osinclude.h) = a09b19f661c17a65f733a08822199b28eb51aed9
20SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = 1e4b8cffbd7ec0a6130a0ec2112023bed5c0b78e 20SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = 1e4b8cffbd7ec0a6130a0ec2112023bed5c0b78e
21SHA1 (patch-Source_ThirdParty_leveldb_Target.pri) = c202d901a2af5e9efdf2357c1e062f58c8db321d 21SHA1 (patch-Source_ThirdParty_leveldb_Target.pri) = c202d901a2af5e9efdf2357c1e062f58c8db321d
22SHA1 (patch-Source_WTF_WTF.pro) = 06883057a69fb95142cf33615a800cd532528e3e 22SHA1 (patch-Source_WTF_WTF.pro) = 06883057a69fb95142cf33615a800cd532528e3e
23SHA1 (patch-Source_WTF_wtf_Assertions.cpp) = 9146f5c8a44563328194470e3f1f4ec5150fbe93 23SHA1 (patch-Source_WTF_wtf_Assertions.cpp) = 9146f5c8a44563328194470e3f1f4ec5150fbe93
24SHA1 (patch-Source_WTF_wtf_InlineASM.h) = 64ea54605fbe787be57f7423e33802def66d6432 24SHA1 (patch-Source_WTF_wtf_InlineASM.h) = 64ea54605fbe787be57f7423e33802def66d6432
25SHA1 (patch-Source_WTF_wtf_NumberOfCores.cpp) = 5f80234f0bc8a66b2f1b4824a8b79b402e707491 25SHA1 (patch-Source_WTF_wtf_NumberOfCores.cpp) = 5f80234f0bc8a66b2f1b4824a8b79b402e707491
26SHA1 (patch-Source_WTF_wtf_Platform.h) = d44960e5a5d171e815f973999c29d88a785cb3d7 26SHA1 (patch-Source_WTF_wtf_Platform.h) = d44960e5a5d171e815f973999c29d88a785cb3d7
27SHA1 (patch-Source_WTF_wtf_RAMSize.cpp) = 1c5a9c0aaffdec25cea74b010b9bc8922593b1af 27SHA1 (patch-Source_WTF_wtf_RAMSize.cpp) = 1c5a9c0aaffdec25cea74b010b9bc8922593b1af
28SHA1 (patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp) = 249308d00b18a8b89e9787f440341e77a1927531 28SHA1 (patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp) = 249308d00b18a8b89e9787f440341e77a1927531
cvs diff -r1.2 -r1.3 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp 2016/03/15 00:19:00 1.2
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_tools_CodeProfiling.cpp 2016/03/18 07:37:38 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-Source_JavaScriptCore_tools_CodeProfiling.cpp,v 1.2 2016/03/15 00:19:00 tnn Exp $ 1$NetBSD: patch-Source_JavaScriptCore_tools_CodeProfiling.cpp,v 1.3 2016/03/18 07:37:38 dbj Exp $
2 2
3* Add NetBSD support 3* Add NetBSD support
4 4
5--- Source/JavaScriptCore/tools/CodeProfiling.cpp.orig 2015-10-13 04:37:12.000000000 +0000 5--- Source/JavaScriptCore/tools/CodeProfiling.cpp.orig 2015-10-13 04:37:12.000000000 +0000
6+++ Source/JavaScriptCore/tools/CodeProfiling.cpp 6+++ Source/JavaScriptCore/tools/CodeProfiling.cpp
7@@ -33,7 +33,7 @@ 7@@ -33,7 +33,7 @@
8 #include <signal.h> 8 #include <signal.h>
9 #endif 9 #endif
10  10
11-#if OS(LINUX) 11-#if OS(LINUX)
12+#if OS(LINUX) || OS(NETBSD) 12+#if OS(LINUX) || OS(NETBSD)
13 #include <sys/time.h> 13 #include <sys/time.h>
14 #endif 14 #endif
@@ -16,27 +16,27 @@ $NetBSD: patch-Source_JavaScriptCore_too @@ -16,27 +16,27 @@ $NetBSD: patch-Source_JavaScriptCore_too
16@@ -48,7 +48,7 @@ WTF::MetaAllocatorTracker* CodeProfiling 16@@ -48,7 +48,7 @@ WTF::MetaAllocatorTracker* CodeProfiling
17 #pragma clang diagnostic ignored "-Wmissing-noreturn" 17 #pragma clang diagnostic ignored "-Wmissing-noreturn"
18 #endif 18 #endif
19  19
20-#if (PLATFORM(MAC) && CPU(X86_64)) || (OS(LINUX) && CPU(X86) && !OS(ANDROID)) 20-#if (PLATFORM(MAC) && CPU(X86_64)) || (OS(LINUX) && CPU(X86) && !OS(ANDROID))
21+#if (PLATFORM(MAC) && CPU(X86_64)) || ((OS(LINUX) || OS(NETBSD)) && CPU(X86) && !OS(ANDROID)) 21+#if (PLATFORM(MAC) && CPU(X86_64)) || ((OS(LINUX) || OS(NETBSD)) && CPU(X86) && !OS(ANDROID))
22 // Helper function to start & stop the timer. 22 // Helper function to start & stop the timer.
23 // Presently we're using the wall-clock timer, since this seems to give the best results. 23 // Presently we're using the wall-clock timer, since this seems to give the best results.
24 static void setProfileTimer(unsigned usec) 24 static void setProfileTimer(unsigned usec)
25@@ -80,6 +80,13 @@ static void profilingTimer(int, siginfo_ 25@@ -80,6 +80,13 @@ static void profilingTimer(int, siginfo_
26 CodeProfiling::sample(reinterpret_cast<void*>(context.gregs[REG_EIP]), 26 CodeProfiling::sample(reinterpret_cast<void*>(context.gregs[REG_EIP]),
27 reinterpret_cast<void**>(context.gregs[REG_EBP])); 27 reinterpret_cast<void**>(context.gregs[REG_EBP]));
28 } 28 }
29+#elif OS(NETBSD)) && CPU(X86) 29+#elif OS(NETBSD) && CPU(X86)
30+static void profilingTimer(int, siginfo_t*, void* uap) 30+static void profilingTimer(int, siginfo_t*, void* uap)
31+{ 31+{
32+ mcontext_t context = static_cast<ucontext_t*>(uap)->uc_mcontext; 32+ mcontext_t context = static_cast<ucontext_t*>(uap)->uc_mcontext;
33+ CodeProfiling::sample(reinterpret_cast<void*>(context.__gregs[_REG_EIP]), 33+ CodeProfiling::sample(reinterpret_cast<void*>(context.__gregs[_REG_EIP]),
34+ reinterpret_cast<void**>(context.__gregs[_REG_EBP])); 34+ reinterpret_cast<void**>(context.__gregs[_REG_EBP]));
35+} 35+}
36 #endif 36 #endif
37  37
38 // Callback triggered when the timer is fired. 38 // Callback triggered when the timer is fired.
39@@ -143,7 +150,7 @@ void CodeProfiling::begin(const SourceCo 39@@ -143,7 +150,7 @@ void CodeProfiling::begin(const SourceCo
40 if (alreadyProfiling) 40 if (alreadyProfiling)
41 return; 41 return;
42  42