CVS commit: pkgsrc/x11/qt5-qtwebkit

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jul 19 20:16:19 UTC 2023

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

Log Message:
qt5-qtwebkit: also buildlink x11/qt5-qtmultimedia


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/x11/qt5-qtwebkit/buildlink3.mk
cvs rdiff -u -r1.30 -r1.31 pkgsrc/x11/qt5-qtwebkit/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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/buildlink3.mk
diff -u pkgsrc/x11/qt5-qtwebkit/buildlink3.mk:1.58 pkgsrc/x11/qt5-qtwebkit/buildlink3.mk:1.59
--- pkgsrc/x11/qt5-qtwebkit/buildlink3.mk:1.58  Mon May 22 21:00:15 2023
+++ pkgsrc/x11/qt5-qtwebkit/buildlink3.mk       Wed Jul 19 20:16:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.58 2023/05/22 21:00:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.59 2023/07/19 20:16:19 adam Exp $
 
 BUILDLINK_TREE+=       qt5-qtwebkit
 
@@ -23,6 +23,7 @@ BUILDLINK_LIBDIRS.qt5-qtwebkit+=      qt5/plu
 .endif
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"
 .include "../../x11/qt5-qtlocation/buildlink3.mk"
+.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
 .include "../../x11/qt5-qtsensors/buildlink3.mk"
 .include "../../x11/qt5-qtwebchannel/buildlink3.mk"
 .endif # QT5_QTWEBKIT_BUILDLINK3_MK

Index: pkgsrc/x11/qt5-qtwebkit/distinfo
diff -u pkgsrc/x11/qt5-qtwebkit/distinfo:1.30 pkgsrc/x11/qt5-qtwebkit/distinfo:1.31
--- pkgsrc/x11/qt5-qtwebkit/distinfo:1.30       Wed Mar 22 20:02:10 2023
+++ pkgsrc/x11/qt5-qtwebkit/distinfo    Wed Jul 19 20:16:19 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2023/03/22 20:02:10 adam Exp $
+$NetBSD: distinfo,v 1.31 2023/07/19 20:16:19 adam Exp $
 
 BLAKE2s (qtwebkit-5.212.0-alpha4.tar.xz) = 20858db08c7d297037d3ced34e441d4b657325c406b475e4e76dd367dc9c500c
 SHA512 (qtwebkit-5.212.0-alpha4.tar.xz) = 33f11270bd030599beff9c1983a6c5ff2d61f407cc8a6825f7f405d46f9184c720fc7f60c7359f08f828db96a2170092875066a0d5c0a21ff09bc48a2603fbf6
@@ -14,7 +14,7 @@ SHA1 (patch-Source_JavaScriptCore_heap_M
 SHA1 (patch-Source_JavaScriptCore_jit_ThunkGenerators.cpp) = f0ca56e4b4060c0a8d756289d7c25d1ead6b07be
 SHA1 (patch-Source_JavaScriptCore_jsc.cpp) = 796ce0232f1a833757b2e7ca5c910fac75f783ad
 SHA1 (patch-Source_JavaScriptCore_tools_CodeProfiling.cpp) = 94c139413eecb875bba98c7749bba24cfcc16632
-SHA1 (patch-Source_Qt5WebKitConfig.cmake.in) = 3a1346216b20853b73abf9b1756617d1e761cb94
+SHA1 (patch-Source_Qt5WebKitConfig.cmake.in) = c8573e02a10064e709bea4dfe053d58d08d048a0
 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

Index: pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_Qt5WebKitConfig.cmake.in
diff -u pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_Qt5WebKitConfig.cmake.in:1.1 pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_Qt5WebKitConfig.cmake.in:1.2
--- pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_Qt5WebKitConfig.cmake.in:1.1   Mon Apr 25 02:45:44 2022
+++ pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_Qt5WebKitConfig.cmake.in       Wed Jul 19 20:16:19 2023
@@ -1,13 +1,14 @@
-$NetBSD: patch-Source_Qt5WebKitConfig.cmake.in,v 1.1 2022/04/25 02:45:44 markd Exp $
+$NetBSD: patch-Source_Qt5WebKitConfig.cmake.in,v 1.2 2023/07/19 20:16:19 adam 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 @@
+@@ -4,6 +4,11 @@
  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(Qt5Multimedia @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@)