From 1375be323b4872cec799a99e5e9141ad8580c71032b040f184b16b290ce3fc80 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 11 May 2022 15:32:06 +0000 Subject: [PATCH] Accepting request 976266 from home:susnux:branches:games:tools Fix build with gcc 12 (required for Factory submission) OBS-URL: https://build.opensuse.org/request/show/976266 OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=144 --- 36398fb.patch | 33 +++++++++++++++++++++++++++++++++ mumble.changes | 5 +++++ mumble.spec | 3 ++- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 36398fb.patch diff --git a/36398fb.patch b/36398fb.patch new file mode 100644 index 0000000..c4b752f --- /dev/null +++ b/36398fb.patch @@ -0,0 +1,33 @@ +From 36398fb3b293fc889bbc38df29665359f5c2a0ca Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich +Date: Sun, 27 Feb 2022 10:59:57 +0000 +Subject: [PATCH] BUILD(positional-audio): Fix missing include + +Without the change the build fails on upcoming gcc-12 as: + + /build/mumble/plugins/gtav/gtav.cpp:13:13: + error: 'unique_ptr' in namespace 'std' does not name a template type + 13 | static std::unique_ptr< Game > game; + | ^~~~~~~~~~ + /build/mumble/plugins/gtav/gtav.cpp:12:1: + note: 'std::unique_ptr' is defined in header ''; + did you forget to '#include '? + 11 | #include + +++ |+#include + 12 | +--- + plugins/gtav/gtav.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/gtav/gtav.cpp b/plugins/gtav/gtav.cpp +index ebaf12929f..6c8af41c71 100644 +--- a/plugins/gtav/gtav.cpp ++++ b/plugins/gtav/gtav.cpp +@@ -9,6 +9,7 @@ + #include "mumble_positional_audio_utils.h" + + #include ++#include + + static std::unique_ptr< Game > game; + diff --git a/mumble.changes b/mumble.changes index 25fa577..c75e405 100644 --- a/mumble.changes +++ b/mumble.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 11 09:42:59 UTC 2022 - Ferdinand Thiessen + +- Add 36398fb.patch from upstream to fix build with gcc 12 + ------------------------------------------------------------------- Sun May 8 20:16:14 UTC 2022 - Ferdinand Thiessen diff --git a/mumble.spec b/mumble.spec index e6596ab..883dc64 100644 --- a/mumble.spec +++ b/mumble.spec @@ -43,8 +43,9 @@ Source3: murmur.apparmor Source4: https://raw.githubusercontent.com/mumble-voip/mumble-gpg-signatures/master/mumble-auto-build-2022.asc#/%{name}.keyring Source5: mumble-server.service Source6: baselibs.conf -#PATCH-FIX-UPSTREAM 3d8a4d5.patch -- https://github.com/mumble-voip/mumble/commit/73d8a4d5 +#PATCH-FIX-UPSTREAM 73d8a4d5.patch -- https://github.com/mumble-voip/mumble/commit/73d8a4d5 Patch0: 73d8a4d5.patch +Patch1: https://github.com/mumble-voip/mumble/commit/36398fb.patch BuildRequires: cmake >= 3.15 BuildRequires: gcc-c++ BuildRequires: libcap-devel