media-radio/fldigi: Drop problematic definition of nullptr

Closes: https://bugs.gentoo.org/870082
Signed-off-by: Thomas Beierlein <tomjbe@gentoo.org>
This commit is contained in:
Thomas Beierlein
2022-09-17 14:11:20 +02:00
parent dd5ecc4e4e
commit 2d149b09fb
3 changed files with 27 additions and 2 deletions

View File

@@ -0,0 +1,23 @@
# dropped code leeds to circular definition for >=sys-libs/musl-1.2.3 and
# is not needed as all our compilers support c++11
diff --git a/src/logbook/table.cxx b/src/logbook/table.cxx
index 6deee6d..8011d02 100644
--- a/src/logbook/table.cxx
+++ b/src/logbook/table.cxx
@@ -40,16 +40,6 @@
#define DAMAGE_HEADER FL_DAMAGE_ALL
#define DAMAGE_ROWS FL_DAMAGE_ALL
-/*
- * nullptr is not available in gcc < 4.6
- * Redefine to NULL for CentOS 6 and OSX Darwin
- */
-#ifndef __FreeBSD__
- #ifndef nullptr
- #define nullptr NULL
- #endif
-#endif
-
/*
* ======================================

View File

@@ -35,7 +35,8 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog NEWS README )
PATCHES=( "${FILESDIR}/${PN}-4.1.20-musl.patch" )
PATCHES=( "${FILESDIR}/${PN}-4.1.20-musl.patch"
"${FILESDIR}/${PN}-drop-nullptr-definition.patch" )
src_prepare() {
eapply ${PATCHES[@]}

View File

@@ -35,7 +35,8 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog NEWS README )
PATCHES=( "${FILESDIR}/${PN}-4.1.20-musl.patch" )
PATCHES=( "${FILESDIR}/${PN}-4.1.20-musl.patch"
"${FILESDIR}/${PN}-drop-nullptr-definition.patch" )
src_prepare() {
eapply ${PATCHES[@]}