Accepting request 975656 from home:susnux:branches:games:tools

- Fix build with new poco version (1.11.2), added 73d8a4d5.patch

OBS-URL: https://build.opensuse.org/request/show/975656
OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=143

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,8 @@
+-------------------------------------------------------------------
+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,8 @@ 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
+Patch0:         73d8a4d5.patch
 BuildRequires:  cmake >= 3.15
 BuildRequires:  gcc-c++
 BuildRequires:  libcap-devel
@@ -133,10 +135,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 +163,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