Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fs-uae for openSUSE:Factory checked in at 2021-10-11 15:31:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fs-uae (Old) and /work/SRC/openSUSE:Factory/.fs-uae.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fs-uae" Mon Oct 11 15:31:47 2021 rev:11 rq:924538 version:3.0.5 Changes: -------- --- /work/SRC/openSUSE:Factory/fs-uae/fs-uae.changes 2021-06-12 20:10:34.841192838 +0200 +++ /work/SRC/openSUSE:Factory/.fs-uae.new.2443/fs-uae.changes 2021-10-11 15:32:43.194951036 +0200 @@ -1,0 +2,7 @@ +Fri Oct 8 15:11:28 UTC 2021 - John Paul Adrian Glaubitz <adrian.glaub...@suse.com> + +- Add upstream patch to fix FTBFS with gcc11 + + 0001-Work-around-an-incompatibility-with-C-17.patch +- Remove workaround to build fs-uae with gcc10 on Tumbleweed + +------------------------------------------------------------------- New: ---- 0001-Work-around-an-incompatibility-with-C-17.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fs-uae.spec ++++++ --- /var/tmp/diff_new_pack.Lp1NtH/_old 2021-10-11 15:32:43.610951703 +0200 +++ /var/tmp/diff_new_pack.Lp1NtH/_new 2021-10-11 15:32:43.614951710 +0200 @@ -24,12 +24,9 @@ Group: System/Emulators/Other URL: https://fs-uae.net/ Source0: https://fs-uae.net/stable/%{version}/%{name}-%{version}.tar.gz +Patch0: 0001-Work-around-an-incompatibility-with-C-17.patch BuildRequires: fdupes -%if 0%{?suse_version} >= 1550 -BuildRequires: gcc10-c++ -%else BuildRequires: gcc-c++ -%endif BuildRequires: hicolor-icon-theme BuildRequires: libpng-devel BuildRequires: pkgconfig @@ -71,12 +68,9 @@ %prep %setup -q +%patch0 -p1 %build -%if 0%{?suse_version} >= 1550 -export CC="gcc-10" -export CXX="g++-10" -%endif %if 0%{?sle_version} == 150000 export CFLAGS="%optflags -fPIC" export CXXFLAGS="%optflags -fPIC" ++++++ 0001-Work-around-an-incompatibility-with-C-17.patch ++++++ >From bf81e7d2a60b2c8646663889e4a4431b988ae972 Mon Sep 17 00:00:00 2001 From: Frode Solheim <fr...@solheim.dev> Date: Fri, 8 Oct 2021 11:39:16 +0200 Subject: [PATCH] Work around an incompatibility with C++17 --- src/dosbox/setup.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/dosbox/setup.h b/src/dosbox/setup.h index db75ada8..e0a3a75d 100644 --- a/src/dosbox/setup.h +++ b/src/dosbox/setup.h @@ -54,6 +54,12 @@ public: }; +#ifdef FSUAE +// Work around an incompatibility with C++17. It does not seem like these +// functions are used anyway. +#define throw(...) throw() +#endif + class Value { /* * Multitype storage container that is aware of the currently stored type in it. @@ -113,6 +119,11 @@ private: void set_double(std::string const& in); }; +#ifdef FSUAE +#undef throw +#endif + + class Property { public: struct Changeable { enum Value {Always, WhenIdle,OnlyAtStart};}; -- 2.33.0
