From be6017f114bcdcd63b711ad2e3a1b0f4d2041cc34417fa2df74e63d1a4aa4035 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Tue, 20 Feb 2024 14:42:19 +0000 Subject: [PATCH 1/4] - Switch to '%autopatch -M' and '%patch -P' OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwebengine?expand=0&rev=57 --- libqt5-qtwebengine.changes | 5 +++++ libqt5-qtwebengine.spec | 12 ++---------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index 63141d6..d59de32 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 20 14:42:07 UTC 2024 - Christophe Marin + +- Switch to '%autopatch -M' and '%patch -P' + ------------------------------------------------------------------- Wed Nov 22 09:44:27 UTC 2023 - christophe@krop.fr diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index f454a63..01b146a 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -293,15 +293,7 @@ Examples for the libqt5-qtpdf module. %prep %setup -q -n %{tar_version} -# Leap 15 doesn't understand '%%autopatch -m' -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 +%autopatch -M 49 # Replace the whole catapult folder rather than picking individual changes pushd src/3rdparty/chromium/third_party @@ -313,7 +305,7 @@ popd # FFmpeg 5 %if %{with system_ffmpeg} %if %{pkg_vcmp libavcodec-devel >= 5} -%patch50 -p1 +%patch -P50 -p1 %endif %endif From f94b341c6aef81f934b222991282e4c69d8aab0cb92d436f31c1da914ec4f42d Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Tue, 20 Feb 2024 14:47:30 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwebengine?expand=0&rev=58 --- libqt5-qtwebengine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index 01b146a..999d2c4 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -293,7 +293,7 @@ Examples for the libqt5-qtpdf module. %prep %setup -q -n %{tar_version} -%autopatch -M 49 +%autopatch -p1 -M 49 # Replace the whole catapult folder rather than picking individual changes pushd src/3rdparty/chromium/third_party From 0ee443fd5234e49f4b65365f747b095fd18a5428e9e109c1c882077c2725acdf Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Tue, 20 Feb 2024 14:52:26 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwebengine?expand=0&rev=59 --- libqt5-qtwebengine.changes | 2 +- libqt5-qtwebengine.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index d59de32..8588c70 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue Feb 20 14:42:07 UTC 2024 - Christophe Marin -- Switch to '%autopatch -M' and '%patch -P' +- Switch to '%autopatch' and '%patch -P' ------------------------------------------------------------------- Wed Nov 22 09:44:27 UTC 2023 - christophe@krop.fr diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index 999d2c4..aaf5df3 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -293,7 +293,7 @@ Examples for the libqt5-qtpdf module. %prep %setup -q -n %{tar_version} -%autopatch -p1 -M 49 +%autopatch 0 1 2 3 4 5 6 7 -p1 # Replace the whole catapult folder rather than picking individual changes pushd src/3rdparty/chromium/third_party From 7f1d029bd44fcbfa157397b5b59c9a490acbf8096e75eb51a44a52f2ed841742 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Tue, 20 Feb 2024 18:41:16 +0000 Subject: [PATCH 4/4] - Switch to '%patch -P' - Build with python 3.11 on Leap OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwebengine?expand=0&rev=60 --- libqt5-qtwebengine.changes | 3 ++- libqt5-qtwebengine.spec | 39 ++++++++++++++++++++------------------ 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index 8588c70..ea9b8ad 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,7 +1,8 @@ ------------------------------------------------------------------- Tue Feb 20 14:42:07 UTC 2024 - Christophe Marin -- Switch to '%autopatch' and '%patch -P' +- Switch to '%patch -P' +- Build with python 3.11 on Leap ------------------------------------------------------------------- Wed Nov 22 09:44:27 UTC 2023 - christophe@krop.fr diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index aaf5df3..745bef1 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -20,10 +20,12 @@ %bcond_without system_minizip %bcond_without pipewire # The default python version is too old on Leap 15 -%if 0%{?suse_version} < 1550 -%bcond_without python39 +%{?sle15_python_module_pythons} +%if 0%{?suse_version} == 1500 +%define pyver python311 %else -%bcond_without python3 +# latest +%define pyver python3 %endif # spellchecking dictionary directory @@ -100,16 +102,9 @@ BuildRequires: perl-JSON BuildRequires: pipewire-devel %endif BuildRequires: pkgconfig -%if %{with python3} -BuildRequires: python3 -BuildRequires: python3-devel -BuildRequires: python3-xml -%endif -%if %{with python39} -BuildRequires: python39 -BuildRequires: python39-devel -BuildRequires: python39-xml -%endif +BuildRequires: %{pyver} +BuildRequires: %{pyver}-devel +BuildRequires: %{pyver}-xml BuildRequires: re2c BuildRequires: sed BuildRequires: snappy-devel @@ -292,8 +287,16 @@ Recommends: libqt5-qtpdf-devel Examples for the libqt5-qtpdf module. %prep +# Leap's rpm doesn't understand '%%autopatch -M N' nor '%%autopatch X Y Z -p1' %setup -q -n %{tar_version} -%autopatch 0 1 2 3 4 5 6 7 -p1 +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 +%patch -P4 -p1 +%patch -P5 -p1 +%patch -P6 -p1 +%patch -P7 -p1 # Replace the whole catapult folder rather than picking individual changes pushd src/3rdparty/chromium/third_party @@ -304,7 +307,7 @@ popd # FFmpeg 5 %if %{with system_ffmpeg} -%if %{pkg_vcmp libavcodec-devel >= 5} +%if %{pkg_vcmp pkgconfig(libavcodec) >= 5} %patch -P50 -p1 %endif %endif @@ -321,9 +324,9 @@ sed -i -e '/toolprefix = /d' -e 's/\${toolprefix}//g' \ %build rm -r src/3rdparty/chromium/third_party/openh264/src -%if %{with python39} -sed -i 's#QMAKE_PYTHON = python3#QMAKE_PYTHON = python3.9#' mkspecs/features/functions.prf -sed -i 's#python3#python3.9#' configure.pri +%if "%{pyver}" == "python311" +sed -i 's#QMAKE_PYTHON = python3#QMAKE_PYTHON = python3.11#' mkspecs/features/functions.prf +sed -i 's#python3#python3.11#' configure.pri %endif %ifnarch x86_64