| 1 |
commit: 25ac22594b472987a75c1cb389fbb1ff9457542b |
| 2 |
Author: Kenton Groombridge <concord <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 31 14:20:40 2022 +0000 |
| 4 |
Commit: Kenton Groombridge <concord <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 31 14:50:24 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25ac2259 |
| 7 |
|
| 8 |
net-voip/mumble/files: drop obsolete patches |
| 9 |
|
| 10 |
Signed-off-by: Kenton Groombridge <concord <AT> gentoo.org> |
| 11 |
|
| 12 |
.../mumble-1.4.230-gcc12-include-memory.patch | 28 ---------------------- |
| 13 |
.../files/mumble-1.4.230-poco-link-cmake.patch | 24 ------------------- |
| 14 |
2 files changed, 52 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-voip/mumble/files/mumble-1.4.230-gcc12-include-memory.patch b/net-voip/mumble/files/mumble-1.4.230-gcc12-include-memory.patch |
| 17 |
deleted file mode 100644 |
| 18 |
index 624a8594d995..000000000000 |
| 19 |
--- a/net-voip/mumble/files/mumble-1.4.230-gcc12-include-memory.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,28 +0,0 @@ |
| 22 |
-https://github.com/mumble-voip/mumble/commit/36398fb3b293fc889bbc38df29665359f5c2a0ca |
| 23 |
- |
| 24 |
-From: Sergei Trofimovich <slyich@×××××.com> |
| 25 |
-Date: Sun, 27 Feb 2022 10:59:57 +0000 |
| 26 |
-Subject: [PATCH] BUILD(positional-audio): Fix missing <memory> include |
| 27 |
- |
| 28 |
-Without the change the build fails on upcoming gcc-12 as: |
| 29 |
- |
| 30 |
- /build/mumble/plugins/gtav/gtav.cpp:13:13: |
| 31 |
- error: 'unique_ptr' in namespace 'std' does not name a template type |
| 32 |
- 13 | static std::unique_ptr< Game > game; |
| 33 |
- | ^~~~~~~~~~ |
| 34 |
- /build/mumble/plugins/gtav/gtav.cpp:12:1: |
| 35 |
- note: 'std::unique_ptr' is defined in header '<memory>'; |
| 36 |
- did you forget to '#include <memory>'? |
| 37 |
- 11 | #include <cstring> |
| 38 |
- +++ |+#include <memory> |
| 39 |
- 12 | |
| 40 |
---- a/plugins/gtav/gtav.cpp |
| 41 |
-+++ b/plugins/gtav/gtav.cpp |
| 42 |
-@@ -9,6 +9,7 @@ |
| 43 |
- #include "mumble_positional_audio_utils.h" |
| 44 |
- |
| 45 |
- #include <cstring> |
| 46 |
-+#include <memory> |
| 47 |
- |
| 48 |
- static std::unique_ptr< Game > game; |
| 49 |
- |
| 50 |
|
| 51 |
diff --git a/net-voip/mumble/files/mumble-1.4.230-poco-link-cmake.patch b/net-voip/mumble/files/mumble-1.4.230-poco-link-cmake.patch |
| 52 |
deleted file mode 100644 |
| 53 |
index d1b4dee11d51..000000000000 |
| 54 |
--- a/net-voip/mumble/files/mumble-1.4.230-poco-link-cmake.patch |
| 55 |
+++ /dev/null |
| 56 |
@@ -1,24 +0,0 @@ |
| 57 |
-https://bugs.gentoo.org/842984 |
| 58 |
-https://github.com/mumble-voip/mumble/commit/fefdd79ebcd53a3035967789d004938ee39e2030 |
| 59 |
- |
| 60 |
-Fix underlinking against Poco. |
| 61 |
---- a/src/mumble/CMakeLists.txt |
| 62 |
-+++ b/src/mumble/CMakeLists.txt |
| 63 |
-@@ -383,11 +383,16 @@ target_include_directories(mumble |
| 64 |
- "${PLUGINS_DIR}" |
| 65 |
- ) |
| 66 |
- |
| 67 |
--find_pkg(Poco COMPONENTS Zip) |
| 68 |
-+find_pkg(Poco |
| 69 |
-+ COMPONENTS |
| 70 |
-+ XML |
| 71 |
-+ Zip |
| 72 |
-+) |
| 73 |
- |
| 74 |
- if(TARGET Poco::Zip) |
| 75 |
- target_link_libraries(mumble |
| 76 |
- PRIVATE |
| 77 |
-+ Poco::XML |
| 78 |
- Poco::Zip |
| 79 |
- ) |
| 80 |
- else() |
Archives