cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x11/qt5/qtwebkit: fix build of ports using Qt5WebKit with cmake >= 3.23

Browse Source 
This diff fixes the problem in the Qt5WebKit port istelf, which allows
us to remove the patches in consumers of Qt5WebKit, which will happen
in my next commit.

Patch from pkgsrc
OK rsadowski@
This commit is contained in:
caspar 2022-06-08 17:48:28 +00:00
parent 307a52cf03
commit e168dc9df8
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x11/qt5/qtwebkit/Makefile
View File

@ -13,7 +13,7 @@ PKGNAME = qtwebkit-${VERSION}
PKGSPEC = qtwebkit->=${VERSION}v0
EPOCH = 0
REVISION = 7
REVISION = 8
SHARED_LIBS += Qt5WebKit 3.1 # 5.9
SHARED_LIBS += Qt5WebKitWidgets 3.1 # 5.9

18
x11/qt5/qtwebkit/patches/patch-Source_Qt5WebKitConfig_cmake_in Normal file
View File

@ -0,0 +1,18 @@
Index: Source/Qt5WebKitConfig.cmake.in
Fix build of ports using cmake/QtWebKit with cmake >= 3.23. Borrowed from
http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/x11/qt5-qtwebkit/patches/patch-Source_Qt5WebKitConfig.cmake.in?rev=1.1&content-type=text/x-cvsweb-markup&only_with_tag=MAIN
--- Source/Qt5WebKitConfig.cmake.in.orig
+++ 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")