From 5cb64007d128d24a54bdb5646bfd69711c816b29fef5432e74e18d2f3018c6c3 Mon Sep 17 00:00:00 2001 From: Luigi Baldoni Date: Mon, 7 Mar 2022 10:03:28 +0000 Subject: [PATCH 1/2] Accepting request 959796 from home:cgiboudeaux:branches:multimedia:apps - Use the Qt6 cmake macros to fix the 15.4 build. OBS-URL: https://build.opensuse.org/request/show/959796 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=164 --- qmmp.changes | 5 +++++ qmmp.spec | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/qmmp.changes b/qmmp.changes index d634774..5262377 100644 --- a/qmmp.changes +++ b/qmmp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 7 08:18:07 UTC 2022 - Christophe Giboudeaux + +- Use the Qt6 cmake macros to fix the 15.4 build. + ------------------------------------------------------------------- Sun Jan 23 16:38:24 UTC 2022 - Alexei Sorokin diff --git a/qmmp.spec b/qmmp.spec index ec62eba..5c3ab7c 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -143,7 +143,7 @@ Development files for libqmmp. %autosetup -p1 %build -%cmake \ +%cmake_qt6 \ -DCMAKE_MODULE_LINKER_FLAGS="" \ -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON \ -DLIB_DIR=%{_lib} \ @@ -154,10 +154,12 @@ Development files for libqmmp. -DUSE_HAL=OFF \ -DUSE_OSS=OFF \ -DUSE_OSS4=OFF -%cmake_build + +%qt6_build %install -%cmake_install +%qt6_install + # Do not install weirdly-sized icons. rm -r %{buildroot}/%{_datadir}/icons/hicolor/56x56 From c44d3af4856b2a32326a04c48ddeeb00ed25f9c14225d7f8228d0bfbea61e1ee Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Mon, 7 Mar 2022 16:42:11 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/qmmp?expand=0&rev=165 --- qmmp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmmp.spec b/qmmp.spec index 5c3ab7c..3daf0c1 100644 --- a/qmmp.spec +++ b/qmmp.spec @@ -16,6 +16,7 @@ # +%global __provides_exclude_from ^%{_libdir}/qmmp-[0-9\.]*/ %define sover 2 %define mver 2.0 %bcond_with faad @@ -154,7 +155,6 @@ Development files for libqmmp. -DUSE_HAL=OFF \ -DUSE_OSS=OFF \ -DUSE_OSS4=OFF - %qt6_build %install