pool/strawberry
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 858306 from home:jonaski:branches:multimedia:apps

Browse Source 
- Use cmake_build macro
- Use Qt 6 on tumbleweed

OBS-URL: https://build.opensuse.org/request/show/858306
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/strawberry?expand=0&rev=88
This commit is contained in:
Jonas Kvinge 2020-12-23 08:17:49 +00:00 committed by Git OBS Bridge
parent aaa087127a
commit f510ecf7e0
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
strawberry.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Dec 23 08:16:18 UTC 2020 - Jonas Kvinge <jonaski@opensuse.org>
- Use cmake_build macro
- Use Qt 6 on tumbleweed
-------------------------------------------------------------------
Sat Dec 19 16:50:36 UTC 2020 - Jonas Kvinge <jonas@jkvinge.net>

39
strawberry.spec
View File

@ -36,16 +36,28 @@ BuildRequires: libboost_headers-devel
BuildRequires: make
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
%if 0%{?suse_version} > 1530
BuildRequires: cmake(Qt6Concurrent)
BuildRequires: cmake(Qt6Core)
BuildRequires: cmake(Qt6DBus)
BuildRequires: cmake(Qt6Gui)
BuildRequires: cmake(Qt6LinguistTools)
BuildRequires: cmake(Qt6Network)
BuildRequires: cmake(Qt6Sql)
BuildRequires: cmake(Qt6Test)
BuildRequires: cmake(Qt6Widgets)
%else
BuildRequires: cmake(Qt5Concurrent)
BuildRequires: cmake(Qt5Core)
BuildRequires: cmake(Qt5DBus)
BuildRequires: cmake(Qt5Gui)
BuildRequires: cmake(Qt5LinguistTools)
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Sql)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: cmake(Qt5Network)
BuildRequires: cmake(Qt5Sql)
BuildRequires: cmake(Qt5Test)
BuildRequires: cmake(Qt5Widgets)
BuildRequires: cmake(Qt5X11Extras)
%endif
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(gio-2.0)
@ -101,8 +113,13 @@ Features:
%build
export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="$CFLAGS"
%cmake -DBUILD_WERROR=OFF -DUSE_SYSTEM_TAGLIB=ON
make %{?_smp_mflags}
%cmake -DBUILD_WERROR=OFF -DUSE_SYSTEM_TAGLIB=ON \
%if 0%{?suse_version} > 1530
-DQT_MAJOR_VERSION=6
%else
-DQT_MAJOR_VERSION=5
%endif
%cmake_build
%install
%cmake_install