CVS commit: pkgsrc/x11/qt5-qtwebkit

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jul 20 18:29:33 UTC 2019

Modified Files:
        pkgsrc/x11/qt5-qtwebkit: Makefile PLIST distinfo
        pkgsrc/x11/qt5-qtwebkit/patches: patch-Source_cmake_OptionsQt.cmake
Removed Files:
        pkgsrc/x11/qt5-qtwebkit/patches: patch-Source_WebKit_PlatformQt.cmake

Log Message:
qt5-qtwebkit: Update to 5.212.0 Alpha 3

WARNING: This release is based on an old WebKit revision with known
unpatched vulnerabilities. Please use it carefully and avoid visiting
untrusted websites and using it for transmission of sensitive data. Wait
for a new release from the qtwebkit-dev branch to use it with untrusted
content.

This release contains a lot of bug and security fixes, as well as support
for modern OS versions.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/x11/qt5-qtwebkit/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/qt5-qtwebkit/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/x11/qt5-qtwebkit/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_WebKit_PlatformQt.cmake
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsQt.cmake

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.62 pkgsrc/x11/qt5-qtwebkit/Makefile:1.63
--- pkgsrc/x11/qt5-qtwebkit/Makefile:1.62       Fri Jun 14 23:10:54 2019
+++ pkgsrc/x11/qt5-qtwebkit/Makefile    Sat Jul 20 18:29:33 2019
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.62 2019/06/14 23:10:54 gutteridge Exp $
+# $NetBSD: Makefile,v 1.63 2019/07/20 18:29:33 nia Exp $
 
 DISTNAME=      qtwebkit-${QTWKVERSION}
 PKGNAME=       qt5-qtwebkit-${QTWKVERSION:S/-/./}
-PKGREVISION=   14
-MASTER_SITES=  ${MASTER_SITE_GITHUB:=annulen/}
-GITHUB_PROJECT=        webkit
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=qtwebkit/}
+GITHUB_PROJECT=        qtwebkit
 GITHUB_RELEASE=        ${DISTNAME}
 CATEGORIES=    x11
 
@@ -14,11 +13,7 @@ COMMENT=     Qt5 WebView module
 LICENSE=       gnu-lgpl-v2.1 AND gnu-gpl-v3
 EXTRACT_SUFX=  .tar.xz
 
-QTWKVERSION=   5.212.0-alpha2
-
-PATCHFILES=            0325d51c4a2a05fb.patch 6c7b0f61c12d28cc.patch
-PATCH_SITES=           https://github.com/annulen/webkit/commit/
-PATCH_DIST_STRIP=      -p1
+QTWKVERSION=   5.212.0-alpha3
 
 PYTHON_VERSIONS_ACCEPTED=      27 # as of 5.212.0-alpha2
 
@@ -39,11 +34,6 @@ CMAKE_ARGS+=         -DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=           -DSHARED_CORE:BOOL=ON
 CMAKE_ARGS+=           -DUSE_SYSTEM_MALLOC:BOOL=ON
 CMAKE_ARGS+=           -DUSE_LD_GOLD:BOOL=OFF
-## requires gcc >= 4.9
-#CMAKE_ARGS+=          -DENABLE_FTL_JIT:BOOL=OFF
-#CMAKE_ARGS+=          -DENABLE_INDEXED_DATABASE:BOOL=OFF
-## needs JIT and ASSEMBLER
-CMAKE_ARGS+=           -DENABLE_SAMPLING_PROFILER:BOOL=OFF
 
 CMAKE_ARGS+=           -DKDE_INSTALL_LIBEXECDIR=${CMAKE_INSTALL_PREFIX}/libexec
 #CMAKE_ARGS+=          -DLIBEXEC_INSTALL_DIR=${CMAKE_INSTALL_PREFIX}/libexec
@@ -108,6 +98,8 @@ post-install:
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .if ${OPSYS} != "Darwin"
+# https://github.com/GStreamer/gst-plugins-bad/commit/b9e15fddb14b2cde6470255794ef130523885e9f
+BUILDLINK_API_DEPENDS.gst-plugins1-base+=      gst-plugins1-base>=1.15.1
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 .endif

Index: pkgsrc/x11/qt5-qtwebkit/PLIST
diff -u pkgsrc/x11/qt5-qtwebkit/PLIST:1.5 pkgsrc/x11/qt5-qtwebkit/PLIST:1.6
--- pkgsrc/x11/qt5-qtwebkit/PLIST:1.5   Wed Jan 17 19:37:33 2018
+++ pkgsrc/x11/qt5-qtwebkit/PLIST       Sat Jul 20 18:29:33 2019
@@ -1,11 +1,31 @@
-@comment $NetBSD: PLIST,v 1.5 2018/01/17 19:37:33 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/07/20 18:29:33 nia Exp $
 lib/pkgconfig/Qt5WebKit.pc
 lib/pkgconfig/Qt5WebKitWidgets.pc
 qt5/include/QtWebKit/5.212.0/QtWebKit/private/qhttpheader_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquicknetworkreply_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquicknetworkrequest_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquickurlschemedelegate_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquickwebpage_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquickwebpage_p_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquickwebview_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qquickwebview_p_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qtwebsecurityorigin_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebchannelwebkittransport_p.h
 qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebdatabase_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebdownloaditem_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebdownloaditem_p_p.h
 qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebelement_p.h
 qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebhistory_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebiconimageprovider_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebkittest_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebloadrequest_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebnavigationhistory_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebnavigationhistory_p_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebnavigationrequest_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebpermissionrequest_p.h
 qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebplugindatabase_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebpreferences_p.h
+qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebpreferences_p_p.h
 qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebscriptworld_p.h
 qt5/include/QtWebKit/5.212.0/QtWebKit/private/qwebsecurityorigin_p.h
 qt5/include/QtWebKit/QWebDatabase
@@ -69,34 +89,36 @@ qt5/lib/cmake/Qt5WebKitWidgets/Qt5WebKit
 qt5/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets-release.cmake
 qt5/lib/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsTargets.cmake
 qt5/lib/libANGLESupport.a
-qt5/lib/libJavaScriptCore.so
+qt5/lib/libJavaScriptCore.${RUBY_DLEXT}
 qt5/lib/libJavaScriptCore.so.5
 qt5/lib/libJavaScriptCore.so.5.212.0
-qt5/lib/libQt5WebKit.so
+qt5/lib/libQt5WebKit.${RUBY_DLEXT}
 qt5/lib/libQt5WebKit.so.5
 qt5/lib/libQt5WebKit.so.5.212.0
-qt5/lib/libQt5WebKitWidgets.so
+qt5/lib/libQt5WebKitWidgets.${RUBY_DLEXT}
 qt5/lib/libQt5WebKitWidgets.so.5
 qt5/lib/libQt5WebKitWidgets.so.5.212.0
-qt5/lib/libWTF.so
-qt5/lib/libWebCore.so
+qt5/lib/libWTF.${RUBY_DLEXT}
+qt5/lib/libWebCore.${RUBY_DLEXT}
 qt5/lib/libWebCore.so.5
 qt5/lib/libWebCore.so.5.212.0
-qt5/lib/libWebKit2.so
+qt5/lib/libWebKit2.${RUBY_DLEXT}
 qt5/lib/libWebKit2.so.5
 qt5/lib/libWebKit2.so.5.212.0
 qt5/lib/libbrotli.a
 qt5/lib/libwoff2.a
 qt5/lib/pkgconfig/Qt5WebKit.pc
 qt5/lib/pkgconfig/Qt5WebKitWidgets.pc
-qt5/libexec/QtWebDatabaseProcess
 qt5/libexec/QtWebNetworkProcess
 qt5/libexec/QtWebPluginProcess
 qt5/libexec/QtWebProcess
+qt5/libexec/QtWebStorageProcess
 qt5/mkspecs/modules/qt_lib_webkit.pri
+qt5/mkspecs/modules/qt_lib_webkit_private.pri
 qt5/mkspecs/modules/qt_lib_webkitwidgets.pri
-qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.so
+qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri
+qt5/qml/QtWebKit/experimental/libqmlwebkitexperimentalplugin.${RUBY_DLEXT}
 qt5/qml/QtWebKit/experimental/qmldir
-qt5/qml/QtWebKit/libqmlwebkitplugin.so
+qt5/qml/QtWebKit/libqmlwebkitplugin.${RUBY_DLEXT}
 qt5/qml/QtWebKit/plugins.qmltypes
 qt5/qml/QtWebKit/qmldir

Index: pkgsrc/x11/qt5-qtwebkit/distinfo
diff -u pkgsrc/x11/qt5-qtwebkit/distinfo:1.13 pkgsrc/x11/qt5-qtwebkit/distinfo:1.14
--- pkgsrc/x11/qt5-qtwebkit/distinfo:1.13       Fri Nov  9 13:45:00 2018
+++ pkgsrc/x11/qt5-qtwebkit/distinfo    Sat Jul 20 18:29:33 2019
@@ -1,17 +1,9 @@
-$NetBSD: distinfo,v 1.13 2018/11/09 13:45:00 bsiegert Exp $
+$NetBSD: distinfo,v 1.14 2019/07/20 18:29:33 nia Exp $
 
-SHA1 (0325d51c4a2a05fb.patch) = f92b975fdebefe2184be1bf7f334e73459293a00
-RMD160 (0325d51c4a2a05fb.patch) = 94110d0252f314e4a26db0b44ea7d9f380f1cfb4
-SHA512 (0325d51c4a2a05fb.patch) = eba1fd73330d69ddc080154a557ba5e9ba545e3dfad7b8ec7450663548f030f1d5b2c79b170bbd37798328827cfd8fe57224f824b8a2cf627e3ce6e44d63b6a8
-Size (0325d51c4a2a05fb.patch) = 7134 bytes
-SHA1 (6c7b0f61c12d28cc.patch) = bb4c649709496ccdcb539152d0d591c91a0df5a8
-RMD160 (6c7b0f61c12d28cc.patch) = 0624bf894107908f7a27228fb1c51a68aadcf57f
-SHA512 (6c7b0f61c12d28cc.patch) = 7df1df77c6d817d4185e4b318c7dbaf5ecb9980948bf3d5760df8d204fd0df1c3075b31cb5106a436f0580344ede9ff2330d5460e13fe8578ba95c84ab3702fb
-Size (6c7b0f61c12d28cc.patch) = 1164 bytes
-SHA1 (qtwebkit-5.212.0-alpha2.tar.xz) = 6a361cc3f3b7ab1d35955bafe20fbbae61bc80c8
-RMD160 (qtwebkit-5.212.0-alpha2.tar.xz) = 33c3f7c68090fa16f72950ef85c20978432cc058
-SHA512 (qtwebkit-5.212.0-alpha2.tar.xz) = b15985aab20c5618dc1f71a0d91f02dbed993516272090a4a12990714bf4c9554ccbdcf9d6a143bf46fcc2c170f691e571114d61686fe49791f8d5c540785758
-Size (qtwebkit-5.212.0-alpha2.tar.xz) = 12456284 bytes
+SHA1 (qtwebkit-5.212.0-alpha3.tar.xz) = dd17b3884ccc20c9fce0f151738f923ec8cd147b
+RMD160 (qtwebkit-5.212.0-alpha3.tar.xz) = 5a28f56735b7d3e98dd82f0a2566d9e31e0c37a3
+SHA512 (qtwebkit-5.212.0-alpha3.tar.xz) = 38794514b886de3fa63a41277c2bcbb970e87a12070962b527e3898466cf7ad3b65ce4588669498415d365310b37729e81aabb457808fe11120558ef8e35445f
+Size (qtwebkit-5.212.0-alpha3.tar.xz) = 12457896 bytes
 SHA1 (patch-Source_JavaScriptCore_API_ObjCCallbackFunction.h) = be77c4b19f5f97c12180c1b7d3b72968364f3229
 SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 7bbb0a59a0c087abaaddda08fc31aa24809acb70
 SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = 79b54cb1d03d976a0629fbd8ee9ac1881951ba10
@@ -30,5 +22,4 @@ SHA1 (patch-Source_WebCore_platform_grap
 SHA1 (patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurface.h) = d1d986afd5525143fc786a959240a72167f03352
 SHA1 (patch-Source_WebCore_platform_graphics_surfaces_GraphicsSurfaceToken.h) = 838acb2d7ecf41e5f6989d98459d103f4268cdcf
 SHA1 (patch-Source_WebKit2_Platform_unix_SharedMemoryUnix.cpp) = d18013d0e07d7ad7e9d84cb6ef2d418d9bba4c7e
-SHA1 (patch-Source_WebKit_PlatformQt.cmake) = 5dfde3b2e3092ffcd11fc6746bed1767b2c3b692
-SHA1 (patch-Source_cmake_OptionsQt.cmake) = 2527e56468709bd9fd0a98bf754ac9c692cac4dc
+SHA1 (patch-Source_cmake_OptionsQt.cmake) = 35cc2b9904897cd2f1d540b473ce2905d95a0143

Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsQt.cmake
diff -u pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsQt.cmake:1.1 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsQt.cmake:1.2
--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsQt.cmake:1.1      Wed Jan 17 19:37:33 2018
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_cmake_OptionsQt.cmake  Sat Jul 20 18:29:33 2019
@@ -1,11 +1,11 @@
-$NetBSD: patch-Source_cmake_OptionsQt.cmake,v 1.1 2018/01/17 19:37:33 markd Exp $
+$NetBSD: patch-Source_cmake_OptionsQt.cmake,v 1.2 2019/07/20 18:29:33 nia Exp $
 
 ECM_MODULE_DIR wants a single directory, not a path
 
---- Source/cmake/OptionsQt.cmake.orig  2017-06-15 23:36:48.000000000 +0000
+--- Source/cmake/OptionsQt.cmake.orig  2019-06-26 16:25:02.000000000 +0000
 +++ Source/cmake/OptionsQt.cmake
-@@ -1,7 +1,7 @@
- include(FeatureSummary)
+@@ -3,7 +3,7 @@ include(FeatureSummary)
+ include(ECMEnableSanitizers)
  include(ECMPackageConfigHelpers)
  
 -set(ECM_MODULE_DIR ${CMAKE_MODULE_PATH})