Fri Dec 30 20:19:10 2022 UTC ()
qt5-qtwebkit: fix building on Darwin; cleanups


(adam)
diff -r1.100 -r1.101 pkgsrc/x11/qt5-qtwebkit/Makefile
diff -r1.7 -r1.8 pkgsrc/x11/qt5-qtwebkit/PLIST
diff -r1.28 -r1.29 pkgsrc/x11/qt5-qtwebkit/distinfo
diff -r0 -r1.1 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_jsc.cpp
diff -r0 -r1.1 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_declarative_CMakeLists.txt
diff -r0 -r1.1 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_declarative_experimental_CMakeLists.txt
diff -r0 -r1.1 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_WebKitMacros.cmake
cvs diff -r1.100 -r1.101 pkgsrc/x11/qt5-qtwebkit/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtwebkit/Makefile 2022/11/28 19:16:13 1.100
+++ pkgsrc/x11/qt5-qtwebkit/Makefile 2022/12/30 20:19:10 1.101
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.100 2022/11/28 19:16:13 jperkin Exp $ 1# $NetBSD: Makefile,v 1.101 2022/12/30 20:19:10 adam Exp $
2 2
3QTWKVERSION= 5.212.0-alpha4 3QTWKVERSION= 5.212.0-alpha4
4DISTNAME= qtwebkit-${QTWKVERSION} 4DISTNAME= qtwebkit-${QTWKVERSION}
5PKGNAME= qt5-qtwebkit-${QTWKVERSION:S/-/./} 5PKGNAME= qt5-qtwebkit-${QTWKVERSION:S/-/./}
6PKGREVISION= 12 6PKGREVISION= 12
7CATEGORIES= x11 www 7CATEGORIES= x11 www
8MASTER_SITES= ${MASTER_SITE_GITHUB:=qtwebkit/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=qtwebkit/}
9GITHUB_PROJECT= qtwebkit 9GITHUB_PROJECT= qtwebkit
10GITHUB_RELEASE= ${DISTNAME} 10GITHUB_RELEASE= ${DISTNAME}
11EXTRACT_SUFX= .tar.xz 11EXTRACT_SUFX= .tar.xz
12 12
13MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= https://github.com/qtwebkit/qtwebkit/wiki 14HOMEPAGE= https://github.com/qtwebkit/qtwebkit/wiki
@@ -25,102 +25,105 @@ USE_TOOLS+= perl:build pkg-config bison @@ -25,102 +25,105 @@ USE_TOOLS+= perl:build pkg-config bison
25USE_CMAKE= yes 25USE_CMAKE= yes
26CMAKE_ARG_PATH= .. 26CMAKE_ARG_PATH= ..
27CONFIGURE_DIRS= _build 27CONFIGURE_DIRS= _build
28CMAKE_INSTALL_PREFIX= ${PREFIX}/qt5 28CMAKE_INSTALL_PREFIX= ${PREFIX}/qt5
29TEST_TARGET= test 29TEST_TARGET= test
30 30
31CMAKE_ARGS+= -DPORT=Qt 31CMAKE_ARGS+= -DPORT=Qt
32CMAKE_ARGS+= -DENABLE_TOOLS=OFF 32CMAKE_ARGS+= -DENABLE_TOOLS=OFF
33CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release 33CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release
34CMAKE_ARGS+= -DSHARED_CORE:BOOL=ON 34CMAKE_ARGS+= -DSHARED_CORE:BOOL=ON
35CMAKE_ARGS+= -DUSE_SYSTEM_MALLOC:BOOL=ON 35CMAKE_ARGS+= -DUSE_SYSTEM_MALLOC:BOOL=ON
36CMAKE_ARGS+= -DUSE_LD_GOLD:BOOL=OFF 36CMAKE_ARGS+= -DUSE_LD_GOLD:BOOL=OFF
37CMAKE_ARGS+= -DENABLE_API_TESTS=OFF 37CMAKE_ARGS+= -DENABLE_API_TESTS=OFF
38 38CMAKE_ARGS+= -DMACOS_BUILD_FRAMEWORKS=OFF
 39CMAKE_ARGS+= -DMACOS_USE_SYSTEM_ICU=OFF
 40CMAKE_ARGS+= -DMACOS_FORCE_SYSTEM_XML_LIBRARIES=OFF
39CMAKE_ARGS+= -DKDE_INSTALL_LIBEXECDIR=${CMAKE_INSTALL_PREFIX}/libexec 41CMAKE_ARGS+= -DKDE_INSTALL_LIBEXECDIR=${CMAKE_INSTALL_PREFIX}/libexec
40#CMAKE_ARGS+= -DLIBEXEC_INSTALL_DIR=${CMAKE_INSTALL_PREFIX}/libexec 
41 42
42UNLIMIT_RESOURCES+= cputime 43UNLIMIT_RESOURCES+= cputime
43 44
44GCC_REQD+= 4.9 45GCC_REQD+= 4.9
45 46
46pre-configure: 47pre-configure:
47 ${MKDIR} ${WRKSRC}/_build 48 ${MKDIR} ${WRKSRC}/_build
48 49
49# wcstof(3) etc. is used in C++ code. 50# wcstof(3) etc. is used in C++ code.
50CFLAGS.NetBSD+= -D_NETBSD_SOURCE 51CFLAGS.NetBSD+= -D_NETBSD_SOURCE
51 52
52# temporary fix for GLib 2.68 breakage 53# temporary fix for GLib 2.68 breakage
53# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1963 54# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1963
54CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66 55CXXFLAGS+= -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_66
55 56
56## for GL_GLEXT_LEGACY with GL/gl.h error, GL_ARB_shader_objects is not defined. 
57#BUILDLINK_TRANSFORM+= rm:-Wundef 
58 
59# avoid creating a .qt directory in the users home directory 57# avoid creating a .qt directory in the users home directory
60SCRIPTS_ENV+= HOME=${WRKDIR} 58SCRIPTS_ENV+= HOME=${WRKDIR}
61 59
62REPLACE_PERL+= Source/WebKit2/Scripts/generate-forwarding-headers.pl 60REPLACE_PERL+= Source/WebKit2/Scripts/generate-forwarding-headers.pl
63 61
64#MAKE_ENV+= QTDIR=${QTDIR} 
65INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 62INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
66INSTALLATION_DIRS+= lib/pkgconfig 63INSTALLATION_DIRS+= lib/pkgconfig
67 64
68.include "../../mk/bsd.prefs.mk" 65.include "../../mk/bsd.prefs.mk"
69 66
70.if ${_USE_CWRAPPERS} == "yes" 67.if ${_USE_CWRAPPERS} == "yes"
71BUILDLINK_TRANSFORM+= R:${WRKSRC}/lib:${QTDIR}/lib 68BUILDLINK_TRANSFORM+= R:${WRKSRC}/lib:${QTDIR}/lib
72.else 69.else
73BUILDLINK_TRANSFORM+= rpath:${WRKSRC}/lib:${QTDIR}/lib 70BUILDLINK_TRANSFORM+= rpath:${WRKSRC}/lib:${QTDIR}/lib
74.endif 71.endif
75 72
76BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--gc-sections 73BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--gc-sections
77 74
78.if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:M*arm*) 75.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH:M*arm*}
79LDFLAGS+= -Wl,--no-keep-memory 76LDFLAGS+= -Wl,--no-keep-memory
80.endif 77.endif
81 78
82.if ${OPSYS} == "SunOS" 79.if ${OPSYS} == "SunOS"
83CMAKE_ARGS+= -DUSE_LINKER_VERSION_SCRIPT=OFF 80CMAKE_ARGS+= -DUSE_LINKER_VERSION_SCRIPT=OFF
84LDFLAGS+= -lsocket -lnsl 81LDFLAGS+= -lsocket -lnsl
85.endif 82.endif
86 83
87# JavaScriptCore requires at least MIPS32. 84# JavaScriptCore requires at least MIPS32.
88.if !empty(MACHINE_ARCH:Mmips64*) 85.if ${MACHINE_ARCH:Mmips64*}
89CFLAGS+= -march=mips64 86CFLAGS+= -march=mips64
90.elif !empty(MACHINE_ARCH:Mmips*) 87.elif ${MACHINE_ARCH:Mmips*}
91CFLAGS+= -march=mips32 88CFLAGS+= -march=mips32
92.endif 89.endif
93 90
94post-install: 91post-install:
95.for i in Qt5WebKit.pc Qt5WebKitWidgets.pc 92.for i in Qt5WebKit.pc Qt5WebKitWidgets.pc
96 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \ 93 cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
97 ln -f -s ${QTDIR}/lib/pkgconfig/${i} ${i} 94 ln -f -s ${QTDIR}/lib/pkgconfig/${i} ${i}
98.endfor 95.endfor
99 96
 97# Not supported on Win and Mac.
 98# See comment in Source/WebKit2/PlatformQt.cmake
 99PLIST_VARS+= npapi
 100
100.include "../../databases/sqlite3/buildlink3.mk" 101.include "../../databases/sqlite3/buildlink3.mk"
101.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD" 102.if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
102.include "../../devel/libexecinfo/buildlink3.mk" 103.include "../../devel/libexecinfo/buildlink3.mk"
103.endif 104.endif
104.include "../../fonts/woff2/buildlink3.mk" 105.include "../../fonts/woff2/buildlink3.mk"
105.include "../../graphics/libwebp/buildlink3.mk" 106.include "../../graphics/libwebp/buildlink3.mk"
106.include "../../textproc/hyphen/buildlink3.mk" 107.include "../../textproc/hyphen/buildlink3.mk"
107.include "../../textproc/icu/buildlink3.mk" 108.include "../../textproc/icu/buildlink3.mk"
108.include "../../textproc/libxslt/buildlink3.mk" 109.include "../../textproc/libxslt/buildlink3.mk"
109.if ${OPSYS} != "Darwin" 110.if ${OPSYS} != "Darwin"
110.include "../../multimedia/gst-plugins1-base/buildlink3.mk" 111.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
111.include "../../multimedia/gst-plugins1-bad/buildlink3.mk" 112.include "../../multimedia/gst-plugins1-bad/buildlink3.mk"
112.include "../../x11/libXcomposite/buildlink3.mk" 113.include "../../x11/libXcomposite/buildlink3.mk"
 114PLIST.npapi= yes
113.endif 115.endif
114.include "../../x11/qt5-qtdeclarative/buildlink3.mk" 116.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
115.include "../../x11/qt5-qtlocation/buildlink3.mk" 117.include "../../x11/qt5-qtlocation/buildlink3.mk"
 118.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
116.include "../../x11/qt5-qtsensors/buildlink3.mk" 119.include "../../x11/qt5-qtsensors/buildlink3.mk"
117.include "../../x11/qt5-qtwebchannel/buildlink3.mk" 120.include "../../x11/qt5-qtwebchannel/buildlink3.mk"
118PYTHON_FOR_BUILD_ONLY= tool 121PYTHON_FOR_BUILD_ONLY= tool
119.include "../../lang/python/tool.mk" 122.include "../../lang/python/tool.mk"
120.include "../../lang/ruby/buildlink3.mk" 123.include "../../lang/ruby/buildlink3.mk"
121BUILDLINK_DEPMETHOD.${RUBY_BASE}= build 124BUILDLINK_DEPMETHOD.${RUBY_BASE}= build
122.include "../../mk/curses.buildlink3.mk" 125.include "../../mk/curses.buildlink3.mk"
123.include "../../mk/dlopen.buildlink3.mk" 126.include "../../mk/dlopen.buildlink3.mk"
124BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} 127BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}
125.include "../../mk/atomic64.mk" 128.include "../../mk/atomic64.mk"
126.include "../../mk/bsd.pkg.mk" 129.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/x11/qt5-qtwebkit/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtwebkit/PLIST 2020/03/21 19:42:36 1.7
+++ pkgsrc/x11/qt5-qtwebkit/PLIST 2022/12/30 20:19:10 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.7 2020/03/21 19:42:36 nia Exp $ 1@comment $NetBSD: PLIST,v 1.8 2022/12/30 20:19:10 adam Exp $
2lib/pkgconfig/Qt5WebKit.pc 2lib/pkgconfig/Qt5WebKit.pc
3lib/pkgconfig/Qt5WebKitWidgets.pc 3lib/pkgconfig/Qt5WebKitWidgets.pc
4qt5/include/QtWebKit/5.212.0/QtWebKit/private/qhttpheader_p.h 4qt5/include/QtWebKit/5.212.0/QtWebKit/private/qhttpheader_p.h
5qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquicknetworkreply_p.h 5qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquicknetworkreply_p.h
6qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquicknetworkrequest_p.h 6qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquicknetworkrequest_p.h
7qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquickurlschemedelegate_p.h 7qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquickurlschemedelegate_p.h
8qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquickwebpage_p.h 8qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquickwebpage_p.h
9qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquickwebpage_p_p.h 9qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquickwebpage_p_p.h
10qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquickwebview_p.h 10qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquickwebview_p.h
11qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquickwebview_p_p.h 11qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquickwebview_p_p.h
12qt5/include/QtWebKit/5.212.0/QtWebKit/private/qtwebsecurityorigin_p.h 12qt5/include/QtWebKit/5.212.0/QtWebKit/private/qtwebsecurityorigin_p.h
13qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebchannelwebkittransport_p.h 13qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebchannelwebkittransport_p.h
14qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebdatabase_p.h 14qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebdatabase_p.h
@@ -79,44 +79,44 @@ qt5/include/QtWebKitWidgets/qtwebkitwidg @@ -79,44 +79,44 @@ qt5/include/QtWebKitWidgets/qtwebkitwidg
79qt5/include/QtWebKitWidgets/qwebframe.h 79qt5/include/QtWebKitWidgets/qwebframe.h
80qt5/include/QtWebKitWidgets/qwebinspector.h 80qt5/include/QtWebKitWidgets/qwebinspector.h
81qt5/include/QtWebKitWidgets/qwebpage.h 81qt5/include/QtWebKitWidgets/qwebpage.h
82qt5/include/QtWebKitWidgets/qwebview.h 82qt5/include/QtWebKitWidgets/qwebview.h
83qt5/lib/cmake/Qt5WebKit/Qt5WebKitConfig.cmake 83qt5/lib/cmake/Qt5WebKit/Qt5WebKitConfig.cmake
84qt5/lib/cmake/Qt5WebKit/Qt5WebKitConfigVersion.cmake 84qt5/lib/cmake/Qt5WebKit/Qt5WebKitConfigVersion.cmake
85qt5/lib/cmake/Qt5WebKit/WebKitTargets-release.cmake 85qt5/lib/cmake/Qt5WebKit/WebKitTargets-release.cmake
86qt5/lib/cmake/Qt5WebKit/WebKitTargets.cmake 86qt5/lib/cmake/Qt5WebKit/WebKitTargets.cmake
87qt5/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfig.cmake 87qt5/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfig.cmake
88qt5/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfigVersion.cmake 88qt5/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfigVersion.cmake
89qt5/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets-release.cmake 89qt5/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets-release.cmake
90qt5/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets.cmake 90qt5/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets.cmake
91qt5/lib/libANGLESupport.a 91qt5/lib/libANGLESupport.a
92qt5/lib/libJavaScriptCore.${RUBY_DLEXT} 92qt5/lib/libJavaScriptCore.so
93qt5/lib/libJavaScriptCore.so.5 93qt5/lib/libJavaScriptCore.so.5
94qt5/lib/libJavaScriptCore.so.5.212.0 94qt5/lib/libJavaScriptCore.so.5.212.0
95qt5/lib/libQt5WebKit.${RUBY_DLEXT} 95qt5/lib/libQt5WebKit.so
96qt5/lib/libQt5WebKit.so.5 96qt5/lib/libQt5WebKit.so.5
97qt5/lib/libQt5WebKit.so.5.212.0 97qt5/lib/libQt5WebKit.so.5.212.0
98qt5/lib/libQt5WebKitWidgets.${RUBY_DLEXT} 98qt5/lib/libQt5WebKitWidgets.so
99qt5/lib/libQt5WebKitWidgets.so.5 99qt5/lib/libQt5WebKitWidgets.so.5
100qt5/lib/libQt5WebKitWidgets.so.5.212.0 100qt5/lib/libQt5WebKitWidgets.so.5.212.0
101qt5/lib/libWTF.${RUBY_DLEXT} 101qt5/lib/libWTF.so
102qt5/lib/libWebCore.${RUBY_DLEXT} 102qt5/lib/libWebCore.so
103qt5/lib/libWebCore.so.5 103qt5/lib/libWebCore.so.5
104qt5/lib/libWebCore.so.5.212.0 104qt5/lib/libWebCore.so.5.212.0
105qt5/lib/libWebKit2.${RUBY_DLEXT} 105qt5/lib/libWebKit2.so
106qt5/lib/libWebKit2.so.5 106qt5/lib/libWebKit2.so.5
107qt5/lib/libWebKit2.so.5.212.0 107qt5/lib/libWebKit2.so.5.212.0
108qt5/lib/pkgconfig/Qt5WebKit.pc 108qt5/lib/pkgconfig/Qt5WebKit.pc
109qt5/lib/pkgconfig/Qt5WebKitWidgets.pc 109qt5/lib/pkgconfig/Qt5WebKitWidgets.pc
110qt5/libexec/QtWebNetworkProcess 110qt5/libexec/QtWebNetworkProcess
111qt5/libexec/QtWebPluginProcess 111${PLIST.npapi}qt5/libexec/QtWebPluginProcess
112qt5/libexec/QtWebProcess 112qt5/libexec/QtWebProcess
113qt5/libexec/QtWebStorageProcess 113qt5/libexec/QtWebStorageProcess
114qt5/mkspecs/modules/qt_lib_webkit.pri 114qt5/mkspecs/modules/qt_lib_webkit.pri
115qt5/mkspecs/modules/qt_lib_webkit_private.pri 115qt5/mkspecs/modules/qt_lib_webkit_private.pri
116qt5/mkspecs/modules/qt_lib_webkitwidgets.pri 116qt5/mkspecs/modules/qt_lib_webkitwidgets.pri
117qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri 117qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri
118qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.${RUBY_DLEXT} 118qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so
119qt5/qml/QtWebKit/experimental/qmldir 119qt5/qml/QtWebKit/experimental/qmldir
120qt5/qml/QtWebKit/libqmlwebkitplugin.${RUBY_DLEXT} 120qt5/qml/QtWebKit/libqmlwebkitplugin.so
121qt5/qml/QtWebKit/plugins.qmltypes 121qt5/qml/QtWebKit/plugins.qmltypes
122qt5/qml/QtWebKit/qmldir 122qt5/qml/QtWebKit/qmldir
cvs diff -r1.28 -r1.29 pkgsrc/x11/qt5-qtwebkit/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtwebkit/distinfo 2022/04/25 02:45:44 1.28
+++ pkgsrc/x11/qt5-qtwebkit/distinfo 2022/12/30 20:19:10 1.29
@@ -1,35 +1,39 @@ @@ -1,35 +1,39 @@
1$NetBSD: distinfo,v 1.28 2022/04/25 02:45:44 markd Exp $ 1$NetBSD: distinfo,v 1.29 2022/12/30 20:19:10 adam Exp $
2 2
3BLAKE2s (qtwebkit-5.212.0-alpha4.tar.xz) = 20858db08c7d297037d3ced34e441d4b657325c406b475e4e76dd367dc9c500c 3BLAKE2s (qtwebkit-5.212.0-alpha4.tar.xz) = 20858db08c7d297037d3ced34e441d4b657325c406b475e4e76dd367dc9c500c
4SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6 4SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
5Size (qtwebkit-5.212.0-alpha4.tar.xz) = 12528508 bytes 5Size (qtwebkit-5.212.0-alpha4.tar.xz) = 12528508 bytes
6SHA1 (patch-CMakeLists.txt) = 6b0d295ed4ec40c6364b0a86c94d19966977f7d7 6SHA1 (patch-CMakeLists.txt) = 6b0d295ed4ec40c6364b0a86c94d19966977f7d7
7SHA1 (patch-Source_JavaScriptCore_API_ObjCCallbackFunction.h) = be77c4b19f5f97c12180c1b7d3b72968364f3229 7SHA1 (patch-Source_JavaScriptCore_API_ObjCCallbackFunction.h) = be77c4b19f5f97c12180c1b7d3b72968364f3229
8SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 8b502d6960e5b52000dd6e67f65c2fbaf6e9d1f2 8SHA1 (patch-Source_JavaScriptCore_assembler_ARM64Assembler.h) = 8b502d6960e5b52000dd6e67f65c2fbaf6e9d1f2
9SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 7bbb0a59a0c087abaaddda08fc31aa24809acb70 9SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 7bbb0a59a0c087abaaddda08fc31aa24809acb70
10SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = d3ed3a25085752598dc04582eb80636c9cc6eaa9 10SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = d3ed3a25085752598dc04582eb80636c9cc6eaa9
11SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = a3eba122c7226a80dacf1b762747fe0a7408b849 11SHA1 (patch-Source_JavaScriptCore_dfg_DFGNode.h) = a3eba122c7226a80dacf1b762747fe0a7408b849
12SHA1 (patch-Source_JavaScriptCore_generate-bytecode-files) = b58ca94781fcf7b9f6a3eba715af2784e7a0acc0 12SHA1 (patch-Source_JavaScriptCore_generate-bytecode-files) = b58ca94781fcf7b9f6a3eba715af2784e7a0acc0
13SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 2b7dba0d0e87ed96c4d7de6ddb5833209cfe51b5 13SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 2b7dba0d0e87ed96c4d7de6ddb5833209cfe51b5
14SHA1 (patch-Source_JavaScriptCore_jit_ThunkGenerators.cpp) = f0ca56e4b4060c0a8d756289d7c25d1ead6b07be 14SHA1 (patch-Source_JavaScriptCore_jit_ThunkGenerators.cpp) = f0ca56e4b4060c0a8d756289d7c25d1ead6b07be
 15SHA1 (patch-Source_JavaScriptCore_jsc.cpp) = 796ce0232f1a833757b2e7ca5c910fac75f783ad
15SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 94c139413eecb875bba98c7749bba24cfcc16632 16SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 94c139413eecb875bba98c7749bba24cfcc16632
16SHA1 (patch-Source_Qt5WebKitConfig.cmake.in) = 3a1346216b20853b73abf9b1756617d1e761cb94 17SHA1 (patch-Source_Qt5WebKitConfig.cmake.in) = 3a1346216b20853b73abf9b1756617d1e761cb94
17SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = 1e4b8cffbd7ec0a6130a0ec2112023bed5c0b78e 18SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = 1e4b8cffbd7ec0a6130a0ec2112023bed5c0b78e
18SHA1 (patch-Source_WTF_wtf_Assertions.cpp) = 15b8ac40e49cfec78d46de634fd6a1edde2d2a96 19SHA1 (patch-Source_WTF_wtf_Assertions.cpp) = 15b8ac40e49cfec78d46de634fd6a1edde2d2a96
19SHA1 (patch-Source_WTF_wtf_InlineASM.h) = 7ffc086a21f645112ad10296571464a1e15b8b44 20SHA1 (patch-Source_WTF_wtf_InlineASM.h) = 7ffc086a21f645112ad10296571464a1e15b8b44
20SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 7dac41bf3e50944e49c3e3c29d482d2c3300665d 21SHA1 (patch-Source_WTF_wtf_MathExtras.h) = 7dac41bf3e50944e49c3e3c29d482d2c3300665d
21SHA1 (patch-Source_WTF_wtf_Platform.h) = 73e8b07e8d7e718abe986a12b9f0b903dfcc4765 22SHA1 (patch-Source_WTF_wtf_Platform.h) = 73e8b07e8d7e718abe986a12b9f0b903dfcc4765
22SHA1 (patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp) = bfa570aa20e3508c77bbaebed051821a33f36209 23SHA1 (patch-Source_WTF_wtf_ThreadIdentifierDataPthreads.cpp) = bfa570aa20e3508c77bbaebed051821a33f36209
23SHA1 (patch-Source_WebCore_css_makegrammar.pl) = 2f1977c925069243d76379ae6d065e850143b2e3 24SHA1 (patch-Source_WebCore_css_makegrammar.pl) = 2f1977c925069243d76379ae6d065e850143b2e3
24SHA1 (patch-Source_WebCore_page_NavigatorBase.cpp) = e8972f4b703a9ff45ce313609d2540f89064b4ff 25SHA1 (patch-Source_WebCore_page_NavigatorBase.cpp) = e8972f4b703a9ff45ce313609d2540f89064b4ff
25SHA1 (patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer.cpp) = 7bd24adde2cc0e1cbad2143fc83699d659d61045 26SHA1 (patch-Source_WebCore_platform_audio_gstreamer_AudioFileReaderGStreamer.cpp) = 7bd24adde2cc0e1cbad2143fc83699d659d61045
26SHA1 (patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp) = ec7c7533c2d5a4258170745bfc49655848d0780c 27SHA1 (patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp) = ec7c7533c2d5a4258170745bfc49655848d0780c
27SHA1 (patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h) = d1d986afd5525143fc786a959240a72167f03352 28SHA1 (patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h) = d1d986afd5525143fc786a959240a72167f03352
28SHA1 (patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h) = 838acb2d7ecf41e5f6989d98459d103f4268cdcf 29SHA1 (patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h) = 838acb2d7ecf41e5f6989d98459d103f4268cdcf
29SHA1 (patch-Source_WebCore_platform_text_TextCodecICU.cpp) = 4b3418cedac05d7f4b2fad4df09df2c7b4b46b3f 30SHA1 (patch-Source_WebCore_platform_text_TextCodecICU.cpp) = 4b3418cedac05d7f4b2fad4df09df2c7b4b46b3f
30SHA1 (patch-Source_WebCore_platform_text_icu_UTextProvider.h) = fb0885eb9db3001ddd8df90059cdb47dbfd79fe3 31SHA1 (patch-Source_WebCore_platform_text_icu_UTextProvider.h) = fb0885eb9db3001ddd8df90059cdb47dbfd79fe3
31SHA1 (patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp) = 29b414e1ae18a0786f31d80143f665d6d68bcbe3 32SHA1 (patch-Source_WebCore_platform_text_icu_UTextProviderLatin1.cpp) = 29b414e1ae18a0786f31d80143f665d6d68bcbe3
32SHA1 (patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp) = b175e1973a2019d746fda174dfc5708a3ca57d9b 33SHA1 (patch-Source_WebCore_platform_text_icu_UTextProviderUTF16.cpp) = b175e1973a2019d746fda174dfc5708a3ca57d9b
33SHA1 (patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp) = d18013d0e07d7ad7e9d84cb6ef2d418d9bba4c7e 34SHA1 (patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp) = d18013d0e07d7ad7e9d84cb6ef2d418d9bba4c7e
 35SHA1 (patch-Source_WebKit_qt_declarative_CMakeLists.txt) = bda5cb2751027aab161ae54f46b8f9103532fb13
 36SHA1 (patch-Source_WebKit_qt_declarative_experimental_CMakeLists.txt) = b95ac623f36018e3f2cc55a2988e97ef3f713159
34SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 8fb8d11c4aab36e913a560ac48acce930f074635 37SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 8fb8d11c4aab36e913a560ac48acce930f074635
35SHA1 (patch-Source_cmake_OptionsQt.cmake) = 35cc2b9904897cd2f1d540b473ce2905d95a0143 38SHA1 (patch-Source_cmake_OptionsQt.cmake) = 35cc2b9904897cd2f1d540b473ce2905d95a0143
 39SHA1 (patch-Source_cmake_WebKitMacros.cmake) = 5498b5cccf392f5d3bc370b00a72b2aa5389492d
File Added: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_JavaScriptCore_jsc.cpp
$NetBSD: patch-Source_JavaScriptCore_jsc.cpp,v 1.1 2022/12/30 20:19:10 adam Exp $

Remove ambiguity on Darwin.

--- Source/JavaScriptCore/jsc.cpp.orig	2022-12-30 08:36:58.000000000 +0000
+++ Source/JavaScriptCore/jsc.cpp
@@ -189,7 +189,7 @@ private:
 
 class ElementHandleOwner : public WeakHandleOwner {
 public:
-    bool isReachableFromOpaqueRoots(Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor) override
+    bool isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor) override
     {
         Element* element = jsCast<Element*>(handle.slot()->asCell());
         return visitor.containsOpaqueRoot(element->root());
File Added: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_declarative_CMakeLists.txt
$NetBSD: patch-Source_WebKit_qt_declarative_CMakeLists.txt,v 1.1 2022/12/30 20:19:10 adam Exp $

Link against WebKit2 library.

--- Source/WebKit/qt/declarative/CMakeLists.txt.orig	2022-12-30 10:44:44.000000000 +0000
+++ Source/WebKit/qt/declarative/CMakeLists.txt
@@ -23,7 +23,7 @@ include_directories(SYSTEM
 
 add_library(qmlwebkitplugin MODULE plugin.cpp)
 target_link_libraries(qmlwebkitplugin
-    WebKit Qt5::Quick)
+    WebKit2 Qt5::Quick)
 
 set(qmlwebkit_output_dir "${CMAKE_BINARY_DIR}/imports/QtWebKit")
 set(qmlwebkit_install_dir "${QML_INSTALL_DIR}/QtWebKit")
File Added: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_qt_declarative_experimental_CMakeLists.txt
$NetBSD: patch-Source_WebKit_qt_declarative_experimental_CMakeLists.txt,v 1.1 2022/12/30 20:19:10 adam Exp $

Link aganst WebKit2 library.

--- Source/WebKit/qt/declarative/experimental/CMakeLists.txt.orig	2022-12-30 10:46:13.000000000 +0000
+++ Source/WebKit/qt/declarative/experimental/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_library(qmlwebkitexperimentalplugin MODULE plugin.cpp)
 target_link_libraries(qmlwebkitexperimentalplugin
-    WebKit Qt5::Quick)
+    WebKit2 Qt5::Quick)
 
 set(qmlwebkitexperimental_output_dir "${CMAKE_BINARY_DIR}/imports/QtWebKit/experimental")
 set(qmlwebkitexperimental_install_dir "${QML_INSTALL_DIR}/QtWebKit/experimental")
File Added: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_WebKitMacros.cmake
$NetBSD: patch-Source_cmake_WebKitMacros.cmake,v 1.1 2022/12/30 20:19:10 adam Exp $

Don't build frameworks on Darwin.

--- Source/cmake/WebKitMacros.cmake.orig	2020-03-04 17:16:37.000000000 +0000
+++ Source/cmake/WebKitMacros.cmake
@@ -285,7 +285,7 @@ macro(WEBKIT_FRAMEWORK _target)
         add_custom_command(TARGET ${_target} POST_BUILD COMMAND ${${_target}_POST_BUILD_COMMAND} VERBATIM)
     endif ()
 
-    if (APPLE AND NOT PORT STREQUAL "GTK" AND NOT ${${_target}_LIBRARY_TYPE} MATCHES STATIC)
+    if (FALSE AND NOT PORT STREQUAL "GTK" AND NOT ${${_target}_LIBRARY_TYPE} MATCHES STATIC)
         set_target_properties(${_target} PROPERTIES FRAMEWORK TRUE)
         if (${_target}_PUBLIC_HEADERS)
             set_target_properties(${_target} PROPERTIES PUBLIC_HEADER "${${_target}_PUBLIC_HEADERS}")