| 1 |
commit: ee50e145da2f9a2cb21019c15bc012d58a1cbc62 |
| 2 |
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 28 13:40:15 2017 +0000 |
| 4 |
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 28 13:40:15 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee50e145 |
| 7 |
|
| 8 |
media-radio/fldigi: Fix -Werror=terminate problem (bug #622686) Tnx Toralf. |
| 9 |
|
| 10 |
Furthermore fix homepage |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 13 |
|
| 14 |
media-radio/fldigi/files/fldigi-c++11.patch | 41 ++++++++++++++++++++++ |
| 15 |
...{fldigi-4.0.5.ebuild => fldigi-4.0.4-r1.ebuild} | 16 ++++++--- |
| 16 |
media-radio/fldigi/fldigi-4.0.5.ebuild | 6 ++++ |
| 17 |
3 files changed, 58 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-radio/fldigi/files/fldigi-c++11.patch b/media-radio/fldigi/files/fldigi-c++11.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..0ca08c484a5 |
| 22 |
--- /dev/null |
| 23 |
+++ b/media-radio/fldigi/files/fldigi-c++11.patch |
| 24 |
@@ -0,0 +1,41 @@ |
| 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.0.5.ebuild b/media-radio/fldigi/fldigi-4.0.4-r1.ebuild |
| 68 |
similarity index 73% |
| 69 |
copy from media-radio/fldigi/fldigi-4.0.5.ebuild |
| 70 |
copy to media-radio/fldigi/fldigi-4.0.4-r1.ebuild |
| 71 |
index 7821860fabf..46fd4cc3670 100644 |
| 72 |
--- a/media-radio/fldigi/fldigi-4.0.5.ebuild |
| 73 |
+++ b/media-radio/fldigi/fldigi-4.0.4-r1.ebuild |
| 74 |
@@ -3,6 +3,8 @@ |
| 75 |
|
| 76 |
EAPI=5 |
| 77 |
|
| 78 |
+inherit eutils |
| 79 |
+ |
| 80 |
DESCRIPTION="Sound card based multimode software modem for Amateur Radio use" |
| 81 |
HOMEPAGE="http://www.w1hkj.com" |
| 82 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 83 |
@@ -10,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 84 |
LICENSE="GPL-3" |
| 85 |
SLOT="0" |
| 86 |
KEYWORDS="~amd64 ~x86" |
| 87 |
-IUSE="hamlib nls pulseaudio" |
| 88 |
+IUSE="hamlib nls portaudio pulseaudio sndfile" |
| 89 |
|
| 90 |
RDEPEND="x11-libs/fltk:1[threads,xft] |
| 91 |
media-libs/libsamplerate |
| 92 |
@@ -18,19 +20,23 @@ RDEPEND="x11-libs/fltk:1[threads,xft] |
| 93 |
x11-misc/xdg-utils |
| 94 |
dev-perl/RPC-XML |
| 95 |
dev-perl/Term-ReadLine-Perl |
| 96 |
- >=media-libs/portaudio-19_pre20071207 |
| 97 |
hamlib? ( media-libs/hamlib ) |
| 98 |
+ portaudio? ( >=media-libs/portaudio-19_pre20071207 ) |
| 99 |
pulseaudio? ( media-sound/pulseaudio ) |
| 100 |
- >=media-libs/libsndfile-1.0.10" |
| 101 |
+ sndfile? ( >=media-libs/libsndfile-1.0.10 )" |
| 102 |
DEPEND="${RDEPEND} |
| 103 |
nls? ( sys-devel/gettext ) |
| 104 |
virtual/pkgconfig" |
| 105 |
|
| 106 |
DOCS=( AUTHORS ChangeLog NEWS README ) |
| 107 |
|
| 108 |
+src_prepare() { |
| 109 |
+ epatch "$FILESDIR"/$PN-c++11.patch |
| 110 |
+} |
| 111 |
+ |
| 112 |
src_configure() { |
| 113 |
- econf --with-sndfile \ |
| 114 |
- --with-portaudio \ |
| 115 |
+ econf $(use_with sndfile) \ |
| 116 |
+ $(use_with portaudio) \ |
| 117 |
$(use_with hamlib) \ |
| 118 |
$(use_enable nls) \ |
| 119 |
$(use_with pulseaudio) \ |
| 120 |
|
| 121 |
diff --git a/media-radio/fldigi/fldigi-4.0.5.ebuild b/media-radio/fldigi/fldigi-4.0.5.ebuild |
| 122 |
index 7821860fabf..1610c05c209 100644 |
| 123 |
--- a/media-radio/fldigi/fldigi-4.0.5.ebuild |
| 124 |
+++ b/media-radio/fldigi/fldigi-4.0.5.ebuild |
| 125 |
@@ -3,6 +3,8 @@ |
| 126 |
|
| 127 |
EAPI=5 |
| 128 |
|
| 129 |
+inherit eutils |
| 130 |
+ |
| 131 |
DESCRIPTION="Sound card based multimode software modem for Amateur Radio use" |
| 132 |
HOMEPAGE="http://www.w1hkj.com" |
| 133 |
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
| 134 |
@@ -28,6 +30,10 @@ DEPEND="${RDEPEND} |
| 135 |
|
| 136 |
DOCS=( AUTHORS ChangeLog NEWS README ) |
| 137 |
|
| 138 |
+src_prepare() { |
| 139 |
+ epatch "$FILESDIR"/$PN-c++11.patch |
| 140 |
+} |
| 141 |
+ |
| 142 |
src_configure() { |
| 143 |
econf --with-sndfile \ |
| 144 |
--with-portaudio \ |
Archives