commit: 01192083a2063b785dc3806b5468d8bc46e1a746 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Fri Apr 23 08:18:34 2021 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Fri Apr 23 08:18:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01192083
app-misc/gnote: tweak for gcc-11 Reported-by: Kobboi Closes: https://bugs.gentoo.org/768198 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> app-misc/gnote/files/gnote-3.38.1-cstddef.patch | 35 +++++++++++++++++++++++++ app-misc/gnote/gnote-3.38.1.ebuild | 2 ++ app-misc/gnote/gnote-40.0.ebuild | 2 ++ 3 files changed, 39 insertions(+) diff --git a/app-misc/gnote/files/gnote-3.38.1-cstddef.patch b/app-misc/gnote/files/gnote-3.38.1-cstddef.patch new file mode 100644 index 00000000000..0ea65b9bbd2 --- /dev/null +++ b/app-misc/gnote/files/gnote-3.38.1-cstddef.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/768198 + +From 49e652613a1e28f1220f593ba18108839d3d2505 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <[email protected]> +Date: Mon, 22 Mar 2021 15:04:01 +0100 +Subject: [PATCH] Fix AbstractAddin compilation error +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +gnote/src/abstractaddin.cpp: In constructor ‘gnote::AbstractAddin::AbstractAddin()’: +gnote/src/abstractaddin.cpp:29:15: error: ‘NULL’ was not declared in this scope + 29 | : m_gnote(NULL) + | ^~~~ +gnote/src/abstractaddin.cpp:25:1: note: ‘NULL’ is defined in header ‘<cstddef>’; did you forget to ‘#include <cstddef>’? + 24 | #include "abstractaddin.hpp" + +++ |+#include <cstddef> + 25 | +--- + src/abstractaddin.cpp | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/abstractaddin.cpp ++++ b/src/abstractaddin.cpp +@@ -22,6 +22,7 @@ + + + #include "abstractaddin.hpp" ++#include <cstddef> + + namespace gnote { + +-- +2.31.1 + diff --git a/app-misc/gnote/gnote-3.38.1.ebuild b/app-misc/gnote/gnote-3.38.1.ebuild index 4b9eda38984..6f20625b348 100644 --- a/app-misc/gnote/gnote-3.38.1.ebuild +++ b/app-misc/gnote/gnote-3.38.1.ebuild @@ -38,6 +38,8 @@ DEPEND="${DEPEND} virtual/pkgconfig " +PATCHES=("${FILESDIR}"/${PN}-3.38.1-cstddef.patch) + src_prepare() { # Do not alter CFLAGS sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die diff --git a/app-misc/gnote/gnote-40.0.ebuild b/app-misc/gnote/gnote-40.0.ebuild index efc4bc97c4f..d59f76c84cd 100644 --- a/app-misc/gnote/gnote-40.0.ebuild +++ b/app-misc/gnote/gnote-40.0.ebuild @@ -37,6 +37,8 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=("${FILESDIR}"/${PN}-3.38.1-cstddef.patch) + src_prepare() { # Do not alter CFLAGS sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die
