From 9793a1e61a74f5a89b970454e9a76104bb9f51b2 Mon Sep 17 00:00:00 2001 From: "Jason E. Hale" Date: Sun, 31 Mar 2024 07:55:32 -0400 Subject: Qt5: Update to 5.15.13 Update devel/pyside2* and devel/shiboken to 5.15.13 Update www/qt5-webengine to latest commit. Python 3.x support has been integrated upstream, so local patches have been removed. Release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/5.15.13/release-note.md --- .../files/patch-mkspecs_features_functions.prf | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) (limited to 'www/qt5-webengine/files/patch-mkspecs_features_functions.prf') diff --git a/www/qt5-webengine/files/patch-mkspecs_features_functions.prf b/www/qt5-webengine/files/patch-mkspecs_features_functions.prf index b8ac1d14ef88..357bb5e2a61f 100644 --- a/www/qt5-webengine/files/patch-mkspecs_features_functions.prf +++ b/www/qt5-webengine/files/patch-mkspecs_features_functions.prf @@ -1,28 +1,8 @@ -* Rename Python2 related functions to Python generic ones [1] * Add support for FreeBSD * Add detection for PowerPC64 -[1] Obtained from: - -https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/raw/main/qt5-webengine-python3.patch?ref_type=heads - ---- mkspecs/features/functions.prf.orig 2023-07-20 09:52:10 UTC +--- mkspecs/features/functions.prf.orig 2024-03-27 11:26:34 UTC +++ mkspecs/features/functions.prf -@@ -44,11 +44,11 @@ defineReplace(pythonPath) { - - # Returns the unquoted path to the python executable. - defineReplace(pythonPath) { -- isEmpty(QMAKE_PYTHON2) { -+ isEmpty(QMAKE_PYTHON) { - # Fallback for building QtWebEngine with Qt < 5.8 -- QMAKE_PYTHON2 = python -+ QMAKE_PYTHON = python - } -- return($$QMAKE_PYTHON2) -+ return($$QMAKE_PYTHON) - } - - # Returns the python executable for use with shell / make targets. @@ -89,6 +89,10 @@ defineReplace(gnWebEngineArgs) { include($$QTWEBENGINE_ROOT/src/buildtools/config/windows.pri) include($$QTWEBENGINE_ROOT/src/core/config/windows.pri) -- cgit v1.2.3