gentoo auto-resync : 06:01:2024 - 18:54:07

7 files changed, 25 insertions, 31 deletions

diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index db4315f07170..fa9153703255 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index 9e2a9ea132ca..5aa48d2a042d 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,7 +1,8 @@
 AUX flrig-1.4.4-musl.patch 618 BLAKE2B e03367cea46747325ab98a9a9b2a7bb2b977e21e430d648e4ad2c8dd95665fc78d98b0d3fd3253953c9e714f5edc80031f5a236435e5b4ff5472e700809086fa SHA512 9d46857614b82053f64153ecf17e2d5ce89c419972d233d17ae5d237b0e7a2fa0756602adbf80bfc9a990978fbff5fbaeb56f186904490499055684a980e3d86
+AUX flrig-2.0.04-stdint.patch 328 BLAKE2B 211cb7434ab8cd48ec42f8d0b2891a6921b65b9c72a7d3eadc3fc8e290693a7226fd9734ba2ddf090a24ba02aa8ddd1843048dc4861ca42227c1ba85fc6592db SHA512 e30f83145a4bdedb95e8720c41c10821a6a47b049ef2106df6773b88f4da9d55c06562941ff19f753b38568f497f46fedd722dc63dfca3677c59ae5032abbcde
 AUX flrig-2.0.05-musl.patch 698 BLAKE2B 2bfb6a616a8bf1afffde3c9bd2f6326d54ad6a3d170009ffa0a0604486545ad348d1d78db387a22afbc30541840ea4a3cecc596f824164ef6eb796d066d0e054 SHA512 53b3b144965bc1f73ef86fea3fde8607127460648c6c1e2a4b167f1248339d3a8f8828fd2d41568609fb415fc74a3e3f5b2ff3c80dcb9d166d0eb95b28b36e0a
 DIST flrig-2.0.04.tar.gz 1108760 BLAKE2B 9ca60d182c5b94f17e8baefebc822792111954b3c11f03e5cabd570e60769804c9ec1153afd36a074f16e9880792d6b51b5545e59b988adffee912e7b6d2a8e5 SHA512 db1a4bb148900fb9e1a6feb44fd5a017d8aac1a2f81e577e78176c241adc39cf05378057bc97ad997581ed0d3d8a79f3ec726d1d194322b46d709df6e913c84f
 DIST flrig-2.0.05.tar.gz 1112204 BLAKE2B 58cda5069546aee790bb819f9ac2713896281de283345fa6a84c466c67b5cce236c63dec41ad3a226849195fba982c4b69b4d5d386ffb0f4d8b14767ca9cc6bf SHA512 a06df0f8810212a1f614899be162e1d0373f29492bca26718b4385b8fba3be4293b95e366cb391fb938d40228bb5d091049414c7ae2104dbd7a0ddd2011dc88b
-EBUILD flrig-2.0.04.ebuild 687 BLAKE2B 8faf287f1fcb779333e1b87bc653157738791bdea9ab4de88927b4683b4cc95f5073f0381b226f48fb8b65c65fa51daa7015c10958b9f84b6745f69e9022e364 SHA512 ec6be778b481dd400173f197ef12304e7cfe2eab7efe058ab5b80cfd19caa58bd4de003fd90967f7d4adb6e20686ca1a3b67ea4389cbc22c3758827b2693fcd2
-EBUILD flrig-2.0.05.ebuild 690 BLAKE2B d1bda08a44abda4bab017fa298516e0ea8fff0b1d04d2977b0fc2c41c7bc10bab9216e05fe501eae46eec48b2cad9cf509e7b3ad7d2d0080cd63554c417a4703 SHA512 4cb18235e4dbe6320cff31ee2eb866fe7dcd10bd46ffdba301c47f9f756277504d2a56809d09c08b196e33da49ecb9c253953f6ab69d8368f63e3790c62d8b23
+EBUILD flrig-2.0.04.ebuild 732 BLAKE2B 5bbd373ac825cd0d2449c34f731a5476fb6dffc172661f7124a52cf72768741b3661ea052db51b7a6a316915e699a643f01c695c288d3e51a6d069b615014bf3 SHA512 bcba79dd84589ba164ed2d391acb2afddfef51b19700cd006ffa9431848e55888917599b4e823377852f5507a245c766b12c76c69d2d8b842b4cd9f0917e7ce5
+EBUILD flrig-2.0.05.ebuild 735 BLAKE2B 5edaed67013baa91264650c06b7e32960d72d78cf4a0a21b57a6fb185e33165c7408208974f992f6ca8fdbc659a8cf02ef4ad48b68f4a8bb8fab0b23457956b9 SHA512 0da2c49bb975edf4bdbaf64ab2d07d0d45f4ca5a0028ebb2ef0915e08c99739b977974bfa40ef6a68c0db4750571d14f0841411f919921a5ed719aaedb3fce84
 MISC metadata.xml 326 BLAKE2B fb57e943fa61222b3967939ff95da7bb17aae2651e55d960a9c405e6d5965843ed0ec9e6fadd0df1f41602c0f3c90c78c6ca2ab12ea72b515484f7c2ec34ec68 SHA512 e48dc185e9eaa074ed92d1ed27920e41b72760cd3e878fd40583efdca0a6997598a7d82221a33c7987fb19dea090f92eee070b9e89ea452ddce028d88db7bf9c
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[@]}
diff --git a/media-radio/xdx/Manifest b/media-radio/xdx/Manifest
index 6006bcde969e..2042bb32e67b 100644
--- a/media-radio/xdx/Manifest
+++ b/media-radio/xdx/Manifest
@@ -1,4 +1,3 @@
-AUX xdx-2.5.0-fno-common.patch 720 BLAKE2B 9ac513df6b9d6f4bd4ab34f97ec3bf5d7815d441b85b4ec6dcbd2b1318988b76660e9997bcd39a9585761387ea1aeb617ae98ee37bf74393848e46078487d502 SHA512 43c1a08ba59a06a8d8d6984e78a117328f4ee8910b8cef2cb66e6415a432a54131a48f8018e4fc4c2f85562bb9c3cbd79bd087fd6b57810088bb4ffb5fdb225c
 DIST xdx-2.91.tar.gz 346342 BLAKE2B 4f66801b5ad51bdee9daf9a0015f92ae9a1515ea8e2c8dc77d68163fb704e9e2390178b5d78f0277fb50588a41a329d63d58f1bb71ec3c2cc84db56da68abc66 SHA512 900837bd283085ff4183389a8f8d505a7208e3b0314deb3a2c674486c9e8cc09042e4d88d5956c6a6a8e67443eb1079ed40587476d4726416033fe83db8398a9
 EBUILD xdx-2.91.ebuild 798 BLAKE2B 02c2f2df7ae526daede6189fc84f18f228a4e1e8cdb24844e94c121a0bffd834180a920326c983dafcc281ecfcaed4358051748225b3a31bfaed57dfb660d3d6 SHA512 30898c233d78393cb97c2341fd0c7853e3289b172f36bc1a606ec9f14a1e436ab9b8fbcc0d6f5b66a55ba071d84cfdb1c184649932936de7add047f1699095a5
 MISC metadata.xml 336 BLAKE2B fd0ec7ca2ad3a08ef259151d9a4b7f84ac3d49c91b1fb1210fd6decfcf16032e5877d8d9bc90e419243cb3f6ece16aab126e50cf29a7b513835abf7d57c22a6d SHA512 e0d60044ab0c46ff6a14b40bf52a488723363829c5ee7a67431b3c0c65ecb5444cb2ae47a5d93a514c996c1cf643ff94feab07369b868a3943899be725576e4f
diff --git a/media-radio/xdx/files/xdx-2.5.0-fno-common.patch b/media-radio/xdx/files/xdx-2.5.0-fno-common.patch
deleted file mode 100644
index a707d09b0a78..000000000000
--- a/media-radio/xdx/files/xdx-2.5.0-fno-common.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/src/gui.c b/src/gui.c
-index a3af442..5298c11 100644
---- a/src/gui.c
-+++ b/src/gui.c
-@@ -76,6 +76,7 @@ extern preferencestype preferences;
- static void on_highcheck_toggled(GtkToggleButton *togglebutton, gpointer user_data);
- static void on_soundcheck_toggled(GtkToggleButton *togglebutton, gpointer user_data);
- 
-+guitype *gui;
- 
- /**********************************MAIN WINDOW********************************/
- guitype *
-diff --git a/src/gui.h b/src/gui.h
-index 77b442f..6ba406f 100644
---- a/src/gui.h
-+++ b/src/gui.h
-@@ -53,7 +53,7 @@ typedef struct guitype {
-     gchar           *high8tagname;
- } guitype;
- 
--guitype *gui;
-+extern guitype *gui;
- 
- guitype *new_gui(void);
- void create_mainwindow(void);