| 1 |
commit: 9b2d57478d976e76b25b9dd71effd0cb1f0b6f77 |
| 2 |
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 1 05:40:14 2021 +0000 |
| 4 |
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 1 05:40:14 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b2d5747 |
| 7 |
|
| 8 |
media-radio/fldigi: Fix GCC-11 compilation problems (use C++14) |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/789627 |
| 11 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 12 |
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org> |
| 13 |
|
| 14 |
media-radio/fldigi/files/fldigi-c++11.patch | 41 ----------------------------- |
| 15 |
media-radio/fldigi/fldigi-4.1.18.ebuild | 5 ++-- |
| 16 |
media-radio/fldigi/fldigi-4.1.19.ebuild | 5 ++-- |
| 17 |
3 files changed, 6 insertions(+), 45 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-radio/fldigi/files/fldigi-c++11.patch b/media-radio/fldigi/files/fldigi-c++11.patch |
| 20 |
deleted file mode 100644 |
| 21 |
index 0ca08c484a5..00000000000 |
| 22 |
--- a/media-radio/fldigi/files/fldigi-c++11.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,41 +0,0 @@ |
| 25 |
-#fix -Werror=terminate |
| 26 |
---- /src/soundcard/sound.cxx.orig 2017-06-28 12:58:41.682698479 +0000 |
| 27 |
-+++ /src/soundcard/sound.cxx 2017-06-28 13:02:44.862055549 +0000 |
| 28 |
-@@ -143,7 +143,7 @@ |
| 29 |
- #endif |
| 30 |
- } |
| 31 |
- |
| 32 |
--SoundBase::~SoundBase() |
| 33 |
-+SoundBase::~SoundBase() throw (SndException) |
| 34 |
- { |
| 35 |
- delete [] wrt_buffer; |
| 36 |
- |
| 37 |
-@@ -1091,7 +1091,7 @@ |
| 38 |
- memset(fbuf, 0, 2 * SND_BUF_LEN * sizeof(*fbuf)); |
| 39 |
- } |
| 40 |
- |
| 41 |
--SoundPort::~SoundPort() |
| 42 |
-+SoundPort::~SoundPort() throw (SndException) |
| 43 |
- { |
| 44 |
- Close(); |
| 45 |
- |
| 46 |
---- /src/include/sound.h.orig 2017-06-28 12:59:04.670899172 +0000 |
| 47 |
-+++ /src/include/sound.h 2017-06-28 13:00:41.253335034 +0000 |
| 48 |
-@@ -119,7 +119,7 @@ |
| 49 |
- |
| 50 |
- public: |
| 51 |
- SoundBase(); |
| 52 |
-- virtual ~SoundBase(); |
| 53 |
-+ virtual ~SoundBase() throw (SndException); |
| 54 |
- virtual int Open(int mode, int freq = 8000) = 0; |
| 55 |
- virtual void Close(unsigned dir = UINT_MAX) = 0; |
| 56 |
- virtual void Abort(unsigned dir = UINT_MAX) = 0; |
| 57 |
-@@ -213,7 +213,7 @@ |
| 58 |
- |
| 59 |
- public: |
| 60 |
- SoundPort(const char *in_dev, const char *out_dev); |
| 61 |
-- ~SoundPort(); |
| 62 |
-+ ~SoundPort() throw (SndException); |
| 63 |
- int Open(int mode, int freq = 8000); |
| 64 |
- void Close(unsigned dir = UINT_MAX); |
| 65 |
- void Abort(unsigned dir = UINT_MAX); |
| 66 |
|
| 67 |
diff --git a/media-radio/fldigi/fldigi-4.1.18.ebuild b/media-radio/fldigi/fldigi-4.1.18.ebuild |
| 68 |
index 816703cc962..904b1023173 100644 |
| 69 |
--- a/media-radio/fldigi/fldigi-4.1.18.ebuild |
| 70 |
+++ b/media-radio/fldigi/fldigi-4.1.18.ebuild |
| 71 |
@@ -3,6 +3,8 @@ |
| 72 |
|
| 73 |
EAPI=7 |
| 74 |
|
| 75 |
+inherit flag-o-matic |
| 76 |
+ |
| 77 |
DESCRIPTION="Sound card based multimode software modem for Amateur Radio use" |
| 78 |
HOMEPAGE="http://www.w1hkj.com" |
| 79 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 80 |
@@ -33,9 +35,8 @@ DEPEND="${RDEPEND} |
| 81 |
|
| 82 |
DOCS=( AUTHORS ChangeLog NEWS README ) |
| 83 |
|
| 84 |
-PATCHES=( "${FILESDIR}"/${PN}-c++11.patch ) |
| 85 |
- |
| 86 |
src_configure() { |
| 87 |
+ append-cxxflags $(test-flags-CXX -std=c++14) |
| 88 |
local myconf="" |
| 89 |
|
| 90 |
use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse" |
| 91 |
|
| 92 |
diff --git a/media-radio/fldigi/fldigi-4.1.19.ebuild b/media-radio/fldigi/fldigi-4.1.19.ebuild |
| 93 |
index 179a9c3176a..d58de298fbf 100644 |
| 94 |
--- a/media-radio/fldigi/fldigi-4.1.19.ebuild |
| 95 |
+++ b/media-radio/fldigi/fldigi-4.1.19.ebuild |
| 96 |
@@ -3,6 +3,8 @@ |
| 97 |
|
| 98 |
EAPI=7 |
| 99 |
|
| 100 |
+inherit flag-o-matic |
| 101 |
+ |
| 102 |
DESCRIPTION="Sound card based multimode software modem for Amateur Radio use" |
| 103 |
HOMEPAGE="http://www.w1hkj.com" |
| 104 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 105 |
@@ -33,9 +35,8 @@ DEPEND="${RDEPEND} |
| 106 |
|
| 107 |
DOCS=( AUTHORS ChangeLog NEWS README ) |
| 108 |
|
| 109 |
-PATCHES=( "${FILESDIR}"/${PN}-c++11.patch ) |
| 110 |
- |
| 111 |
src_configure() { |
| 112 |
+ append-cxxflags $(test-flags-CXX -std=c++14) |
| 113 |
local myconf="" |
| 114 |
|
| 115 |
use cpu_flags_x86_sse && myconf="${myconf} --enable-optimizations=sse" |
Archives