commit: ee50e145da2f9a2cb21019c15bc012d58a1cbc62
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 13:40:15 2017 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 13:40:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee50e145
media-radio/fldigi: Fix -Werror=terminate problem (bug #622686) Tnx Toralf.
Furthermore fix homepage
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-radio/fldigi/files/fldigi-c++11.patch | 41 ++++++++++++++++++++++
...{fldigi-4.0.5.ebuild => fldigi-4.0.4-r1.ebuild} | 16 ++++++---
media-radio/fldigi/fldigi-4.0.5.ebuild | 6 ++++
3 files changed, 58 insertions(+), 5 deletions(-)
diff --git a/media-radio/fldigi/files/fldigi-c++11.patch
b/media-radio/fldigi/files/fldigi-c++11.patch
new file mode 100644
index 00000000000..0ca08c484a5
--- /dev/null
+++ b/media-radio/fldigi/files/fldigi-c++11.patch
@@ -0,0 +1,41 @@
+#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.0.5.ebuild
b/media-radio/fldigi/fldigi-4.0.4-r1.ebuild
similarity index 73%
copy from media-radio/fldigi/fldigi-4.0.5.ebuild
copy to media-radio/fldigi/fldigi-4.0.4-r1.ebuild
index 7821860fabf..46fd4cc3670 100644
--- a/media-radio/fldigi/fldigi-4.0.5.ebuild
+++ b/media-radio/fldigi/fldigi-4.0.4-r1.ebuild
@@ -3,6 +3,8 @@
EAPI=5
+inherit eutils
+
DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
HOMEPAGE="http://www.w1hkj.com";
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -10,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="hamlib nls pulseaudio"
+IUSE="hamlib nls portaudio pulseaudio sndfile"
RDEPEND="x11-libs/fltk:1[threads,xft]
media-libs/libsamplerate
@@ -18,19 +20,23 @@ RDEPEND="x11-libs/fltk:1[threads,xft]
x11-misc/xdg-utils
dev-perl/RPC-XML
dev-perl/Term-ReadLine-Perl
- >=media-libs/portaudio-19_pre20071207
hamlib? ( media-libs/hamlib )
+ portaudio? ( >=media-libs/portaudio-19_pre20071207 )
pulseaudio? ( media-sound/pulseaudio )
- >=media-libs/libsndfile-1.0.10"
+ sndfile? ( >=media-libs/libsndfile-1.0.10 )"
DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
virtual/pkgconfig"
DOCS=( AUTHORS ChangeLog NEWS README )
+src_prepare() {
+ epatch "$FILESDIR"/$PN-c++11.patch
+}
+
src_configure() {
- econf --with-sndfile \
- --with-portaudio \
+ econf $(use_with sndfile) \
+ $(use_with portaudio) \
$(use_with hamlib) \
$(use_enable nls) \
$(use_with pulseaudio) \
diff --git a/media-radio/fldigi/fldigi-4.0.5.ebuild
b/media-radio/fldigi/fldigi-4.0.5.ebuild
index 7821860fabf..1610c05c209 100644
--- a/media-radio/fldigi/fldigi-4.0.5.ebuild
+++ b/media-radio/fldigi/fldigi-4.0.5.ebuild
@@ -3,6 +3,8 @@
EAPI=5
+inherit eutils
+
DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
HOMEPAGE="http://www.w1hkj.com";
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -28,6 +30,10 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog NEWS README )
+src_prepare() {
+ epatch "$FILESDIR"/$PN-c++11.patch
+}
+
src_configure() {
econf --with-sndfile \
--with-portaudio \
