daftaupe/opt
1
0
Fork 0
forked from ports/opt
Code Pull Requests Activity

qtwebengine: added patch to fully support python3; added dependency: xorg-libxkbfile

Browse Source
This commit is contained in:
Tim Biermann 2023-07-29 22:06:51 +02:00
parent 3128ef84cb
commit a7eb49748b
Signed by untrusted user: tb
GPG Key ID: 42F8B4E30B673606
3 changed files with 48 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qtwebengine/.signature
View File

@ -1,6 +1,6 @@
untrusted comment: verify with /etc/ports/opt.pub
RWSE3ohX2g5d/ZUkpLyXWMwnnaZau3ICDziiV3bXSXbXVXTxy6hCjciqCUITtITLHJQfLi6/ggGTNViJl89pEXsDB3JZivrkCg8=
SHA256 (Pkgfile) = 3df06fcae8eb4b5c677b881c35fe66c4ab960785e97bd00d1cee75fafffaad3a
RWSE3ohX2g5d/S3vYYvn21FFI47aI7jdXVTQhnTMBpZ8Da+gFBJYokhG59aTAR9VvAuFSWVgl6d5vpqJn1aEUHlTZ5MkdRuZ0w4=
SHA256 (Pkgfile) = 0e3f1891890f536f1cc6d27ca21c950a993f7e6e17ecd49687d1d8d358d14cd7
SHA256 (.footprint) = 9c07e0209b90e6d45f593e30c0b5342a594c32de974cc61990189f9e80f4a21a
SHA256 (qtwebengine-5.15.15.tar.gz) = 52ad2c4bbf78ecd636c1c04ccf866b6a3783da03d1cde11d5f27ad68cd082ff6
SHA256 (qtwebengine-chromium-8df91f886e7fffb61408e2426f8a90d763a3b6ea.tar.gz) = 490b5dce724097d8be048b8ef19ea74b8f984510fe5a3f5fef7ac33d563d594a
@ -15,3 +15,4 @@ SHA256 (qt5-webengine-pipewire-0.3.patch) = 5e3a3c4711d964d5152a04059a2b5c1d14bb
SHA256 (qtwebengine-5.15.15-c++17.patch) = b0b69017470617d3113d7f6faeebe7d2314cefaddf4cb209c85f69ae724eb8c9
SHA256 (qtwebengine-system-absl-compat.patch) = 9ad4ff067701f326d57dfbb147b001320b6735641f6e0042196739fc125fe03e
SHA256 (qtwebengine-re2-2023.07.01.patch) = 1d1af26b3e62c7acca086eb8a034f46f3b23f313bf62f883cf4676a9bece46d1
SHA256 (python.patch) = 95f048cbe54c70975625ab12f4f9a8af20fd2c27d6bacbf225947bf2a0bf456c

8
qtwebengine/Pkgfile
View File

@ -1,12 +1,12 @@
# Description: The Qt WebEngine module provides a web browser engine
# URL: https://www.qt.io/
# Maintainer: Tim Biermann, tbier at posteo dot de
# Depends on: ffmpeg libvpx libwebp nodejs nss qt5 xorg-libxscrnsaver xorg-libxtst
# Depends on: ffmpeg libvpx nodejs nss qt5 xorg-libxkbfile xorg-libxscrnsaver xorg-libxtst
# Optional: glib jsoncpp krb5 krb5 lcms2 libevent libsrtp libxml2 minizip opus pipewire pulseaudio re2 snappy
name=qtwebengine
version=5.15.15
release=1
release=2
# https://github.com/qt/qtwebengine/commits/5.15
_qtwebengine_commit=43863f59f4c7fc0f3e89292e7669e9fe4ae67efa
@ -25,7 +25,8 @@ source=(https://github.com/qt/qtwebengine/archive/$_qtwebengine_commit/$name-$ve
qt5-webengine-pipewire-0.3.patch
qtwebengine-5.15.15-c++17.patch
qtwebengine-system-absl-compat.patch
qtwebengine-re2-2023.07.01.patch)
qtwebengine-re2-2023.07.01.patch
python.patch)
build() {
cd qtwebengine-$_qtwebengine_commit
@ -43,6 +44,7 @@ build() {
patch -p1 -i $SRC/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
patch -p1 -i $SRC/qtwebengine-5.15.13-icu_73-1.patch
patch -p1 -d src/3rdparty -i $SRC/qt5-webengine-pipewire-0.3.patch
patch -p1 -i $SRC/python.patch
if prt-get isinst re2; then
patch -p1 -i $SRC/qtwebengine-re2-2023.07.01.patch

40
qtwebengine/python.patch Normal file
View File

@ -0,0 +1,40 @@
Date: Mon, 24 Jul 2023 20:21:29 +0200
From: leeroy@cock.li
To: tbier@posteo.de
Subject: qtwebengine failing to build
after the update to 5.15.15, the qtwebengine port fails to build complaining it does not find python2
It is missing the following changes to fully support python3:
--- qtwebengine-43863f59f4c7fc0f3e89292e7669e9fe4ae67efa/src/buildtools/config/support.pri.orig 2023-07-24 20:09:12.855793225 +0200
+++ qtwebengine-43863f59f4c7fc0f3e89292e7669e9fe4ae67efa/src/buildtools/config/support.pri 2023-07-24 20:09:37.728790951 +0200
@@ -21,7 +21,7 @@
!qtwebengine_checkForGperf(QtWebEngine):return(false)
!qtwebengine_checkForBison(QtWebEngine):return(false)
!qtwebengine_checkForFlex(QtWebEngine):return(false)
- !qtwebengine_checkForPython2(QtWebEngine):return(false)
+ !qtwebengine_checkForPython(QtWebEngine):return(false)
!qtwebengine_checkForNodejs(QtWebEngine):return(false)
!qtwebengine_checkForSanitizer(QtWebEngine):return(false)
linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false)
@@ -51,7 +51,7 @@
!qtwebengine_checkForGperf(QtPdf):return(false)
!qtwebengine_checkForBison(QtPdf):return(false)
!qtwebengine_checkForFlex(QtPdf):return(false)
- !qtwebengine_checkForPython2(QtPdf):return(false)
+ !qtwebengine_checkForPython(QtPdf):return(false)
!qtwebengine_checkForSanitizer(QtPdf):return(false)
linux:!qtwebengine_checkForPkgCfg(QtPdf):return(false)
linux:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false)
@@ -143,9 +143,9 @@
return(true)
}
-defineTest(qtwebengine_checkForPython2) {
+defineTest(qtwebengine_checkForPython) {
module = $$1
- !qtConfig(webengine-python2) {
+ !qtConfig(webengine-python) {
qtwebengine_skipBuild("Python version 2 (2.7.5 or later) is required to build $${module}.")
return(false)
}