summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Beierlein <tomjbe@gentoo.org>2021-07-01 07:40:14 +0200
committerThomas Beierlein <tomjbe@gentoo.org>2021-07-01 07:40:14 +0200
commit9b2d57478d976e76b25b9dd71effd0cb1f0b6f77 (patch)
tree6f27c5e5124a832792599111a24a4e78e61874bf /media-radio
parentmedia-sound/a2jmidid: python support is back (diff)
downloadgentoo-9b2d57478d976e76b25b9dd71effd0cb1f0b6f77.tar.gz
gentoo-9b2d57478d976e76b25b9dd71effd0cb1f0b6f77.tar.bz2
gentoo-9b2d57478d976e76b25b9dd71effd0cb1f0b6f77.zip
media-radio/fldigi: Fix GCC-11 compilation problems (use C++14)
Closes: https://bugs.gentoo.org/789627 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Thomas Beierlein <tomjbe@gentoo.org>
Diffstat (limited to 'media-radio')
-rw-r--r--media-radio/fldigi/files/fldigi-c++11.patch41
-rw-r--r--media-radio/fldigi/fldigi-4.1.18.ebuild5
-rw-r--r--media-radio/fldigi/fldigi-4.1.19.ebuild5
3 files changed, 6 insertions, 45 deletions
diff --git a/media-radio/fldigi/files/fldigi-c++11.patch b/media-radio/fldigi/files/fldigi-c++11.patch
deleted file mode 100644
index 0ca08c484a59..000000000000
--- a/media-radio/fldigi/files/fldigi-c++11.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-#fix -Werror=terminate
---- /src/soundcard/sound.cxx.orig 2017-06-28 12:58:41.682698479 +0000
-+++ /src/soundcard/sound.cxx 2017-06-28 13:02:44.862055549 +0000
-@@ -143,7 +143,7 @@
- #endif
- }
-
--SoundBase::~SoundBase()
-+SoundBase::~SoundBase() throw (SndException)
- {
- delete [] wrt_buffer;
-
-@@ -1091,7 +1091,7 @@
- memset(fbuf, 0, 2 * SND_BUF_LEN * sizeof(*fbuf));
- }
-
--SoundPort::~SoundPort()
-+SoundPort::~SoundPort() throw (SndException)
- {
- Close();
-
---- /src/include/sound.h.orig 2017-06-28 12:59:04.670899172 +0000
-+++ /src/include/sound.h 2017-06-28 13:00:41.253335034 +0000
-@@ -119,7 +119,7 @@
-
- public:
- SoundBase();
-- virtual ~SoundBase();
-+ virtual ~SoundBase() throw (SndException);
- virtual int Open(int mode, int freq = 8000) = 0;
- virtual void Close(unsigned dir = UINT_MAX) = 0;
- virtual void Abort(unsigned dir = UINT_MAX) = 0;
-@@ -213,7 +213,7 @@
-
- public:
- SoundPort(const char *in_dev, const char *out_dev);
-- ~SoundPort();
-+ ~SoundPort() throw (SndException);
- int Open(int mode, int freq = 8000);
- void Close(unsigned dir = UINT_MAX);
- void Abort(unsigned dir = UINT_MAX);
diff --git a/media-radio/fldigi/fldigi-4.1.18.ebuild b/media-radio/fldigi/fldigi-4.1.18.ebuild
index 816703cc962d..904b10231739 100644
--- a/media-radio/fldigi/fldigi-4.1.18.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.18.ebuild
@@ -3,6 +3,8 @@
EAPI=7
+inherit flag-o-matic
+
DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
HOMEPAGE="http://www.w1hkj.com"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -33,9 +35,8 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog NEWS README )
-PATCHES=( "${FILESDIR}"/${PN}-c++11.patch )
-
src_configure() {
+ append-cxxflags $(test-flags-CXX -std=c++14)
local myconf=""
use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"
diff --git a/media-radio/fldigi/fldigi-4.1.19.ebuild b/media-radio/fldigi/fldigi-4.1.19.ebuild
index 179a9c3176ab..d58de298fbf0 100644
--- a/media-radio/fldigi/fldigi-4.1.19.ebuild
+++ b/media-radio/fldigi/fldigi-4.1.19.ebuild
@@ -3,6 +3,8 @@
EAPI=7
+inherit flag-o-matic
+
DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
HOMEPAGE="http://www.w1hkj.com"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -33,9 +35,8 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog NEWS README )
-PATCHES=( "${FILESDIR}"/${PN}-c++11.patch )
-
src_configure() {
+ append-cxxflags $(test-flags-CXX -std=c++14)
local myconf=""
use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse"