From 92e3ba0303b729f0bb0a0e42c0033eacaf053b25995c990bd57c2ef69ab228c1 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Wed, 16 Aug 2023 19:01:46 +0000 Subject: [PATCH] Accepting request 1104232 from home:cornelisbb:branches:multimedia:apps - Build on 15.5 and older with newer gcc to make it build - Build without explicitly setting revision - Exclude not supported archs: aarch64 ppc64 ppc64le OBS-URL: https://build.opensuse.org/request/show/1104232 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=138 --- musescore.changes | 7 +++++++ musescore.spec | 13 +++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/musescore.changes b/musescore.changes index aa4af25..297d6f6 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 16 18:13:55 UTC 2023 - Cor Blom + +- Build on 15.5 and older with newer gcc to make it build +- Build without explicitly setting revision +- Exclude not supported archs: aarch64 ppc64 ppc64le + ------------------------------------------------------------------- Tue Aug 15 19:15:21 UTC 2023 - Cor Blom diff --git a/musescore.spec b/musescore.spec index 366ed90..8425cf7 100644 --- a/musescore.spec +++ b/musescore.spec @@ -22,7 +22,6 @@ %define _lto_cflags %{nil} %define rname mscore %define version_lesser 4.1 -%define revision 5485621 %define fontdir %{_datadir}/fonts/%{name} %define docdir %{_docdir}/%{name} Name: musescore @@ -65,7 +64,12 @@ Source5: README.SUSE Patch0: use-qtmake-qt5.patch BuildRequires: cmake BuildRequires: fdupes +%if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150500 +BuildRequires: gcc12 +BuildRequires: gcc12-c++ +%else BuildRequires: gcc-c++ +%endif BuildRequires: libqt5-linguist-devel BuildRequires: libqt5-qtbase-private-headers-devel %ifarch ppc64 ppc64le @@ -111,6 +115,7 @@ Requires: libqt5-qtgraphicaleffects Requires: libqt5-qtquickcontrols2 Requires: ( alsa-plugins-pulse if pulseaudio ) Requires: ( pipewire-alsa if pipewire ) +ExcludeArch: aarch64 ppc64 ppc64le %description MuseScore is a graphical music typesetter. It allows for note entry on a @@ -158,6 +163,11 @@ mv -f tmpfile thirdparty/rtf2html/README.ru %limit_build -m 2000 %endif +%if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150500 +export CC=gcc-12 +export CXX=g++-12 +%endif + %define __builddir build.release # TODO: # find out what those do: @@ -173,7 +183,6 @@ mv -f tmpfile thirdparty/rtf2html/README.ru -DBUILD_JACK:BOOL=ON \ -DBUILD_UPDATE_MODULE:BOOL=OFF \ -DBUILD_CRASHPAD_CLIENT=OFF \ - -DMUSESCORE_REVISION=%{revision} \ -Wno-dev %cmake_build