mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-24 18:58:08 -07:00
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:
@@ -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
|
||||
-
|
||||
|
||||
/*
|
||||
* ======================================
|
||||
@@ -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[@]}
|
||||
|
||||
@@ -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[@]}
|
||||
|
||||
Reference in New Issue
Block a user