* [gentoo-commits] repo/gentoo:master commit in: media-radio/flrig/files/, media-radio/flrig/
@ 2016-09-29 18:36 Thomas Beierlein
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Beierlein @ 2016-09-29 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 5d3e67b1032fe178a5efc7580d90a20b471b50ea
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 18:34:46 2016 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 18:36:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d3e67b1
media-radio/flrig: Fix bug #594906 wrt GCC6. Thanks Thoralf for reporting.
Package-Manager: portage-2.3.1
media-radio/flrig/files/flrig-1.3.26-gcc6.patch | 130 ++++++++++++++++++++++++
media-radio/flrig/flrig-1.3.26.ebuild | 1 +
2 files changed, 131 insertions(+)
diff --git a/media-radio/flrig/files/flrig-1.3.26-gcc6.patch b/media-radio/flrig/files/flrig-1.3.26-gcc6.patch
new file mode 100644
index 00000000..5866865
--- /dev/null
+++ b/media-radio/flrig/files/flrig-1.3.26-gcc6.patch
@@ -0,0 +1,130 @@
+--- src/support/xml_io.cxx.orig 2016-09-29 17:43:03.299747587 +0000
++++ src/support/xml_io.cxx 2016-09-29 17:43:41.639222816 +0000
+@@ -85,7 +85,7 @@
+
+ bool ptt_on = false;
+
+-int ignore = 0; // skip next "ignore" read loops
++int xml_ignore = 0; // skip next "xml_ignore" read loops
+
+ int try_count = CHECK_UPDATE_COUNT;
+
+@@ -155,7 +155,7 @@
+
+ try {
+ execute(rig_set_modes, modes, res);
+- ignore = 2;
++ xml_ignore = 2;
+ err_count = 5;
+ } catch (const XmlRpc::XmlRpcException& e) {
+ err_count--;
+@@ -176,7 +176,7 @@
+
+ try {
+ execute(rig_set_bandwidths, bandwidths, res);
+- ignore = 2;
++ xml_ignore = 2;
+ err_count = 5;
+ } catch (const XmlRpc::XmlRpcException& e) {
+ err_count--;
+@@ -190,7 +190,7 @@
+ try {
+ XmlRpcValue res;
+ execute(rig_set_name, XmlRpcValue(selrig->name_), res);
+- ignore = 2;
++ xml_ignore = 2;
+ err_count = 5;
+ } catch (const XmlRpc::XmlRpcException& e) {
+ err_count--;
+@@ -204,7 +204,7 @@
+ try {
+ XmlRpcValue res;
+ execute((PTT ? main_set_tx : main_set_rx), XmlRpcValue(), res);
+- ignore = 2;
++ xml_ignore = 2;
+ err_count = 5;
+ } catch (const XmlRpc::XmlRpcException& e) {
+ err_count--;
+@@ -219,7 +219,7 @@
+ xmlvfo.freq = freq;
+ XmlRpcValue f((double)freq), res;
+ execute(rig_set_frequency, f, res);
+- ignore = 2;
++ xml_ignore = 2;
+ err_count = 5;
+ } catch (const XmlRpc::XmlRpcException& e) {
+ err_count--;
+@@ -233,7 +233,7 @@
+ try {
+ XmlRpcValue mval((int)val), res;
+ execute(rig_set_smeter, mval, res);
+- ignore = 2;
++ xml_ignore = 2;
+ err_count = 5;
+ } catch (const XmlRpc::XmlRpcException& e) {
+ err_count--;
+@@ -247,7 +247,7 @@
+ try {
+ XmlRpcValue mval((int)val), res;
+ execute(rig_set_pwrmeter, mval, res);
+- ignore = 2;
++ xml_ignore = 2;
+ err_count = 5;
+ } catch (const XmlRpc::XmlRpcException& e) {
+ err_count--;
+@@ -261,7 +261,7 @@
+ try {
+ XmlRpcValue i(freq), res;
+ execute(rig_set_notch, i, res);
+- ignore = 2;
++ xml_ignore = 2;
+ err_count = 5;
+ if (freq == 0)
+ xml_notch_on = false;
+@@ -299,7 +299,7 @@
+ xmlvfo.imode = md;
+ XmlRpcValue mode(selrig->modes_[md]), res;
+ execute(rig_set_mode, mode, res);
+- ignore = 2;
++ xml_ignore = 2;
+ err_count = 5;
+ } catch (const XmlRpc::XmlRpcException& e) {
+ err_count--;
+@@ -315,7 +315,7 @@
+ int selbw = (bw > 0x80) ? (bw >> 8 & 0x7F) : bw;
+ XmlRpcValue bandwidth(selrig->bandwidths_[selbw]), res;
+ execute(rig_set_bandwidth, bandwidth, res);
+- ignore = 2;
++ xml_ignore = 2;
+ err_count = 5;
+ } catch (const XmlRpc::XmlRpcException& e) {
+ err_count--;
+@@ -329,7 +329,7 @@
+ try {
+ XmlRpcValue sideband(selrig->get_modetype(vfo.imode) == 'U' ? "USB" : "LSB"), res;
+ execute(main_set_wf_sideband, sideband, res);
+- ignore = 2;
++ xml_ignore = 2;
+ err_count = 5;
+ } catch (const XmlRpc::XmlRpcException& e) {
+ err_count--;
+@@ -501,7 +501,7 @@
+ LOG_ERROR("Connected");
+ Fl::awake(set_fldigi_connect, (void *)1);
+ err_count = 5;
+- ignore = 2;
++ xml_ignore = 2;
+ } catch (const XmlRpc::XmlRpcException& e) {
+ throw e;
+ }
+@@ -526,8 +526,8 @@
+
+ static void get_fldigi_status()
+ {
+- if (ignore) {
+- --ignore;
++ if (xml_ignore) {
++ --xml_ignore;
+ return;
+ }
+ XmlRpcValue status;
diff --git a/media-radio/flrig/flrig-1.3.26.ebuild b/media-radio/flrig/flrig-1.3.26.ebuild
index 6cf5e96..d73b458 100644
--- a/media-radio/flrig/flrig-1.3.26.ebuild
+++ b/media-radio/flrig/flrig-1.3.26.ebuild
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}"/fix-bashism.patch
+ epatch "${FILESDIR}"/${P}-gcc6.patch
eautoreconf
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/flrig/files/, media-radio/flrig/
@ 2017-01-24 6:12 Thomas Beierlein
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Beierlein @ 2017-01-24 6:12 UTC (permalink / raw
To: gentoo-commits
commit: 32e3d14ddc7bef8f3aa1c932eda702cc59cab7aa
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 06:05:38 2017 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 06:12:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32e3d14d
media-radio/flrig: Drop old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-radio/flrig/Manifest | 3 -
media-radio/flrig/files/flrig-1.3.26-gcc6.patch | 130 ------------------------
media-radio/flrig/flrig-1.3.22.ebuild | 32 ------
media-radio/flrig/flrig-1.3.25.ebuild | 32 ------
media-radio/flrig/flrig-1.3.26.ebuild | 33 ------
5 files changed, 230 deletions(-)
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index f860a99..bc7d51d 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,4 +1 @@
-DIST flrig-1.3.22.tar.gz 613526 SHA256 be30ceaf06a64cc7db9f12f0a7d1da597a5569f248323f2dc2cd037fd1730908 SHA512 51525de330ead7dd5f79d447dc53c6710a99faa4550c06fe3a80e6e504f67bd0a40fbd4befb907ee8770d7a69831ab993f1553e9ecb44e96d8140cc8471b3235 WHIRLPOOL a3370812bd01ef93555b5084c1f177ed1e965642e10e027ef4b98305f9436c8483391a3f79f36b7a0fe2c8102fbb87215f86ba782d4dcab2e12313f7e5310b1b
-DIST flrig-1.3.25.tar.gz 659060 SHA256 56e1ffb2ea6fccaa00141fe6efbc492d260efc7ea449aca827625095f5d8b257 SHA512 b845b125d58f4254f00d5e3fc758e7b3ee1cbf502df8d88058d47e791ef0e6fc4e5daccc477c4d1b5f716a9eaded309cb2e80b3b94499970620173a1c5c86b62 WHIRLPOOL 22f4932277e07c69e028b28fd3758ceda1011cc9591da67c7d02e78615d005d8977708aa43925c7412b153026998ceaa85999c7c4492d7fd2bbcfd80215575ec
-DIST flrig-1.3.26.tar.gz 659073 SHA256 b9367a70445fd5229b5fc7aba9d47970d0f32600b80c117084875a9ffb9a646b SHA512 1fd4169fa5fee80d9c36e7f663fafdc13dc32e9eed80a13e0b98734fbab7132708577a93f1cc7eaf84bf3ac8aba278b94ce07ef0e1183eca6bbf3c6147a2e811 WHIRLPOOL 76357ff07415dc6e5dfa046bef12a07d546c2cac7e4ba946e4ef46f1b804f148086a89d8f433e769ca08235196fe789bc5c00448b2dbea6796a278304711e150
DIST flrig-1.3.27.tar.gz 662603 SHA256 a05a040b17e9c0de1f564f50baa6a40a089e81d86131fe3994f467fec5287cb7 SHA512 416f0e7bfdec672d275efcc17a43ad1edf13fc43cdf0faf2108dd4d3b05d44ea23c1535b669ee931adbb3635de97a3b08d4dfa6c84fe66b7120d658d117ddd4f WHIRLPOOL 819ce7d841d2083819647b060379923888297a1ba899bf74b8047829719cb40aafd8a5bd6335f1f9bb1af204701878818d33f770cd0d2abccb6d181feac03339
diff --git a/media-radio/flrig/files/flrig-1.3.26-gcc6.patch b/media-radio/flrig/files/flrig-1.3.26-gcc6.patch
deleted file mode 100644
index 5866865..00000000
--- a/media-radio/flrig/files/flrig-1.3.26-gcc6.patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- src/support/xml_io.cxx.orig 2016-09-29 17:43:03.299747587 +0000
-+++ src/support/xml_io.cxx 2016-09-29 17:43:41.639222816 +0000
-@@ -85,7 +85,7 @@
-
- bool ptt_on = false;
-
--int ignore = 0; // skip next "ignore" read loops
-+int xml_ignore = 0; // skip next "xml_ignore" read loops
-
- int try_count = CHECK_UPDATE_COUNT;
-
-@@ -155,7 +155,7 @@
-
- try {
- execute(rig_set_modes, modes, res);
-- ignore = 2;
-+ xml_ignore = 2;
- err_count = 5;
- } catch (const XmlRpc::XmlRpcException& e) {
- err_count--;
-@@ -176,7 +176,7 @@
-
- try {
- execute(rig_set_bandwidths, bandwidths, res);
-- ignore = 2;
-+ xml_ignore = 2;
- err_count = 5;
- } catch (const XmlRpc::XmlRpcException& e) {
- err_count--;
-@@ -190,7 +190,7 @@
- try {
- XmlRpcValue res;
- execute(rig_set_name, XmlRpcValue(selrig->name_), res);
-- ignore = 2;
-+ xml_ignore = 2;
- err_count = 5;
- } catch (const XmlRpc::XmlRpcException& e) {
- err_count--;
-@@ -204,7 +204,7 @@
- try {
- XmlRpcValue res;
- execute((PTT ? main_set_tx : main_set_rx), XmlRpcValue(), res);
-- ignore = 2;
-+ xml_ignore = 2;
- err_count = 5;
- } catch (const XmlRpc::XmlRpcException& e) {
- err_count--;
-@@ -219,7 +219,7 @@
- xmlvfo.freq = freq;
- XmlRpcValue f((double)freq), res;
- execute(rig_set_frequency, f, res);
-- ignore = 2;
-+ xml_ignore = 2;
- err_count = 5;
- } catch (const XmlRpc::XmlRpcException& e) {
- err_count--;
-@@ -233,7 +233,7 @@
- try {
- XmlRpcValue mval((int)val), res;
- execute(rig_set_smeter, mval, res);
-- ignore = 2;
-+ xml_ignore = 2;
- err_count = 5;
- } catch (const XmlRpc::XmlRpcException& e) {
- err_count--;
-@@ -247,7 +247,7 @@
- try {
- XmlRpcValue mval((int)val), res;
- execute(rig_set_pwrmeter, mval, res);
-- ignore = 2;
-+ xml_ignore = 2;
- err_count = 5;
- } catch (const XmlRpc::XmlRpcException& e) {
- err_count--;
-@@ -261,7 +261,7 @@
- try {
- XmlRpcValue i(freq), res;
- execute(rig_set_notch, i, res);
-- ignore = 2;
-+ xml_ignore = 2;
- err_count = 5;
- if (freq == 0)
- xml_notch_on = false;
-@@ -299,7 +299,7 @@
- xmlvfo.imode = md;
- XmlRpcValue mode(selrig->modes_[md]), res;
- execute(rig_set_mode, mode, res);
-- ignore = 2;
-+ xml_ignore = 2;
- err_count = 5;
- } catch (const XmlRpc::XmlRpcException& e) {
- err_count--;
-@@ -315,7 +315,7 @@
- int selbw = (bw > 0x80) ? (bw >> 8 & 0x7F) : bw;
- XmlRpcValue bandwidth(selrig->bandwidths_[selbw]), res;
- execute(rig_set_bandwidth, bandwidth, res);
-- ignore = 2;
-+ xml_ignore = 2;
- err_count = 5;
- } catch (const XmlRpc::XmlRpcException& e) {
- err_count--;
-@@ -329,7 +329,7 @@
- try {
- XmlRpcValue sideband(selrig->get_modetype(vfo.imode) == 'U' ? "USB" : "LSB"), res;
- execute(main_set_wf_sideband, sideband, res);
-- ignore = 2;
-+ xml_ignore = 2;
- err_count = 5;
- } catch (const XmlRpc::XmlRpcException& e) {
- err_count--;
-@@ -501,7 +501,7 @@
- LOG_ERROR("Connected");
- Fl::awake(set_fldigi_connect, (void *)1);
- err_count = 5;
-- ignore = 2;
-+ xml_ignore = 2;
- } catch (const XmlRpc::XmlRpcException& e) {
- throw e;
- }
-@@ -526,8 +526,8 @@
-
- static void get_fldigi_status()
- {
-- if (ignore) {
-- --ignore;
-+ if (xml_ignore) {
-+ --xml_ignore;
- return;
- }
- XmlRpcValue status;
diff --git a/media-radio/flrig/flrig-1.3.22.ebuild b/media-radio/flrig/flrig-1.3.22.ebuild
deleted file mode 100644
index 9011615..00000000
--- a/media-radio/flrig/flrig-1.3.22.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Transceiver control program for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
-SRC_URI="http://www.w1hkj.com/downloads/flrig/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="x11-libs/libX11
- x11-libs/fltk:1
- x11-misc/xdg-utils"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext"
-
-src_prepare() {
- epatch "${FILESDIR}"/fix-bashism.patch
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog README
-}
diff --git a/media-radio/flrig/flrig-1.3.25.ebuild b/media-radio/flrig/flrig-1.3.25.ebuild
deleted file mode 100644
index e8fc0e2..00000000
--- a/media-radio/flrig/flrig-1.3.25.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Transceiver control program for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
-SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="x11-libs/libX11
- x11-libs/fltk:1
- x11-misc/xdg-utils"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext"
-
-src_prepare() {
- epatch "${FILESDIR}"/fix-bashism.patch
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog README
-}
diff --git a/media-radio/flrig/flrig-1.3.26.ebuild b/media-radio/flrig/flrig-1.3.26.ebuild
deleted file mode 100644
index cedd882..00000000
--- a/media-radio/flrig/flrig-1.3.26.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit autotools eutils
-
-DESCRIPTION="Transceiver control program for Amateur Radio use"
-HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
-SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="x11-libs/libX11
- x11-libs/fltk:1
- x11-misc/xdg-utils"
-
-DEPEND="${RDEPEND}
- sys-devel/gettext"
-
-src_prepare() {
- epatch "${FILESDIR}"/fix-bashism.patch
- epatch "${FILESDIR}"/${P}-gcc6.patch
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog README
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-radio/flrig/files/, media-radio/flrig/
@ 2024-01-06 13:08 Thomas Beierlein
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Beierlein @ 2024-01-06 13:08 UTC (permalink / raw
To: gentoo-commits
commit: d43d8da8f86d54b5f4f8dd707686b2eb81e5083c
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 6 13:05:19 2024 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat Jan 6 13:07:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d43d8da8
media-radio/flrig: Fix missing include for clang++
Closes: https://bugs.gentoo.org/921405
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
media-radio/flrig/files/flrig-2.0.04-stdint.patch | 13 +++++++++++++
media-radio/flrig/flrig-2.0.04.ebuild | 7 +++++--
media-radio/flrig/flrig-2.0.05.ebuild | 5 ++++-
3 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/media-radio/flrig/files/flrig-2.0.04-stdint.patch b/media-radio/flrig/files/flrig-2.0.04-stdint.patch
new file mode 100644
index 000000000000..9acd6ffb4dbc
--- /dev/null
+++ b/media-radio/flrig/files/flrig-2.0.04-stdint.patch
@@ -0,0 +1,13 @@
+# fix build with clang++ (bug #921405)
+diff --git a/src/widgets/FreqControl.cxx b/src/widgets/FreqControl.cxx
+index 2b1734b..e59dc9c 100644
+--- a/src/widgets/FreqControl.cxx
++++ b/src/widgets/FreqControl.cxx
+@@ -35,6 +35,7 @@
+ #endif
+
+ #include <string.h>
++#include <stdint.h>
+
+ #include "FreqControl.h"
+ #include "gettext.h"
diff --git a/media-radio/flrig/flrig-2.0.04.ebuild b/media-radio/flrig/flrig-2.0.04.ebuild
index a07e501860cf..0a9e7a5c39ab 100644
--- a/media-radio/flrig/flrig-2.0.04.ebuild
+++ b/media-radio/flrig/flrig-2.0.04.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -23,7 +23,10 @@ RDEPEND="x11-libs/libX11
DEPEND="${RDEPEND}
sys-devel/gettext"
-PATCHES=( "${FILESDIR}/${PN}-1.4.4-musl.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-1.4.4-musl.patch"
+ "${FILESDIR}/${PN}-2.0.04-stdint.patch"
+ )
src_prepare() {
eapply ${PATCHES[@]}
diff --git a/media-radio/flrig/flrig-2.0.05.ebuild b/media-radio/flrig/flrig-2.0.05.ebuild
index a5bc7dbf08a2..50fe129ea6b1 100644
--- a/media-radio/flrig/flrig-2.0.05.ebuild
+++ b/media-radio/flrig/flrig-2.0.05.ebuild
@@ -23,7 +23,10 @@ RDEPEND="x11-libs/libX11
DEPEND="${RDEPEND}
sys-devel/gettext"
-PATCHES=( "${FILESDIR}/${PN}-2.0.05-musl.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-2.0.05-musl.patch"
+ "${FILESDIR}/${PN}-2.0.04-stdint.patch"
+ )
src_prepare() {
eapply ${PATCHES[@]}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-01-06 13:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-29 18:36 [gentoo-commits] repo/gentoo:master commit in: media-radio/flrig/files/, media-radio/flrig/ Thomas Beierlein
-- strict thread matches above, loose matches on Subject: below --
2017-01-24 6:12 Thomas Beierlein
2024-01-06 13:08 Thomas Beierlein
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox