From b4ae44723495643c2fa0d56155d4903137ec9cee5325570858ee9176d0505cd6 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Thu, 24 Jun 2021 16:42:14 +0000 Subject: [PATCH] Fix the QtWE version workaround OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwebengine?expand=0&rev=30 --- libqt5-qtwebengine.changes | 5 +++++ libqt5-qtwebengine.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index 8fbce24..dc4905f 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jun 24 16:39:27 UTC 2021 - Christophe Giboudeaux + +- Update the CMake version workaround to get qtbase's real version + ------------------------------------------------------------------- Tue Jun 22 09:00:44 UTC 2021 - christophe@krop.fr diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index 5ae2fbe..65d611f 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -346,7 +346,7 @@ rm -f %{buildroot}%{_libqt5_libdir}/*.la # ln -sf %{_datadir}/icu/*/icudt*l.dat %{buildroot}%{_datadir}/qt5/icudtl.dat # Workaround to allow using QtWE with older Qt versions -%global qtcore_version %(printf %{pkg_version libQt5Core5}) +%global qtcore_version %(printf %{pkg_version libQt5Core5} | cut -d + -f 1) # NOTE the space after '%%{version}' is important to only match '5.15.X ${_Qt5XXX_FIND_VERSION_EXACT}' sed -i 's#%{version} #%{qtcore_version} #' %{buildroot}%{_libqt5_libdir}/cmake/*/*Config.cmake