From 24466fd27f355c9eb3403a99bdc1ed310116e08aba552c9d5f7b7d7ce4c600c2 Mon Sep 17 00:00:00 2001 From: Dave Plater Date: Fri, 10 Nov 2023 08:48:20 +0000 Subject: [PATCH] Accepting request 1124809 from home:ecsos - Use gcc12 in Leap to fix build error. OBS-URL: https://build.opensuse.org/request/show/1124809 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=213 --- audacity.changes | 5 +++++ audacity.spec | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/audacity.changes b/audacity.changes index d0799d7..c2230b4 100644 --- a/audacity.changes +++ b/audacity.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Nov 10 08:06:47 UTC 2023 - ecsos + +- Use gcc12 in Leap to fix build error. + ------------------------------------------------------------------- Thu Nov 9 10:17:39 UTC 2023 - Dave Plater diff --git a/audacity.spec b/audacity.spec index c0c6801..1c5582c 100644 --- a/audacity.spec +++ b/audacity.spec @@ -45,7 +45,13 @@ Patch94: vst3sdk-fix-include-cstdint-for-gcc13.patch Patch95: vst3sdk-fix-limits-include-moduleinfoparser.patch BuildRequires: cmake >= 3.16 BuildRequires: desktop-file-utils +%if 0%{?suse_version} <= 1600 +BuildRequires: gcc12 +BuildRequires: gcc12-c++ +%else +BuildRequires: gcc BuildRequires: gcc-c++ +%endif #!BuildIgnore: gstreamer-0_10-plugins-base BuildRequires: hicolor-icon-theme BuildRequires: libmp3lame-devel @@ -141,6 +147,10 @@ tar xf %{SOURCE3} --strip-components=1 --one-top-level=vst3sdk %endif %build +%if 0%{?suse_version} <= 1600 +export CC=gcc-12 +export CXX=g++-12 +%endif if ! test -e %{_libdir}/pkgconfig/lame.pc then export PKG_CONFIG_PATH="`echo $PWD`:%{_libdir}/pkgconfig"