| 1 |
commit: fa650a14a85055ca24681cc7eae1a2cdf76e7456 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 11 01:29:54 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 11 01:29:54 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa650a14 |
| 7 |
|
| 8 |
media-sound/mumble: backport upstream fixes for new Poco, GCC 12 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/842984 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../mumble-1.4.230-gcc12-include-memory.patch | 28 ++++++++++++++++++++++ |
| 14 |
.../files/mumble-1.4.230-poco-link-cmake.patch | 24 +++++++++++++++++++ |
| 15 |
media-sound/mumble/mumble-1.4.230.ebuild | 2 ++ |
| 16 |
3 files changed, 54 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 000000000000..624a8594d995 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-sound/mumble/files/mumble-1.4.230-gcc12-include-memory.patch |
| 23 |
@@ -0,0 +1,28 @@ |
| 24 |
+https://github.com/mumble-voip/mumble/commit/36398fb3b293fc889bbc38df29665359f5c2a0ca |
| 25 |
+ |
| 26 |
+From: Sergei Trofimovich <slyich@×××××.com> |
| 27 |
+Date: Sun, 27 Feb 2022 10:59:57 +0000 |
| 28 |
+Subject: [PATCH] BUILD(positional-audio): Fix missing <memory> include |
| 29 |
+ |
| 30 |
+Without the change the build fails on upcoming gcc-12 as: |
| 31 |
+ |
| 32 |
+ /build/mumble/plugins/gtav/gtav.cpp:13:13: |
| 33 |
+ error: 'unique_ptr' in namespace 'std' does not name a template type |
| 34 |
+ 13 | static std::unique_ptr< Game > game; |
| 35 |
+ | ^~~~~~~~~~ |
| 36 |
+ /build/mumble/plugins/gtav/gtav.cpp:12:1: |
| 37 |
+ note: 'std::unique_ptr' is defined in header '<memory>'; |
| 38 |
+ did you forget to '#include <memory>'? |
| 39 |
+ 11 | #include <cstring> |
| 40 |
+ +++ |+#include <memory> |
| 41 |
+ 12 | |
| 42 |
+--- a/plugins/gtav/gtav.cpp |
| 43 |
++++ b/plugins/gtav/gtav.cpp |
| 44 |
+@@ -9,6 +9,7 @@ |
| 45 |
+ #include "mumble_positional_audio_utils.h" |
| 46 |
+ |
| 47 |
+ #include <cstring> |
| 48 |
++#include <memory> |
| 49 |
+ |
| 50 |
+ static std::unique_ptr< Game > game; |
| 51 |
+ |
| 52 |
|
| 53 |
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 |
| 54 |
new file mode 100644 |
| 55 |
index 000000000000..d1b4dee11d51 |
| 56 |
--- /dev/null |
| 57 |
+++ b/media-sound/mumble/files/mumble-1.4.230-poco-link-cmake.patch |
| 58 |
@@ -0,0 +1,24 @@ |
| 59 |
+https://bugs.gentoo.org/842984 |
| 60 |
+https://github.com/mumble-voip/mumble/commit/fefdd79ebcd53a3035967789d004938ee39e2030 |
| 61 |
+ |
| 62 |
+Fix underlinking against Poco. |
| 63 |
+--- a/src/mumble/CMakeLists.txt |
| 64 |
++++ b/src/mumble/CMakeLists.txt |
| 65 |
+@@ -383,11 +383,16 @@ target_include_directories(mumble |
| 66 |
+ "${PLUGINS_DIR}" |
| 67 |
+ ) |
| 68 |
+ |
| 69 |
+-find_pkg(Poco COMPONENTS Zip) |
| 70 |
++find_pkg(Poco |
| 71 |
++ COMPONENTS |
| 72 |
++ XML |
| 73 |
++ Zip |
| 74 |
++) |
| 75 |
+ |
| 76 |
+ if(TARGET Poco::Zip) |
| 77 |
+ target_link_libraries(mumble |
| 78 |
+ PRIVATE |
| 79 |
++ Poco::XML |
| 80 |
+ Poco::Zip |
| 81 |
+ ) |
| 82 |
+ else() |
| 83 |
|
| 84 |
diff --git a/media-sound/mumble/mumble-1.4.230.ebuild b/media-sound/mumble/mumble-1.4.230.ebuild |
| 85 |
index 8ddd32995916..c6c38d8a9fd2 100644 |
| 86 |
--- a/media-sound/mumble/mumble-1.4.230.ebuild |
| 87 |
+++ b/media-sound/mumble/mumble-1.4.230.ebuild |
| 88 |
@@ -71,6 +71,8 @@ BDEPEND=" |
| 89 |
|
| 90 |
PATCHES=( |
| 91 |
"${WORKDIR}/${PN}-1.4-openssl3.patch" |
| 92 |
+ "${FILESDIR}/${PN}-1.4.230-gcc12-include-memory.patch" |
| 93 |
+ "${FILESDIR}/${PN}-1.4.230-poco-link-cmake.patch" |
| 94 |
) |
| 95 |
|
| 96 |
src_prepare() { |
Archives