| 1 |
commit: 5d3e67b1032fe178a5efc7580d90a20b471b50ea |
| 2 |
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 29 18:34:46 2016 +0000 |
| 4 |
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 29 18:36:04 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d3e67b1 |
| 7 |
|
| 8 |
media-radio/flrig: Fix bug #594906 wrt GCC6. Thanks Thoralf for reporting. |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.1 |
| 11 |
|
| 12 |
media-radio/flrig/files/flrig-1.3.26-gcc6.patch | 130 ++++++++++++++++++++++++ |
| 13 |
media-radio/flrig/flrig-1.3.26.ebuild | 1 + |
| 14 |
2 files changed, 131 insertions(+) |
| 15 |
|
| 16 |
diff --git a/media-radio/flrig/files/flrig-1.3.26-gcc6.patch b/media-radio/flrig/files/flrig-1.3.26-gcc6.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000..5866865 |
| 19 |
--- /dev/null |
| 20 |
+++ b/media-radio/flrig/files/flrig-1.3.26-gcc6.patch |
| 21 |
@@ -0,0 +1,130 @@ |
| 22 |
+--- src/support/xml_io.cxx.orig 2016-09-29 17:43:03.299747587 +0000 |
| 23 |
++++ src/support/xml_io.cxx 2016-09-29 17:43:41.639222816 +0000 |
| 24 |
+@@ -85,7 +85,7 @@ |
| 25 |
+ |
| 26 |
+ bool ptt_on = false; |
| 27 |
+ |
| 28 |
+-int ignore = 0; // skip next "ignore" read loops |
| 29 |
++int xml_ignore = 0; // skip next "xml_ignore" read loops |
| 30 |
+ |
| 31 |
+ int try_count = CHECK_UPDATE_COUNT; |
| 32 |
+ |
| 33 |
+@@ -155,7 +155,7 @@ |
| 34 |
+ |
| 35 |
+ try { |
| 36 |
+ execute(rig_set_modes, modes, res); |
| 37 |
+- ignore = 2; |
| 38 |
++ xml_ignore = 2; |
| 39 |
+ err_count = 5; |
| 40 |
+ } catch (const XmlRpc::XmlRpcException& e) { |
| 41 |
+ err_count--; |
| 42 |
+@@ -176,7 +176,7 @@ |
| 43 |
+ |
| 44 |
+ try { |
| 45 |
+ execute(rig_set_bandwidths, bandwidths, res); |
| 46 |
+- ignore = 2; |
| 47 |
++ xml_ignore = 2; |
| 48 |
+ err_count = 5; |
| 49 |
+ } catch (const XmlRpc::XmlRpcException& e) { |
| 50 |
+ err_count--; |
| 51 |
+@@ -190,7 +190,7 @@ |
| 52 |
+ try { |
| 53 |
+ XmlRpcValue res; |
| 54 |
+ execute(rig_set_name, XmlRpcValue(selrig->name_), res); |
| 55 |
+- ignore = 2; |
| 56 |
++ xml_ignore = 2; |
| 57 |
+ err_count = 5; |
| 58 |
+ } catch (const XmlRpc::XmlRpcException& e) { |
| 59 |
+ err_count--; |
| 60 |
+@@ -204,7 +204,7 @@ |
| 61 |
+ try { |
| 62 |
+ XmlRpcValue res; |
| 63 |
+ execute((PTT ? main_set_tx : main_set_rx), XmlRpcValue(), res); |
| 64 |
+- ignore = 2; |
| 65 |
++ xml_ignore = 2; |
| 66 |
+ err_count = 5; |
| 67 |
+ } catch (const XmlRpc::XmlRpcException& e) { |
| 68 |
+ err_count--; |
| 69 |
+@@ -219,7 +219,7 @@ |
| 70 |
+ xmlvfo.freq = freq; |
| 71 |
+ XmlRpcValue f((double)freq), res; |
| 72 |
+ execute(rig_set_frequency, f, res); |
| 73 |
+- ignore = 2; |
| 74 |
++ xml_ignore = 2; |
| 75 |
+ err_count = 5; |
| 76 |
+ } catch (const XmlRpc::XmlRpcException& e) { |
| 77 |
+ err_count--; |
| 78 |
+@@ -233,7 +233,7 @@ |
| 79 |
+ try { |
| 80 |
+ XmlRpcValue mval((int)val), res; |
| 81 |
+ execute(rig_set_smeter, mval, res); |
| 82 |
+- ignore = 2; |
| 83 |
++ xml_ignore = 2; |
| 84 |
+ err_count = 5; |
| 85 |
+ } catch (const XmlRpc::XmlRpcException& e) { |
| 86 |
+ err_count--; |
| 87 |
+@@ -247,7 +247,7 @@ |
| 88 |
+ try { |
| 89 |
+ XmlRpcValue mval((int)val), res; |
| 90 |
+ execute(rig_set_pwrmeter, mval, res); |
| 91 |
+- ignore = 2; |
| 92 |
++ xml_ignore = 2; |
| 93 |
+ err_count = 5; |
| 94 |
+ } catch (const XmlRpc::XmlRpcException& e) { |
| 95 |
+ err_count--; |
| 96 |
+@@ -261,7 +261,7 @@ |
| 97 |
+ try { |
| 98 |
+ XmlRpcValue i(freq), res; |
| 99 |
+ execute(rig_set_notch, i, res); |
| 100 |
+- ignore = 2; |
| 101 |
++ xml_ignore = 2; |
| 102 |
+ err_count = 5; |
| 103 |
+ if (freq == 0) |
| 104 |
+ xml_notch_on = false; |
| 105 |
+@@ -299,7 +299,7 @@ |
| 106 |
+ xmlvfo.imode = md; |
| 107 |
+ XmlRpcValue mode(selrig->modes_[md]), res; |
| 108 |
+ execute(rig_set_mode, mode, res); |
| 109 |
+- ignore = 2; |
| 110 |
++ xml_ignore = 2; |
| 111 |
+ err_count = 5; |
| 112 |
+ } catch (const XmlRpc::XmlRpcException& e) { |
| 113 |
+ err_count--; |
| 114 |
+@@ -315,7 +315,7 @@ |
| 115 |
+ int selbw = (bw > 0x80) ? (bw >> 8 & 0x7F) : bw; |
| 116 |
+ XmlRpcValue bandwidth(selrig->bandwidths_[selbw]), res; |
| 117 |
+ execute(rig_set_bandwidth, bandwidth, res); |
| 118 |
+- ignore = 2; |
| 119 |
++ xml_ignore = 2; |
| 120 |
+ err_count = 5; |
| 121 |
+ } catch (const XmlRpc::XmlRpcException& e) { |
| 122 |
+ err_count--; |
| 123 |
+@@ -329,7 +329,7 @@ |
| 124 |
+ try { |
| 125 |
+ XmlRpcValue sideband(selrig->get_modetype(vfo.imode) == 'U' ? "USB" : "LSB"), res; |
| 126 |
+ execute(main_set_wf_sideband, sideband, res); |
| 127 |
+- ignore = 2; |
| 128 |
++ xml_ignore = 2; |
| 129 |
+ err_count = 5; |
| 130 |
+ } catch (const XmlRpc::XmlRpcException& e) { |
| 131 |
+ err_count--; |
| 132 |
+@@ -501,7 +501,7 @@ |
| 133 |
+ LOG_ERROR("Connected"); |
| 134 |
+ Fl::awake(set_fldigi_connect, (void *)1); |
| 135 |
+ err_count = 5; |
| 136 |
+- ignore = 2; |
| 137 |
++ xml_ignore = 2; |
| 138 |
+ } catch (const XmlRpc::XmlRpcException& e) { |
| 139 |
+ throw e; |
| 140 |
+ } |
| 141 |
+@@ -526,8 +526,8 @@ |
| 142 |
+ |
| 143 |
+ static void get_fldigi_status() |
| 144 |
+ { |
| 145 |
+- if (ignore) { |
| 146 |
+- --ignore; |
| 147 |
++ if (xml_ignore) { |
| 148 |
++ --xml_ignore; |
| 149 |
+ return; |
| 150 |
+ } |
| 151 |
+ XmlRpcValue status; |
| 152 |
|
| 153 |
diff --git a/media-radio/flrig/flrig-1.3.26.ebuild b/media-radio/flrig/flrig-1.3.26.ebuild |
| 154 |
index 6cf5e96..d73b458 100644 |
| 155 |
--- a/media-radio/flrig/flrig-1.3.26.ebuild |
| 156 |
+++ b/media-radio/flrig/flrig-1.3.26.ebuild |
| 157 |
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND} |
| 158 |
|
| 159 |
src_prepare() { |
| 160 |
epatch "${FILESDIR}"/fix-bashism.patch |
| 161 |
+ epatch "${FILESDIR}"/${P}-gcc6.patch |
| 162 |
eautoreconf |
| 163 |
} |
Archives