diff options
Diffstat (limited to 'www/qt5-webengine/files/patch-src_buildtools_config_support.pri')
| -rw-r--r-- | www/qt5-webengine/files/patch-src_buildtools_config_support.pri | 40 |
1 files changed, 7 insertions, 33 deletions
diff --git a/www/qt5-webengine/files/patch-src_buildtools_config_support.pri b/www/qt5-webengine/files/patch-src_buildtools_config_support.pri index a09e6b92f707..c54180a33f81 100644 --- a/www/qt5-webengine/files/patch-src_buildtools_config_support.pri +++ b/www/qt5-webengine/files/patch-src_buildtools_config_support.pri @@ -1,11 +1,6 @@ -* 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.orig 2024-03-27 11:26:34 UTC +++ src/buildtools/config/support.pri @@ -5,7 +5,7 @@ defineReplace(qtwebengine_checkWebEngineCoreError) { @@ -16,12 +11,8 @@ https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/raw/ma 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) +@@ -24,14 +24,14 @@ defineReplace(qtwebengine_checkWebEngineCoreError) { + !qtwebengine_checkForPython(QtWebEngine):return(false) !qtwebengine_checkForNodejs(QtWebEngine):return(false) !qtwebengine_checkForSanitizer(QtWebEngine):return(false) - linux:!qtwebengine_checkForPkgCfg(QtWebEngine):return(false) @@ -51,31 +42,14 @@ https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/raw/ma 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) +@@ -53,8 +53,8 @@ defineReplace(qtwebengine_checkPdfError) { !qtwebengine_checkForFlex(QtPdf):return(false) -- !qtwebengine_checkForPython2(QtPdf):return(false) -+ !qtwebengine_checkForPython(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) +- 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) |