[gentoo-commits] repo/gentoo:master commit in: media-radio/fldigi/files/, media-radio/fldigi/

["Thomas Beierlein" <tomjbe@gentoo.org>]

commit:     2d149b09fb7c013457a0c866a3a6a4f9e72c3ee3
Author:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 12:11:20 2022 +0000
Commit:     Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 12:11:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d149b09

media-radio/fldigi: Drop problematic definition of nullptr

Closes: https://bugs.gentoo.org/870082
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>

 .../files/fldigi-drop-nullptr-definition.patch     | 23 ++++++++++++++++++++++
 media-radio/fldigi/fldigi-4.1.22.ebuild            |  3 ++-
 media-radio/fldigi/fldigi-4.1.23.ebuild            |  3 ++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/media-radio/fldigi/files/fldigi-drop-nullptr-definition.patch b/media-radio/fldigi/files/fldigi-drop-nullptr-definition.patch
new file mode 100644
index 000000000000..8e14c6e0ca39
--- /dev/null
+++ b/media-radio/fldigi/files/fldigi-drop-nullptr-definition.patch
@@ -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
+-
+ 
+ /*
+  * ======================================

diff --git a/media-radio/fldigi/fldigi-4.1.22.ebuild b/media-radio/fldigi/fldigi-4.1.22.ebuild
index b6268dae8b30..13f0cf746f6b 100644
--- a/media-radio/fldigi/fldigi-4.1.22.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.22.ebuild
@@ -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[@]}

diff --git a/media-radio/fldigi/fldigi-4.1.23.ebuild b/media-radio/fldigi/fldigi-4.1.23.ebuild
index 78512dcf4f0c..56b0232ac656 100644
--- a/media-radio/fldigi/fldigi-4.1.23.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.23.ebuild
@@ -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[@]}