fldigi: fix build, distfile, adopt

rafeyu · Nov 9, 2023 · f12967c · f12967c
1 parent 23892b3
commit f12967c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/srcpkgs/fldigi/patches/nullptr-def.patch b/srcpkgs/fldigi/patches/nullptr-def.patch
@@ -0,0 +1,23 @@
+from https://gitweb.gentoo.org/repo/gentoo.git/tree/media-radio/fldigi/files/fldigi-drop-nullptr-definition.patch
+
+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/srcpkgs/fldigi/template b/srcpkgs/fldigi/template
@@ -7,8 +7,9 @@ hostmakedepends="pkg-config"
 makedepends="fltk-devel libsamplerate-devel portaudio-devel pulseaudio-devel
  hamlib-devel libusb-devel"
 short_desc="Ham radio digital modem for CW, PSK, MFSK, RTTY, and others"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-3.0-or-later"
 homepage="http://www.w1hkj.com"
-distfiles="http://www.w1hkj.com/files/fldigi/fldigi-${version}.tar.gz"
+# distfiles="http://www.w1hkj.com/files/fldigi/fldigi-${version}.tar.gz"
+distfiles="https://sources.voidlinux.org/fldigi-4.1.25/fldigi-4.1.25.tar.gz"
 checksum=4ec4bf392da65f0aac93e13ef4c12811320745692cf0783fab0f164660310763