summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2021-04-23 09:18:34 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2021-04-23 09:18:34 +0100
commit01192083a2063b785dc3806b5468d8bc46e1a746 (patch)
treeb2d3683f240dfd25745b5f00e74b17a65b939a28 /app-misc
parentmedia-video/vlc: tweak for gcc-11 (diff)
downloadgentoo-01192083a2063b785dc3806b5468d8bc46e1a746.tar.gz
gentoo-01192083a2063b785dc3806b5468d8bc46e1a746.tar.bz2
gentoo-01192083a2063b785dc3806b5468d8bc46e1a746.zip
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@gentoo.org>
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/gnote/files/gnote-3.38.1-cstddef.patch35
-rw-r--r--app-misc/gnote/gnote-3.38.1.ebuild2
-rw-r--r--app-misc/gnote/gnote-40.0.ebuild2
3 files changed, 39 insertions, 0 deletions
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 000000000000..0ea65b9bbd26
--- /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 <hadess@hadess.net>
+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 4b9eda389846..6f20625b348c 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 efc4bc97c4f3..d59f76c84cde 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