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
This commit is contained in:
Jan Engelhardt 2022-05-11 15:32:06 +00:00 committed by Git OBS Bridge
parent 5e65cbcb38
commit 1375be323b
3 changed files with 40 additions and 1 deletions

33
36398fb.patch Normal file
View File

@ -0,0 +1,33 @@
From 36398fb3b293fc889bbc38df29665359f5c2a0ca Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 27 Feb 2022 10:59:57 +0000
Subject: [PATCH] BUILD(positional-audio): Fix missing <memory> 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 '<memory>';
did you forget to '#include <memory>'?
11 | #include <cstring>
+++ |+#include <memory>
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 <cstring>
+#include <memory>
static std::unique_ptr< Game > game;

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 11 09:42:59 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>
- Add 36398fb.patch from upstream to fix build with gcc 12
-------------------------------------------------------------------
Sun May 8 20:16:14 UTC 2022 - Ferdinand Thiessen <rpm@fthiessen.de>

View File

@ -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