Accepting request 976437 from games:tools

Fix build with gcc 12 (required for Factory submission) (forwarded request 976266 from susnux)

OBS-URL: https://build.opensuse.org/request/show/976437
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mumble?expand=0&rev=71

36398fb.patch

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

73d8a4d5.patch

@@ -0,0 +1,22 @@
+diff -Nur mumble-1.4.230.src/src/mumble/CMakeLists.txt new/src/mumble/CMakeLists.txt
+--- mumble-1.4.230.src/src/mumble/CMakeLists.txt	2022-01-18 02:00:00.342013800 +0100
++++ new/src/mumble/CMakeLists.txt	2022-05-08 22:19:05.007999852 +0200
+@@ -383,12 +383,17 @@
+ 		"${PLUGINS_DIR}"
+ )
+ 
+-find_pkg(Poco COMPONENTS Zip)
++find_pkg(Poco
++	COMPONENTS
++		XML
++		Zip
++)
+ 
+ if(TARGET Poco::Zip)
+ 	target_link_libraries(mumble
+ 		PRIVATE
+ 			Poco::Zip
++                        Poco::XML
+ 	)
+ else()
+ 	message(STATUS "Regular Poco search failed - looking for Poco include dir manually...")

mumble.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+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>
+
+- Fix build with new poco version (1.11.2), added 73d8a4d5.patch
+
 -------------------------------------------------------------------
 Sat Apr 16 13:09:07 UTC 2022 - Stefan Seyfried <seife+obs@b1-systems.com>
 

mumble.spec

@@ -43,6 +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 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
@@ -133,10 +136,10 @@ characters, and has echo cancellation so the sound from your loudspeakers
 won't be audible to other players.
 
 %prep
-%setup -q -n %{name}-%{version}.src
+%autosetup -p1 -n %{name}-%{version}.src
 
 %build
-%cmake .. \
+%cmake \
         -Dupdate:BOOL=OFF \
         -Doverlay-xcompile:BOOL=OFF \
         -Dsymbols:BOOL=ON \
@@ -161,7 +164,7 @@ won't be audible to other players.
 %endif
 
 # build fails for high -j so we overwrite with 1 here
-%make_build -j1
+%cmake_build -j1
 
 %install
 %cmake_install