CVS commit: pkgsrc/x11/qt5-qtwebkit

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Wed Aug  1 15:01:09 UTC 2018

Modified Files:
        pkgsrc/x11/qt5-qtwebkit: Makefile distinfo
        pkgsrc/x11/qt5-qtwebkit/patches: patch-Source_WTF_wtf_Platform.h
Added Files:
        pkgsrc/x11/qt5-qtwebkit/patches:
            patch-Source_JavaScriptCore_jit_ThunkGenerators.cpp

Log Message:
qtwebkit: don't disable JIT on netbsd, declare functions like linux.

this works well enough to browse javascript websites with otter-browser,
which needed paxctl +m, although I didn't try it without these changes.

XXX this package might be crashing from feeding bogus values to
posix_memalign.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/x11/qt5-qtwebkit/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/qt5-qtwebkit/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_jit_ThunkGenerators.cpp
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qtwebkit/Makefile
diff -u pkgsrc/x11/qt5-qtwebkit/Makefile:1.54 pkgsrc/x11/qt5-qtwebkit/Makefile:1.55
--- pkgsrc/x11/qt5-qtwebkit/Makefile:1.54       Fri Jul 20 03:34:01 2018
+++ pkgsrc/x11/qt5-qtwebkit/Makefile    Wed Aug  1 15:01:08 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.54 2018/07/20 03:34:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.55 2018/08/01 15:01:08 maya Exp $
 
 DISTNAME=      qtwebkit-${QTWKVERSION}
 PKGNAME=       qt5-qtwebkit-${QTWKVERSION:S/-/./}
-PKGREVISION=   7
+PKGREVISION=   8
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=annulen/}
 GITHUB_PROJECT=        webkit
 GITHUB_RELEASE=        ${DISTNAME}
@@ -28,6 +28,7 @@ USE_CMAKE=            yes
 CMAKE_ARG_PATH=                ..
 CONFIGURE_DIRS=                _build
 CMAKE_INSTALL_PREFIX=  ${PREFIX}/qt5
+TEST_TARGET=           test
 
 CMAKE_ARGS+=           -DPORT=Qt
 CMAKE_ARGS+=           -DENABLE_TOOLS=OFF

Index: pkgsrc/x11/qt5-qtwebkit/distinfo
diff -u pkgsrc/x11/qt5-qtwebkit/distinfo:1.11 pkgsrc/x11/qt5-qtwebkit/distinfo:1.12
--- pkgsrc/x11/qt5-qtwebkit/distinfo:1.11       Wed Jan 17 19:37:33 2018
+++ pkgsrc/x11/qt5-qtwebkit/distinfo    Wed Aug  1 15:01:08 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2018/01/17 19:37:33 markd Exp $
+$NetBSD: distinfo,v 1.12 2018/08/01 15:01:08 maya Exp $
 
 SHA1 (qtwebkit-5.212.0-alpha2.tar.xz) = 6a361cc3f3b7ab1d35955bafe20fbbae61bc80c8
 RMD160 (qtwebkit-5.212.0-alpha2.tar.xz) = 33c3f7c68090fa16f72950ef85c20978432cc058
@@ -9,12 +9,13 @@ SHA1 (patch-Source_JavaScriptCore_assemb
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 79b54cb1d03d976a0629fbd8ee9ac1881951ba10
 SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = a3eba122c7226a80dacf1b762747fe0a7408b849
 SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = a5815dd5794d9ffbd49e5793198a06535ad89d3c
+SHA1 (patch-Source_JavaScriptCore_jit_ThunkGenerators.cpp) = f0ca56e4b4060c0a8d756289d7c25d1ead6b07be
 SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 94c139413eecb875bba98c7749bba24cfcc16632
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = 1e4b8cffbd7ec0a6130a0ec2112023bed5c0b78e
 SHA1 (patch-Source_WTF_wtf_Assertions.cpp) = 15b8ac40e49cfec78d46de634fd6a1edde2d2a96
 SHA1 (patch-Source_WTF_wtf_InlineASM.h) = 64ea54605fbe787be57f7423e33802def66d6432
 SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 7dac41bf3e50944e49c3e3c29d482d2c3300665d
-SHA1 (patch-Source_WTF_wtf_Platform.h) = cfffb219f1d58d937ae46440aa5395aa066669e4
+SHA1 (patch-Source_WTF_wtf_Platform.h) = 73e8b07e8d7e718abe986a12b9f0b903dfcc4765
 SHA1 (patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp) = bfa570aa20e3508c77bbaebed051821a33f36209
 SHA1 (patch-Source_WebCore_page_NavigatorBase.cpp) = e8972f4b703a9ff45ce313609d2540f89064b4ff
 SHA1 (patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp) = dd409929936955ad31b8ec0902067e2f23c054a2

Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h
diff -u pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h:1.3 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h:1.4
--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h:1.3 Wed Jan 17 19:37:33 2018
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WTF_wtf_Platform.h     Wed Aug  1 15:01:08 2018
@@ -1,6 +1,5 @@
-$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.3 2018/01/17 19:37:33 markd Exp $
+$NetBSD: patch-Source_WTF_wtf_Platform.h,v 1.4 2018/08/01 15:01:08 maya Exp $
 
-* Disable JIT support for NetBSD, fix segfault of qtwebkit consumers
 * Use system's malloc for NetBSD, do not use fastmalloc from qt5,
   fix segfault of qtwebkit consumers
 
@@ -9,16 +8,6 @@ $NetBSD: patch-Source_WTF_wtf_Platform.h
 
 --- Source/WTF/wtf/Platform.h.orig     2017-06-04 20:16:06.000000000 +0000
 +++ Source/WTF/wtf/Platform.h
-@@ -36,6 +36,9 @@
-    macros, policy decision macros, and top-level port definitions. ==== */
- #define PLATFORM(WTF_FEATURE) (defined WTF_PLATFORM_##WTF_FEATURE  && WTF_PLATFORM_##WTF_FEATURE)
- 
-+#if defined(__NetBSD__)
-+#define ENABLE_JIT 0
-+#endif
- 
- /* ==== Platform adaptation macros: these describe properties of the target environment. ==== */
- 
 @@ -691,6 +694,12 @@
  #define USE_SYSTEM_MALLOC 1
  #endif

Added files:

Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_jit_ThunkGenerators.cpp
diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_jit_ThunkGenerators.cpp:1.1
--- /dev/null   Wed Aug  1 15:01:09 2018
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_jit_ThunkGenerators.cpp Wed Aug  1 15:01:08 2018
@@ -0,0 +1,33 @@
+$NetBSD: patch-Source_JavaScriptCore_jit_ThunkGenerators.cpp,v 1.1 2018/08/01 15:01:08 maya Exp $
+
+Treat netbsd as linux for JIT purposes.
+
+--- Source/JavaScriptCore/jit/ThunkGenerators.cpp.orig 2017-06-04 20:16:05.000000000 +0000
++++ Source/JavaScriptCore/jit/ThunkGenerators.cpp
+@@ -633,7 +633,7 @@ MacroAssemblerCodeRef sqrtThunkGenerator
+ enum MathThunkCallingConvention { };
+ typedef MathThunkCallingConvention(*MathThunk)(MathThunkCallingConvention);
+ 
+-#if CPU(X86_64) && COMPILER(GCC_OR_CLANG) && (OS(DARWIN) || OS(LINUX))
++#if CPU(X86_64) && COMPILER(GCC_OR_CLANG) && (OS(DARWIN) || OS(LINUX) || OS(NETBSD))
+ 
+ #define defineUnaryDoubleOpWrapper(function) \
+     asm( \
+@@ -651,7 +651,7 @@ typedef MathThunkCallingConvention(*Math
+     } \
+     static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk;
+ 
+-#elif CPU(X86) && COMPILER(GCC_OR_CLANG) && OS(LINUX) && defined(__PIC__)
++#elif CPU(X86) && COMPILER(GCC_OR_CLANG) && (OS(LINUX) || OS(NETBSD)) && defined(__PIC__)
+ #define defineUnaryDoubleOpWrapper(function) \
+     asm( \
+         ".text\n" \
+@@ -675,7 +675,7 @@ typedef MathThunkCallingConvention(*Math
+     } \
+     static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk;
+ 
+-#elif CPU(X86) && COMPILER(GCC_OR_CLANG) && (OS(DARWIN) || OS(LINUX))
++#elif CPU(X86) && COMPILER(GCC_OR_CLANG) && (OS(DARWIN) || OS(LINUX) || OS(NETBSD))
+ #define defineUnaryDoubleOpWrapper(function) \
+     asm( \
+         ".text\n" \