commit: 25ac22594b472987a75c1cb389fbb1ff9457542b Author: Kenton Groombridge <concord <AT> gentoo <DOT> org> AuthorDate: Wed Aug 31 14:20:40 2022 +0000 Commit: Kenton Groombridge <concord <AT> gentoo <DOT> org> CommitDate: Wed Aug 31 14:50:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25ac2259
net-voip/mumble/files: drop obsolete patches Signed-off-by: Kenton Groombridge <concord <AT> gentoo.org> .../mumble-1.4.230-gcc12-include-memory.patch | 28 ---------------------- .../files/mumble-1.4.230-poco-link-cmake.patch | 24 ------------------- 2 files changed, 52 deletions(-) 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 deleted file mode 100644 index 624a8594d995..000000000000 --- a/net-voip/mumble/files/mumble-1.4.230-gcc12-include-memory.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://github.com/mumble-voip/mumble/commit/36398fb3b293fc889bbc38df29665359f5c2a0ca - -From: Sergei Trofimovich <[email protected]> -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/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 deleted file mode 100644 index d1b4dee11d51..000000000000 --- a/net-voip/mumble/files/mumble-1.4.230-poco-link-cmake.patch +++ /dev/null @@ -1,24 +0,0 @@ -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()
