From a21fbbde7593448381bd9578552efd225f8c4e11ef2c03a8d7bc2e89034099af Mon Sep 17 00:00:00 2001
From: Dave Plater <davejplater@gmail.com>
Date: Wed, 5 Apr 2023 14:00:55 +0000
Subject: [PATCH] Accepting request 1077546 from home:plater

Use gcc12 to build until upstream has caught up with gcc13 Update to 3.2.5

OBS-URL: https://build.opensuse.org/request/show/1077546
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/audacity?expand=0&rev=198
---
 Audacity-3.2.4.tar.gz |  3 ---
 Audacity-3.2.5.tar.gz |  3 +++
 audacity.changes      |  8 ++++++++
 audacity.spec         | 21 ++++++++++++++++-----
 4 files changed, 27 insertions(+), 8 deletions(-)
 delete mode 100644 Audacity-3.2.4.tar.gz
 create mode 100644 Audacity-3.2.5.tar.gz

diff --git a/Audacity-3.2.4.tar.gz b/Audacity-3.2.4.tar.gz
deleted file mode 100644
index 0c235c2..0000000
--- a/Audacity-3.2.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9a85b5db02e25e46672c489ffa96d2f5115ee58650bfd57c5b8a07259f4f550f
-size 57016943
diff --git a/Audacity-3.2.5.tar.gz b/Audacity-3.2.5.tar.gz
new file mode 100644
index 0000000..e87137f
--- /dev/null
+++ b/Audacity-3.2.5.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ee4f6f3ea985114b8fda578c67faf163e1d2cc8b2f0bad1b259a9367d2ccb1b
+size 57017533
diff --git a/audacity.changes b/audacity.changes
index 113794b..48d4ca3 100644
--- a/audacity.changes
+++ b/audacity.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Apr  5 11:38:18 UTC 2023 - Dave Plater <davejplater@gmail.com>
+
+- Use gcc12 to build until upstream has caught up with gcc13
+- Update to 3.2.5
+  This is a hotfix release. It fixes the following bug:
+  #4373 Fixes authorization flow for the audio.com sharing service
+
 -------------------------------------------------------------------
 Fri Feb  3 16:24:02 UTC 2023 - Takashi Iwai <tiwai@suse.com>
 
diff --git a/audacity.spec b/audacity.spec
index 143de6b..3c97e53 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -16,8 +16,15 @@
 #
 
 
+%if 0%{?sle_version} == 150300 && 0%{?is_opensuse}
+# Disable VST3 for Leap 15.3 due an old cmake
+%bcond_with vst
+%else
+%bcond_without vst
+%endif
+
 Name:           audacity
-Version:        3.2.4
+Version:        3.2.5
 Release:        0
 Summary:        A Multi Track Digital Audio Editor
 License:        CC-BY-3.0 AND GPL-2.0-or-later AND GPL-3.0-only
@@ -35,7 +42,10 @@ Patch2:         mod-script-pipe-disable-rpath.patch
 Patch3:         no-more-strip.patch
 BuildRequires:  cmake >= 3.16
 BuildRequires:  desktop-file-utils
-BuildRequires:  gcc-c++
+# Build with gcc12 until upstream catches up with gcc13
+#BuildRequires:  gcc-c++
+BuildRequires:  gcc12
+BuildRequires:  gcc12-c++
 #!BuildIgnore:  gstreamer-0_10-plugins-base
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libmp3lame-devel
@@ -114,8 +124,7 @@ rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg,lame}/
 #Included in src/AboutDialog.cpp but not supplied
 touch include/RevisionIdent.h
 
-# Disable VST3 for Leap 15.3 due an old cmake
-%if 0%{?sle_version} != 150300 && 0%{?is_opensuse}
+%if %{with vst}
 tar xf %{SOURCE3} --strip-components=1 --one-top-level=vst3sdk
 %endif
 
@@ -126,6 +135,8 @@ export PKG_CONFIG_PATH="`echo $PWD`:%{_libdir}/pkgconfig"
 fi
 export CFLAGS="%{optflags} -fno-strict-aliasing -ggdb $(wx-config --cflags)"
 export CXXFLAGS="$CFLAGS -std=gnu++17"
+export CC="/usr/bin/gcc-12"
+export CXX="/usr/bin/g++-12"
 
 %cmake  \
        -DAUDACITY_REV_TIME=$(date -u -d "@${SOURCE_DATE_EPOCH}" "+%Y-%m-%dT%H:%M:%SZ") \
@@ -137,7 +148,7 @@ export CXXFLAGS="$CFLAGS -std=gnu++17"
        -Daudacity_has_networking:BOOL=Off \
        -Daudacity_lib_preference:STRING=system \
        -Duse_lame:STRING=system \
-%if 0%{?sle_version} == 150300 && 0%{?is_opensuse}
+%if %{without vst}
        -Daudacity_has_vst3=off \
 %endif
        -Daudacity_use_ffmpeg:STRING=loaded