CVS commit: pkgsrc/x11/qt5-qtwebkit

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Mon Apr 25 02:45:45 UTC 2022

Modified Files:
        pkgsrc/x11/qt5-qtwebkit: Makefile distinfo
Added Files:
        pkgsrc/x11/qt5-qtwebkit/patches: patch-Source_Qt5WebKitConfig.cmake.in

Log Message:
qt5-qtwebkit: Fix build of packages such as kdewebkit with cmake>=3.23


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/x11/qt5-qtwebkit/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/qt5-qtwebkit/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_Qt5WebKitConfig.cmake.in

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.96 pkgsrc/x11/qt5-qtwebkit/Makefile:1.97
--- pkgsrc/x11/qt5-qtwebkit/Makefile:1.96       Mon Apr 18 19:10:17 2022
+++ pkgsrc/x11/qt5-qtwebkit/Makefile    Mon Apr 25 02:45:44 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.96 2022/04/18 19:10:17 adam Exp $
+# $NetBSD: Makefile,v 1.97 2022/04/25 02:45:44 markd Exp $
 
 QTWKVERSION=   5.212.0-alpha4
 DISTNAME=      qtwebkit-${QTWKVERSION}
 PKGNAME=       qt5-qtwebkit-${QTWKVERSION:S/-/./}
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    x11 www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=qtwebkit/}
 GITHUB_PROJECT=        qtwebkit

Index: pkgsrc/x11/qt5-qtwebkit/distinfo
diff -u pkgsrc/x11/qt5-qtwebkit/distinfo:1.27 pkgsrc/x11/qt5-qtwebkit/distinfo:1.28
--- pkgsrc/x11/qt5-qtwebkit/distinfo:1.27       Fri Apr 22 06:06:38 2022
+++ pkgsrc/x11/qt5-qtwebkit/distinfo    Mon Apr 25 02:45:44 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2022/04/22 06:06:38 markd Exp $
+$NetBSD: distinfo,v 1.28 2022/04/25 02:45:44 markd Exp $
 
 BLAKE2s (qtwebkit-5.212.0-alpha4.tar.xz) = 20858db08c7d297037d3ced34e441d4b657325c406b475e4e76dd367dc9c500c
 SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
@@ -13,6 +13,7 @@ SHA1 (patch-Source_JavaScriptCore_genera
 SHA1 (patch-Source_JavaScriptCore_heap_MachineStackMarker.cpp) = 2b7dba0d0e87ed96c4d7de6ddb5833209cfe51b5
 SHA1 (patch-Source_JavaScriptCore_jit_ThunkGenerators.cpp) = f0ca56e4b4060c0a8d756289d7c25d1ead6b07be
 SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 94c139413eecb875bba98c7749bba24cfcc16632
+SHA1 (patch-Source_Qt5WebKitConfig.cmake.in) = 3a1346216b20853b73abf9b1756617d1e761cb94
 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) = 7ffc086a21f645112ad10296571464a1e15b8b44

Added files:

Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_Qt5WebKitConfig.cmake.in
diff -u /dev/null pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_Qt5WebKitConfig.cmake.in:1.1
--- /dev/null   Mon Apr 25 02:45:45 2022
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_Qt5WebKitConfig.cmake.in       Mon Apr 25 02:45:44 2022
@@ -0,0 +1,17 @@
+$NetBSD: patch-Source_Qt5WebKitConfig.cmake.in,v 1.1 2022/04/25 02:45:44 markd Exp $
+
+Fix build of packages such as kdewebkit with cmake>=3.23
+
+--- Source/Qt5WebKitConfig.cmake.in.orig       2020-03-04 17:16:37.000000000 +0000
++++ Source/Qt5WebKitConfig.cmake.in
+@@ -4,6 +4,10 @@
+ find_dependency_with_major_and_minor(Qt5Core @Qt5_VERSION_MAJOR@ @Qt5_VERSION_MINOR@)
+ find_dependency_with_major_and_minor(Qt5Gui @Qt5_VERSION_MAJOR@ @Qt5_VERSION_MINOR@)
+ find_dependency_with_major_and_minor(Qt5Network @Qt5_VERSION_MAJOR@ @Qt5_VERSION_MINOR@)
++find_dependency_with_major_and_minor(Qt5Sensors @Qt5_VERSION_MAJOR@ @Qt5_VERSION_MINOR@)
++find_dependency_with_major_and_minor(Qt5Positioning @Qt5_VERSION_MAJOR@ @Qt5_VERSION_MINOR@)
++find_dependency_with_major_and_minor(Qt5Quick @Qt5_VERSION_MAJOR@ @Qt5_VERSION_MINOR@)
++find_dependency_with_major_and_minor(Qt5WebChannel @Qt5_VERSION_MAJOR@ @Qt5_VERSION_MINOR@)
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/WebKitTargets.cmake")
+