gentoo resync : 16.04.2022

4 files changed, 44 insertions, 3 deletions

diff --git a/net-wireless/qdmr/Manifest b/net-wireless/qdmr/Manifest
index 5eff176c9e04..99f0fb027ffd 100644
--- a/net-wireless/qdmr/Manifest
+++ b/net-wireless/qdmr/Manifest
@@ -1,6 +1,7 @@
-DIST qdmr-0.10.0.tar.gz 5819245 BLAKE2B 5beb4cb876742911d00f34953d30c6e26ba41db3e6bf653bbde57d003fee712e2d5652cf9fba15332629491f8b3c43da7408094e187d47532976c088dc38046d SHA512 1764b6af3e90744ebe8300fd8e46038bca0ff1ba6ac0789a2b947ed9310efa8ca867a10a50f12a41cb150728a7b88c129df03e806d95b48533356b8142e2ada9
+AUX qdmr-0.10.2-musl.patch 1192 BLAKE2B 8426b283ca468f16af35a36efe9dd5a73fff1caa4d3fa14ebfbce03c611f9c02400eb3c00374ee358fc9892d5a907f1de3c8770736c2b7806c3c607b38457a3b SHA512 773f6788c570cf60eabcb1b04b69be71f9ad875a59baa05b06892b690d1b01ca0390fc4618a7fe534d186e676be54b50f3b86342f208f9b75fb285f47a1af0b0
+DIST qdmr-0.10.2.tar.gz 5903169 BLAKE2B 1ef4e9846dd4206d1eae3cfb5562fccec24b156bfd77a82e801e8d1194b969bbda0f14e99c1b6505d18abba4a79d87c5eee2232110969faf4c078c1fe781a8ee SHA512 96a3fd22be2b8f77a4925cfb426de12a55b29ee73eaf78869091fd0ecd36d2df51195f2ca70689857e190767c4651d3d4915a0b7aa9f5c6e429f46a53edb991c
 DIST qdmr-0.9.1.tar.gz 5629155 BLAKE2B 7ffa285c784af1416361c8c2fd74c976c490854d24f348983a0a8c294f8213bfa48a768c9148d40d3e71b7347b908960ed6dbf2ca54bfae155414e9a2254c32d SHA512 7df32462fd7555c791fe643f2632f218aef85614bee442422bf542910cb3c48b0d8606fc1797bbd02b16c7c30825cad51774bd4bd2ed1d89446d672b874dd2b1
-EBUILD qdmr-0.10.0.ebuild 1338 BLAKE2B b39f547f3d89dc38f369731545f2512cb0c82cad3783e6db12e2567b2aaf48a22a614df58e2039c387ec72a0103d40ac6202b7598af0496309f3482c140c5423 SHA512 abb0c74ab4736b8812d67e06d9318c0dae8debdbe45327b3f5804566929b6bd8346632080ece67a4ced62fc9132dc7a2d281778e1de7cdb87016030b204e2388
+EBUILD qdmr-0.10.2.ebuild 1381 BLAKE2B 425c3f9ed095d48caec232cfb8da59c85ce9b34aad6af91b8ec2a701aab46a4fbd0087cc68d9ffbb9c4752df5962fb7a96ad25776fe6bf0b1ce71a464b4bb7ed SHA512 e48a7843293e418ffd770b9ffea6e9dfa2942fd53896191330e95b0d521eead6b0cf15881ab88235fa4dedfa20ebe6349a33671919422a0d785c244085c465bc
 EBUILD qdmr-0.9.1.ebuild 1331 BLAKE2B e8fdd54df680b737bfe10ce343ecb044ffe798685cc521ad89be0ebec2242c3c0a5ee2a11d00dff87784c9a71f2ab71785536c6f654d5e253a63b5d4389d0898 SHA512 529fe241cee0626936f237e709ebaf5214f561f5306648e3340ab81e7087374024a14616093962324f48e51520a1372e511b00a6e2e35d3e6397c93b046ddd37
 EBUILD qdmr-9999.ebuild 1338 BLAKE2B b39f547f3d89dc38f369731545f2512cb0c82cad3783e6db12e2567b2aaf48a22a614df58e2039c387ec72a0103d40ac6202b7598af0496309f3482c140c5423 SHA512 abb0c74ab4736b8812d67e06d9318c0dae8debdbe45327b3f5804566929b6bd8346632080ece67a4ced62fc9132dc7a2d281778e1de7cdb87016030b204e2388
-MISC metadata.xml 319 BLAKE2B 1ce9d4701527c9ba9f8d990413aa07b22bea984360611162da0baa235a71fffcd16fe13cd5ce6c8f4192e9533e0886358f40890756d9220cae5a6d6af7e903fb SHA512 b59a65526d21586cc142876a59fea232d8d8e34cc9faf85a05b17b45ea3e98383e3e4be92d639e489ec5c62c74c53253a4de26adf4151b877135c754cb08de70
+MISC metadata.xml 427 BLAKE2B 0435094250074437ba1f88146a4a0b7d109b473311316840f498c5c7e0f7386b17e6f2bddcda187e586bb766b81374296d27c8cf273e3baeb7d2c1d65dfd359e SHA512 9a6aa1424549762fab24407eace1ebac36564e46dbcdf17dbe7ba3853a552763dbf765c67ce20e6a536ce1ee063ac1932bc1426a1061f697c6f0bc462a017125
diff --git a/net-wireless/qdmr/files/qdmr-0.10.2-musl.patch b/net-wireless/qdmr/files/qdmr-0.10.2-musl.patch
new file mode 100644
index 000000000000..21673cb4ebb2
--- /dev/null
+++ b/net-wireless/qdmr/files/qdmr-0.10.2-musl.patch
@@ -0,0 +1,34 @@
+From eca81fba54b156707545967b78c823cc38b1b53f Mon Sep 17 00:00:00 2001
+From: Hannes Matuschek <hmatuschek@gmail.com>
+Date: Wed, 6 Apr 2022 15:29:02 +0200
+Subject: [PATCH] Fixed compilation issue under Genoo. Addresses #216.
+
+---
+ lib/radiolimits.cc | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/lib/radiolimits.cc b/lib/radiolimits.cc
+index b883cc8..eb72166 100644
+--- a/lib/radiolimits.cc
++++ b/lib/radiolimits.cc
+@@ -3,9 +3,10 @@
+ #include "logger.hh"
+ #include "config.hh"
+ #include <QMetaProperty>
++#include <ctype.h>
+ 
+ // Utility function to check string content for ASCII encoding
+-inline bool isascii(const QString &text) {
++inline bool qstring_is_ascii(const QString &text) {
+   foreach (QChar c, text) {
+     if ((c<0x1f) && (0x7f != c))
+       return false;
+@@ -205,7 +206,7 @@ RadioLimitString::verify(const ConfigItem *item, const QMetaProperty &prop, Radi
+         << ") is shorter than minimum size " << _minLen << ".";
+   }
+ 
+-  if ((ASCII == _encoding) && (! isascii(value))) {
++  if ((ASCII == _encoding) && (! qstring_is_ascii(value))) {
+     auto &msg = context.newMessage();
+     msg << "Cannot encode string '" << value << "' in ASCII.";
+   }
diff --git a/net-wireless/qdmr/metadata.xml b/net-wireless/qdmr/metadata.xml
index d03ef4bc4f35..e6c5a00f9bfe 100644
--- a/net-wireless/qdmr/metadata.xml
+++ b/net-wireless/qdmr/metadata.xml
@@ -5,6 +5,10 @@
 		<email>radio@gentoo.org</email>
 		<name>Radio</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>anarchy@gentoo.org</email>
+		<name>Jory A. Pratt</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">hmatuschek/qdmr</remote-id>
 	</upstream>
diff --git a/net-wireless/qdmr/qdmr-0.10.0.ebuild b/net-wireless/qdmr/qdmr-0.10.2.ebuild
index f46aebabe549..6297f6df454e 100644
--- a/net-wireless/qdmr/qdmr-0.10.0.ebuild
+++ b/net-wireless/qdmr/qdmr-0.10.2.ebuild
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5"
 BDEPEND=""
 
+PATCHES=( "${FILESDIR}/${P}-musl.patch" )
+
 pkg_setup() {
 	CONFIG_CHECK="~USB_ACM"
 	WARNING_USB_ACM="Some radios require CONFIG_USB_ACM to work, you may need to enable this driver to talk to your radio"