From 7f0ccc917c7abe6223784c703d86cd14755691fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 3 Jul 2021 22:39:47 +0100 Subject: gentoo resync : 03.07.2021 --- media-radio/fldigi/Manifest | 5 ++-- media-radio/fldigi/files/fldigi-c++11.patch | 41 ----------------------------- media-radio/fldigi/fldigi-4.1.18.ebuild | 5 ++-- media-radio/fldigi/fldigi-4.1.19.ebuild | 5 ++-- 4 files changed, 8 insertions(+), 48 deletions(-) delete mode 100644 media-radio/fldigi/files/fldigi-c++11.patch (limited to 'media-radio/fldigi') diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest index 0af038f7c37d..6420c462b9d9 100644 --- a/media-radio/fldigi/Manifest +++ b/media-radio/fldigi/Manifest @@ -1,6 +1,5 @@ -AUX fldigi-c++11.patch 1140 BLAKE2B 987d33126e80340d7687cc1e346a8cc8b5701c9f6a4259357c08c8ab828eb71d871e1bb70652f4d35a57243fbb0738db2c59717a822f178bf2c7afb960305c42 SHA512 a2399caf67947b129d32563d3deb0f209f0814e39ea48ea46f664bacf7b64a2639f9c237889004af45df6553ef5668ec9d5c389d3ea7a6fb9922f54654bcc9ee DIST fldigi-4.1.18.tar.gz 4847091 BLAKE2B 5b5ab773a78370b3c6ea86d63af7631bea97b16c3eacdb3d3b4e1b18dbbe70c727afa2ddf04c1ca7934f483503b2373d5d94bf4fcd896ad52a843c723a7c5cd2 SHA512 4d7fef4d464fcedf075d226bae7fd7134cd7436d737e17b7e21607e5120c957a909d1775900dbfea608c68629409c04eaa70a399bef6cba27b6e12b255696633 DIST fldigi-4.1.19.tar.gz 4900636 BLAKE2B 1fa8689bc3c0a8fff24514bd306c70815039b8610673e1834f6c2b567ef0c6e9170750ef208efd58c62fc2f872865ae30e64651c57eaeb14abc96896d73d0417 SHA512 68eaeb4879e58f648827d129fad7ccb799062ad220429f29afc6c75fd50794393bf31e130ba03628e409a2703d52598d2a04dfba8780960d32b132306cc177b4 -EBUILD fldigi-4.1.18.ebuild 1294 BLAKE2B 42e009ceec8ed2f22ada43ad5b7d0c4480b2e5b00dcc56a97bc992015da5d73485a70e6e3463d8e0e49dc29d04171854f1d3b27d7d9ec83cf217b1dc395e4c96 SHA512 cf08da38690c49cc7336be5e83644061374d802fdbd6e533ace5e7c20eeb396ce5cc4c29c294b3542b880f67a6f1582760db372fdaf94f4037ff9d444b7ce1ee -EBUILD fldigi-4.1.19.ebuild 1296 BLAKE2B 8bdafd397cf5c0180488f0c3a7c2245655b39774900c91e56a4be6b0dfcb7891c43a17e465fb685af5125cc6e4ca06a557b4efd9119ed039fee1e7843c186237 SHA512 df546d9fd3664c796e6fc9bffa921dbe7a7aaf145b9b3cfff1d42f2cd360ebd34991dc3b22378e838b58748eea6059dd0ee00f7a6ea83dfc37e819b16b19635a +EBUILD fldigi-4.1.18.ebuild 1317 BLAKE2B 0379f8ab2e176ca8fbd888fd906cd406c2f468dcfd9fae1928d4b9e793232a16aea066a9133e20fa4d46216c52ff2b34bb0f12194f582b1445e27328fc490fc8 SHA512 c88c5119577feb09ebbaf5f2133440f19cfa2eff2e6cf9900a4aa75db6bcc517fbbeed11a497d4fb4bb757879e27473ec080b6b882a01d7321c9df2d7deb7d44 +EBUILD fldigi-4.1.19.ebuild 1319 BLAKE2B 806fbc6d193482b178d239ee0eca4e71beb55d968c140cf78de4e423c1ab556fcd433b5d690538e16a8c675221792f33e14f07a396947ebe5a3504938fcc0b5b SHA512 7d5635b933350a67016eecde33ace8d55dd1b8379c52cba5d97764e29fe0b6f0a2819c99fcd41348bbee69cbfa5745dd11b93d8eb05e1909b74e31d04180bbb4 MISC metadata.xml 495 BLAKE2B 9c6f1b29ffb13a553b74ded93c11d29ffdc5a02336adb8fef55b862800a1856e712cdcb06c4e7d90858712d43aafce79f6cf9a357dc0a3c3ca0fc5cdb0ff770e SHA512 fdd9bc3f065ccb354ed0ad5c6544ca70f2011828870b942f2bf2f7001bf1342f858d60a6031cf005623795d1f1d2ccbc3a42fb54dcbd465c3c73f29a928d9091 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" -- cgit v1.2.3