gentoo resync : 12.05.2022

5 files changed, 60 insertions, 4 deletions

diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index e5344a6af2ca..15260b8e6715 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,7 +1,9 @@
+AUX mumble-1.4.230-gcc12-include-memory.patch 934 BLAKE2B 2cbcb1983687effdcb183f034f76f05106bb2757b278a001da64a6c6c37c593776f391a23d23023d8c8c28ff5a53b1df0e4f2fb597904dee450b36a88abb8cd2 SHA512 8d00e760e5b49acba50cd6637de990d3b16f493327110cf768aef9d11aa309372996bf8c5a8a49fa3e4364dfec5f1611f855efe05284d9b388d3184e012278d5
+AUX mumble-1.4.230-poco-link-cmake.patch 476 BLAKE2B 91268125286d07820c98e941e443655b7edfb4f6c13815f988de8ed4ad50aa37fca557a88cee399418853cdd2e577f67acad7f8e3c2b7e1eefe8a64d4a26358c SHA512 9bab7ca52fd27f600215ceebac690ddae2702547a8519bdbb24be0df411a2ddd89750cfeeca77bcc47fec32b27526971a180519431b8e1637a224d902ec8de88
 DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68
 DIST mumble-1.4-openssl3.patch.xz 4172 BLAKE2B 5b68f023e218628a4d73b0991dcc7790ce5f92ce6a27c372c5e80b1f3a8beafa3ddd6416b884705b321aee31ea4f5e09dda6ceb240272dde64f420fbeb06845a SHA512 3a4e504f3365e93418cb85d0da4e6f2f54ab904283743907604bb39276560a4215d9bea1b225601789d1c3d84d270c04840ec57cd04e3df1204cc586ea42562a
 DIST mumble-1.4.230.tar.gz 9441667 BLAKE2B da433f3c15d7e45dfac0c8a78c9dbe86ba8d5cd078d2d87fd4d90718968fc9e5928c3c5c5ba2e40a8a54d02a646c5fc6a7ee2fff4b71dfa411d74f395b097c26 SHA512 6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53
 EBUILD mumble-1.3.4.ebuild 3775 BLAKE2B dcf342af9e2a3ad6e19ac795931fd6df8bf8b1f9932dd12c78d58db453604da80e1c59cde9b87055777ab463ccec0b1e18da2fd8b025125d13ae88bc6b687f12 SHA512 157d75a84cdc693f34533aced498f57c28e19d00ca1b49d5f1a13736cc5d8fddb6e06bfafa5e48e154d3ae3e11ab8a10dd40a86501264ca148a5776438bb127e
-EBUILD mumble-1.4.230.ebuild 3400 BLAKE2B 1ef0d0e6c49f217e587d81a58ed5ba06f09f48b299762da821cf11631ab802e1f7392012b3ec4b3c55d6e18ca95c0c2dc0383de3d8337414bd1b119ecd27eba9 SHA512 958dc534aa4b59b2b47e9a7708d941bb724c6b7099b8508d5622dcb1a0e9a58d872b81e9dda86f38b12298941bfce62258ccd74a172ba5949e7f0826000aa4f4
-EBUILD mumble-9999.ebuild 3408 BLAKE2B 065794182eeb1d240a75d54f7432610241ea4153ce851d5919cc8ac7bd95bc93d00051d83e02a907cb45c30c713d7ef7f5cd56f8801ad8388ff2a6102882fcfb SHA512 cb0e373de223c22d1b05f261a8d46157e47271bfd6d44bbc8f20aa2d5641d76a08792be5c00e4e9cafa1a9c6635575e93c64f891e0c263491b3a99cbe7e3e9aa
+EBUILD mumble-1.4.230.ebuild 3521 BLAKE2B 2c3ce0093f988068a693b9d53d98b9fbfe9e434a68dc108ecc7a943b1c6ea7aa1a5bbe85feb26763fde61f1e89f8682a25957d06baf11d37c5108ddae899969b SHA512 0eb6855ecbe176a4a9c5e2f4e7c729ff3ff5c4ab044fc63c2fb4344e01b320935df1a7651973355525e35c1199a1686240b2b33c656976d4aa8982bcee910dc2
+EBUILD mumble-9999.ebuild 3422 BLAKE2B 5bb3bdaa4256022d59b722be3de2965a38d42b342f34c30d44ab034ab5b830fa7ab76579f8c78fe72de389a46b7268243ef6e3eb070f89e92936fa07461e5981 SHA512 13ee387089835564e2a28042273093d0803f0a5a577149da108fd12ad8551101f42f10b7c59e342d1271cb516afc0ebdbf7ae22c960e174339b1030d0e877061
 MISC metadata.xml 670 BLAKE2B fe98e9c1906942bac7fb7c5f66dd14ca201b7be96580c627a21f768507d2700e7c3bb6d63ac29a3402daf2ccbfc64096c61b73414b70489f43fd99ad78abbf6a SHA512 4902e6f6900e479f4c55fce2833b87149cd0175cb261fa08d2835431995472db794c1b47e7b6ade3812b007afe0e0ec8fa252bab7ae3c7bb02378f26a9287fc4
diff --git a/media-sound/mumble/files/mumble-1.4.230-gcc12-include-memory.patch b/media-sound/mumble/files/mumble-1.4.230-gcc12-include-memory.patch
new file mode 100644
index 000000000000..624a8594d995
--- /dev/null
+++ b/media-sound/mumble/files/mumble-1.4.230-gcc12-include-memory.patch
@@ -0,0 +1,28 @@
+https://github.com/mumble-voip/mumble/commit/36398fb3b293fc889bbc38df29665359f5c2a0ca
+
+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 |
+--- 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;
+ 
diff --git a/media-sound/mumble/files/mumble-1.4.230-poco-link-cmake.patch b/media-sound/mumble/files/mumble-1.4.230-poco-link-cmake.patch
new file mode 100644
index 000000000000..d1b4dee11d51
--- /dev/null
+++ b/media-sound/mumble/files/mumble-1.4.230-poco-link-cmake.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/842984
+https://github.com/mumble-voip/mumble/commit/fefdd79ebcd53a3035967789d004938ee39e2030
+
+Fix underlinking against Poco.
+--- a/src/mumble/CMakeLists.txt
++++ b/src/mumble/CMakeLists.txt
+@@ -383,11 +383,16 @@ target_include_directories(mumble
+ 		"${PLUGINS_DIR}"
+ )
+ 
+-find_pkg(Poco COMPONENTS Zip)
++find_pkg(Poco
++	COMPONENTS
++		XML
++		Zip
++)
+ 
+ if(TARGET Poco::Zip)
+ 	target_link_libraries(mumble
+ 		PRIVATE
++			Poco::XML
+ 			Poco::Zip
+ 	)
+ else()
diff --git a/media-sound/mumble/mumble-1.4.230.ebuild b/media-sound/mumble/mumble-1.4.230.ebuild
index f2f4c7655554..c6c38d8a9fd2 100644
--- a/media-sound/mumble/mumble-1.4.230.ebuild
+++ b/media-sound/mumble/mumble-1.4.230.ebuild
@@ -32,7 +32,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.0b:0=
-	dev-libs/poco
+	dev-libs/poco[util,xml,zip]
 	>=dev-libs/protobuf-2.2.0:=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
@@ -71,6 +71,8 @@ BDEPEND="
 
 PATCHES=(
 	"${WORKDIR}/${PN}-1.4-openssl3.patch"
+	"${FILESDIR}/${PN}-1.4.230-gcc12-include-memory.patch"
+	"${FILESDIR}/${PN}-1.4.230-poco-link-cmake.patch"
 )
 
 src_prepare() {
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
index 7574a19a1ad6..65568a3e5235 100644
--- a/media-sound/mumble/mumble-9999.ebuild
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -30,7 +30,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.0b:0=
-	dev-libs/poco
+	dev-libs/poco[util,xml,zip]
 	>=dev-libs/protobuf-2.2.0:=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5