mirror of
https://git.freebsd.org/ports.git
synced 2025-05-13 15:51:51 -04:00
d53807cc0e
Since we roll our own distfile, this will make it easier to stay caught up with backported Chromium security patches. Currently, it is patched up to Chromium version 119.0.6045.123. Fix build with newer devel/re2 and unbundle. Add a few patches that reduce warnings that significantly increase build log size, some coming as a result of having to build with c++17 now. Add patches from Arch Linux [1] to finally remove dependency on the long-expired Python 2.7. Special thanks to kai@ for reworking theses patches for FreeBSD and testing them. Obtained from: https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/ [1] MFH: 2023Q4 Security: 6e4e8e87-9fb8-4e32-9f8e-9b4303f4bfd5 Security: 88754d55-521a-11ee-8290-a8a1599412c6 Security: 5666688f-803b-4cf0-9cb1-08c088f2225a Security: df0a2fd1-4c92-11ee-8290-a8a1599412c6
81 lines
3.8 KiB
Text
81 lines
3.8 KiB
Text
* Rename Python2 functions to generic Python ones [1]
|
|
* Add support for FreeBSD
|
|
|
|
[1] Obtained from:
|
|
|
|
https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/raw/main/qt5-webengine-python3.patch?ref_type=heads
|
|
|
|
--- src/buildtools/config/support.pri.orig 2023-07-20 09:52:10 UTC
|
|
+++ src/buildtools/config/support.pri
|
|
@@ -5,7 +5,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) {
|
|
|
|
# this should match webengine-core-support
|
|
defineReplace(qtwebengine_checkWebEngineCoreError) {
|
|
- !linux:!win32:!macos {
|
|
+ !linux:!win32:!macos:!unix {
|
|
qtwebengine_skipBuild("QtWebEngine can be built only on Linux, Windows or macOS.")
|
|
return(false)
|
|
}
|
|
@@ -21,17 +21,17 @@ defineReplace(qtwebengine_checkWebEngineCoreError) {
|
|
!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)
|
|
- linux:!qtwebengine_checkForHostPkgCfg(QtWebEngine):return(false)
|
|
+ unix:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false)
|
|
+ unix:!qtwebengine_checkForHostPkgCfg(QtWebEngine):return(false)
|
|
linux:!qtwebengine_checkForGlibc(QtWebEngine):return(false)
|
|
- linux:!qtwebengine_checkForKhronos(QtWebEngine):return(false)
|
|
- linux:!qtwebengine_checkForPackage(QtWebEngine,nss):return(false)
|
|
- linux:!qtwebengine_checkForPackage(QtWebEngine,dbus):return(false)
|
|
- linux:!qtwebengine_checkForPackage(QtWebEngine,fontconfig):return(false)
|
|
- linux:!qtwebengine_checkForQpaXcb(QtWebEngine):return(false)
|
|
+ unix:!qtwebengine_checkForKhronos(QtWebEngine):return(false)
|
|
+ unix:!qtwebengine_checkForPackage(QtWebEngine,nss):return(false)
|
|
+ unix:!qtwebengine_checkForPackage(QtWebEngine,dbus):return(false)
|
|
+ unix:!qtwebengine_checkForPackage(QtWebEngine,fontconfig):return(false)
|
|
+ unix:!qtwebengine_checkForQpaXcb(QtWebEngine):return(false)
|
|
win32:!qtwebengine_checkForCompiler64(QtWebEngine):return(false)
|
|
win32:!qtwebengine_checkForWinVersion(QtWebEngine):return(false)
|
|
return(true)
|
|
@@ -39,7 +39,7 @@ defineReplace(qtwebengine_checkPdfError) {
|
|
|
|
# this shuold match webengine-qtpdf-support
|
|
defineReplace(qtwebengine_checkPdfError) {
|
|
- !linux:!win32:!macos:!ios {
|
|
+ !linux:!win32:!macos:!ios:!unix {
|
|
qtwebengine_skipBuild("QtPdf can be built only on Linux, Windows, macOS or iOS.")
|
|
return(false)
|
|
}
|
|
@@ -51,10 +51,12 @@ defineReplace(qtwebengine_checkPdfError) {
|
|
!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)
|
|
+ unix:!qtwebengine_checkForPkgCfg(QtPdf):return(false)
|
|
+ unix:!qtwebengine_checkForHostPkgCfg(QtPdf):return(false)
|
|
win32:!qtwebengine_checkForWinVersion(QtPdf):return(false)
|
|
return(true)
|
|
}
|
|
@@ -143,10 +145,10 @@ defineTest(qtwebengine_checkForFlex) {
|
|
return(true)
|
|
}
|
|
|
|
-defineTest(qtwebengine_checkForPython2) {
|
|
+defineTest(qtwebengine_checkForPython) {
|
|
module = $$1
|
|
- !qtConfig(webengine-python2) {
|
|
- qtwebengine_skipBuild("Python version 2 (2.7.5 or later) is required to build $${module}.")
|
|
+ !qtConfig(webengine-python) {
|
|
+ qtwebengine_skipBuild("Python is required to build $${module}.")
|
|
return(false)
|
|
}
|
|
return(true)
|