diff options
| author |   Sam James <sam@gentoo.org> | 2021-08-20 02:06:32 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-08-20 02:10:24 +0100 |
| commit | 70fb657a44f8967db0d1096ebfc1b21d978e8d5a (patch) | |
| tree | af9584f86ed2fe19cd660c7bdb179c9e67845a97 | |
| parent | dev-libs/weston: Stabilize 9.0.0-r1 arm64, #806324 (diff) | |
| download | gentoo-70fb657a44f8967db0d1096ebfc1b21d978e8d5a.tar.gz gentoo-70fb657a44f8967db0d1096ebfc1b21d978e8d5a.tar.bz2 gentoo-70fb657a44f8967db0d1096ebfc1b21d978e8d5a.zip | |
media-plugins/vdr-fritzbox: fix build with GCC 11
See: https://github.com/jowi24/libnetpp/pull/1
Closes: https://bugs.gentoo.org/808665
Signed-off-by: Sam James <sam@gentoo.org>
4 files changed, 24 insertions, 12 deletions
diff --git a/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-boost-1.67.patch b/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-boost-1.67.patch index f57338782795..c47d6e849dc1 100644 --- a/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-boost-1.67.patch +++ b/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-boost-1.67.patch @@ -4,12 +4,6 @@ Date: Thu, 28 Jun 2018 12:56:54 +0200 Subject: [PATCH] Add compatibility with boost 1.67 Refers to https://github.com/jowi24/vdr-fritz/issues/1 ---- - TcpClient.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/TcpClient.cpp b/TcpClient.cpp -index b9b38e9..c6cc08e 100644 --- a/libnet++/TcpClient.cpp +++ b/libnet++/TcpClient.cpp @@ -19,6 +19,7 @@ diff --git a/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-gcc11-include.patch b/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-gcc11-include.patch new file mode 100644 index 000000000000..923a24112f0e --- /dev/null +++ b/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3-gcc11-include.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/808665 +https://github.com/jowi24/libnetpp/pull/1 + +From: Sam James <sam@gentoo.org> +Date: Fri, 20 Aug 2021 02:03:34 +0100 +Subject: [PATCH] Add missing <map> include + +Needed for std::map. Fixes GCC 11 build. +--- a/libnet++/HttpClient.h ++++ b/libnet++/HttpClient.h +@@ -22,6 +22,7 @@ + #ifndef HTTPCLIENT_H + #define HTTPCLIENT_H + ++#include <map> + #include <string> + + #include "TcpClient.h" diff --git a/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3_clang.patch b/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3_clang.patch index 1819244ffbaa..b6d0326ef763 100644 --- a/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3_clang.patch +++ b/media-plugins/vdr-fritzbox/files/vdr-fritzbox-1.5.3_clang.patch @@ -3,9 +3,8 @@ compile fix llvm/clang https://bugs.gentoo.org/740290 Signed-off-by: Joerg Bornkessel <hd_brummy@gentoo.org> (14 May 2021) -diff -Naur fritzbox-1.5.3.orig/notifyosd.cpp fritzbox-1.5.3/notifyosd.cpp ---- fritzbox-1.5.3.orig/notifyosd.cpp 2021-05-14 14:20:08.973067369 +0200 -+++ fritzbox-1.5.3/notifyosd.cpp 2021-05-14 14:21:17.945067369 +0200 +--- a/notifyosd.cpp ++++ b/notifyosd.cpp @@ -128,7 +128,7 @@ delete osd; osd = cOsdProvider::NewOsd(left, top); diff --git a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r4.ebuild b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r4.ebuild index 8d282d5f871b..628b4bc7e06e 100644 --- a/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r4.ebuild +++ b/media-plugins/vdr-fritzbox/vdr-fritzbox-1.5.3-r4.ebuild @@ -21,9 +21,10 @@ DEPEND=" RDEPEND="${DEPEND}" PATCHES=( - "${FILESDIR}/${P}-boost-1.67.patch" - "${FILESDIR}/${P}_clang.patch" - ) + "${FILESDIR}/${P}-boost-1.67.patch" + "${FILESDIR}/${P}_clang.patch" + "${FILESDIR}/${P}-gcc11-include.patch" +) src_prepare() { vdr-plugin-2_src_prepare |