From 92e3ba0303b729f0bb0a0e42c0033eacaf053b25995c990bd57c2ef69ab228c1 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Wed, 16 Aug 2023 19:01:46 +0000 Subject: [PATCH 1/5] 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 From 64d48890e2a86361a4200118dfcb62f87a40a901a8c312ad8f338f5960a49d1d Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Mon, 28 Aug 2023 14:13:55 +0000 Subject: [PATCH 2/5] - Delete excludearch line. It fails with aarch64 and ppc64 and I don't know how to solve that, but maybe someone is interested in this and can OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=139 --- musescore.changes | 7 +++++++ musescore.spec | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/musescore.changes b/musescore.changes index 297d6f6..b4d7099 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 28 14:11:38 UTC 2023 - Cor Blom + +- Delete excludearch line. It fails with aarch64 and ppc64 and I + don't know how to solve that, but maybe someone is interested + in this and can + ------------------------------------------------------------------- Wed Aug 16 18:13:55 UTC 2023 - Cor Blom diff --git a/musescore.spec b/musescore.spec index 8425cf7..4da6b31 100644 --- a/musescore.spec +++ b/musescore.spec @@ -115,7 +115,6 @@ 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 From bf37c439142d6add08bbf2bff7dad4087b4edf2bb0803d29c5ea33a0e1ea4169 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Mon, 28 Aug 2023 14:26:05 +0000 Subject: [PATCH 3/5] - Add comment to exludearchline. Build fails in the crashpad client, which is disabled but nevertheless built OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=140 --- musescore.changes | 5 ++--- musescore.spec | 3 +++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/musescore.changes b/musescore.changes index b4d7099..322fa41 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,9 +1,8 @@ ------------------------------------------------------------------- Mon Aug 28 14:11:38 UTC 2023 - Cor Blom -- Delete excludearch line. It fails with aarch64 and ppc64 and I - don't know how to solve that, but maybe someone is interested - in this and can +- Add comment to exludearchline. Build fails in the crashpad client, + which is disabled but nevertheless built ------------------------------------------------------------------- Wed Aug 16 18:13:55 UTC 2023 - Cor Blom diff --git a/musescore.spec b/musescore.spec index 4da6b31..cf9f56c 100644 --- a/musescore.spec +++ b/musescore.spec @@ -115,6 +115,9 @@ Requires: libqt5-qtgraphicaleffects Requires: libqt5-qtquickcontrols2 Requires: ( alsa-plugins-pulse if pulseaudio ) Requires: ( pipewire-alsa if pipewire ) +# For the following arch build fails in the crashpad client, +# Maybe repairable? Disabled until a solution is found by someone. +ExcludeArch: aarch64 ppc64 ppc64le %description MuseScore is a graphical music typesetter. It allows for note entry on a From 125539f630bdf59204d44ad7294c5567603d1d3f9823536f7738f3cfc73c6b20 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Mon, 28 Aug 2023 14:28:31 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=141 --- musescore.changes | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/musescore.changes b/musescore.changes index 322fa41..679d5d2 100644 --- a/musescore.changes +++ b/musescore.changes @@ -1,8 +1,7 @@ ------------------------------------------------------------------- Mon Aug 28 14:11:38 UTC 2023 - Cor Blom -- Add comment to exludearchline. Build fails in the crashpad client, - which is disabled but nevertheless built +- Add comment to exludearchline ------------------------------------------------------------------- Wed Aug 16 18:13:55 UTC 2023 - Cor Blom From d0d9f9374d2d7f010bd4f09c18c8c4568506cfa4df8ce881db2ff6a454d8d9ee Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Mon, 28 Aug 2023 17:10:37 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/musescore?expand=0&rev=142 --- musescore.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/musescore.changes b/musescore.changes index 679d5d2..616598c 100644 --- a/musescore.changes +++ b/musescore.changes @@ -7,7 +7,7 @@ Mon Aug 28 14:11:38 UTC 2023 - Cor Blom 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 +- Build without explicitly setting revision. This is set automatically. - Exclude not supported archs: aarch64 ppc64 ppc64le -------------------------------------------------------------------