gentoo auto-resync : 15:04:2023 - 05:47:25

4 files changed, 30 insertions, 1 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 737762a5a1e5..563962e18b11 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 1e11c4a1e311..17e853588ef8 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -9,6 +9,7 @@ AUX audacity-3.2.3-allow-overriding-alsa-jack.patch 1683 BLAKE2B bd8081283dfc87e
 AUX audacity-3.2.3-disable-ccache.patch 850 BLAKE2B 0f8fab52e0f8205c90b0ed798d1793cbde1395715445ac66e6d9b612fd825650f38dc95759b56d0d7455f45202e901de4d2cea3c54ede17356f3ff4f1c8c61ff SHA512 468676dfeff2aa40a3ccbab3c4eb5cf04a8dae0db2772c580d6455b93b4feb9665b3badab7ea8085a6bce1ab243e7c8b0fc2974ab7b2c703db7c49f757bdd48e
 AUX audacity-3.2.3-fix-rpaths.patch 5961 BLAKE2B d48471ba4cea8103fd1caef6e3e13356e9c8103b7edb239a55e89975e455eb82efa6c0bf348aa2be6eedb10ae95753d3f104d7646cbe21a7dcc45e1274928e2a SHA512 b1f7449d13961f3e5d073f2f8cc0443f5e050733d76cbd94dc2dd764b7b1438339cc9155765637767f692c6781760a8b3776bbdaf36c57f4af7cbc7ca51d81fd
 AUX audacity-3.2.3-remove-conan-threadpool.patch 1681 BLAKE2B d5b32185ae961c1ab49fd28410de857b7e3eddaeebf2435dd77c526912ff06a604500c8af2357dc8c601fc032823c74beec4c207cca58fa074d950de6cace6fb SHA512 4a4ee937be644587114e9e097178859ae369e3519475224ea22095ecf51971215b7873b3d9f05ff4f6dcb12c31741448381621c250e159824c818fa61238f0c1
+AUX audacity-3.2.5-gcc13.patch 550 BLAKE2B de4b1bacbc3606562c9989df8631fd20c97538be05a9a00e1aa6b323de7c07ab38fef05eb47449e47966e54d9ae089e53cf799508666f63c79462306176b244a SHA512 76379252380237cf5c39476a4502a8bfb575740ed1094bd9ed79e2e890710c7a0fbad9209691d5d95c4b96d737383155f3877a061af33deb7d873d9d25f83d2f
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
 DIST Audacity-3.2.4.tar.gz 57016943 BLAKE2B df36f5f7162cc6303b2bcb4861f0b418fd3dfd97a8d664b9c0fe1e84b57df5342864a82e7652c2e706e723b6eb6faded50a0ce4fb96f36ac1e6ba48726db40a7 SHA512 d69459839760f0db7d23ad5ee5601e0a0b8e918a7f9ad6773bb45b525f732d09ff0fc6ca59c6400b62d7b0b905411dd97673b6d6f2102c9ed549e9f833b60a96
 DIST Audacity-3.2.5.tar.gz 57017533 BLAKE2B b8e48cab1c89cadb343a17fcb1d811a7363231152867f842ffff6dd8329103c9a407beb3f0b587e35e711070230c5c86d5aa97578b5a7c08bdbb029570677a24 SHA512 850ce4dc27e2c6d0b63bf0c0186deb417febc49b561e572a697f0e7ae2a7b2b3f39816b7beeacf9cbfb9525de85923e2ce6d06486fcf1855e34e2ecd1b7e3582
@@ -18,5 +19,5 @@ DIST audacity-manual-3.2.5.tar.gz 22260237 BLAKE2B e3c96282b5eeffe5854781cfe316f
 DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14 SHA512 f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d
 EBUILD audacity-2.4.2-r3.ebuild 3964 BLAKE2B ad71e2a7c308660527a10a2e756c99752a35b6b1f77e04a1e28143c2038d080249c543d92ec2ed4b72037549dd8aa87959b9bea87e466f3eeb8625de9defd950 SHA512 94fc4f9012e63998628ae0c28d0d3d04f80422651af6a6ee9bd2907648923a7c5cf0179e49a047e9f7809ee1f52614e7e393eff3d93e8d218fa567c5ede2b809
 EBUILD audacity-3.2.4.ebuild 6929 BLAKE2B f4ceb2ebd0c3a5c6e9b70b5b89ee571cf625549cb0f3be54763307cc084971ad28b67f92bc5b6e612632eb545de99b65fb0b8ee1a6c6444d1baf3d9627b9dcfe SHA512 b2557f22c5a8508899debd35f5f3c891fb1bcffdf3e10c68223248c248701730d1f6d8923f9d405ef9aa4d1354bbae368f303b60c819e6429a9f5068b09d3e36
-EBUILD audacity-3.2.5.ebuild 6929 BLAKE2B f4ceb2ebd0c3a5c6e9b70b5b89ee571cf625549cb0f3be54763307cc084971ad28b67f92bc5b6e612632eb545de99b65fb0b8ee1a6c6444d1baf3d9627b9dcfe SHA512 b2557f22c5a8508899debd35f5f3c891fb1bcffdf3e10c68223248c248701730d1f6d8923f9d405ef9aa4d1354bbae368f303b60c819e6429a9f5068b09d3e36
+EBUILD audacity-3.2.5.ebuild 6979 BLAKE2B 73572e00e3a77240b8b2a92beab27c641c3f7a8d796377576f93e54fa9c83cfd3828971e08d2888f176f1f293a50184fec5ba328f248f7aceaaf08144bfeafe1 SHA512 74a1f5125dd66aa71ad5e6ddc2d1a35c7eba1ec51c6d7c07b164cdb1a8af1193b5382009552bff4998521952df4c7d439b0477b2a5cec9315dc5d1b914867c23
 MISC metadata.xml 1512 BLAKE2B 277533c5356fb9fee5f353c14f43886e2823cf11f50deff855e31b039e197dd9daeab65dd133461e468f6bf2862b72e910ea36f67bceedec00a5e2234a386db5 SHA512 f66ee862c1fa473e825afc68186b1e2ecc3e7f4bb49272fde63b7b52afb2075795632c0690dd37ded5390a180720297d12b33360f34a4050640080b906ea0a28
diff --git a/media-sound/audacity/audacity-3.2.5.ebuild b/media-sound/audacity/audacity-3.2.5.ebuild
index 9b1ee5735698..0d2e26a3d311 100644
--- a/media-sound/audacity/audacity-3.2.5.ebuild
+++ b/media-sound/audacity/audacity-3.2.5.ebuild
@@ -122,6 +122,9 @@ PATCHES=(
 	# For has_networking
 	"${FILESDIR}/${PN}-3.2.3-remove-conan-threadpool.patch"
 	"${FILESDIR}/${PN}-3.2.3-allow-finding-rapidjson-pkgconfig.patch"
+
+	# GCC 13
+	"${FILESDIR}/${PN}-3.2.5-gcc13.patch"
 )
 
 src_prepare() {
diff --git a/media-sound/audacity/files/audacity-3.2.5-gcc13.patch b/media-sound/audacity/files/audacity-3.2.5-gcc13.patch
new file mode 100644
index 000000000000..265d73fd9e71
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.2.5-gcc13.patch
@@ -0,0 +1,25 @@
+https://github.com/audacity/audacity/issues/4489
+https://bugs.gentoo.org/899764
+
+--- a/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h
++++ b/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h
+@@ -47,6 +47,7 @@
+ #endif
+ 
+ #include <stddef.h>
++#include <stdint.h>
+ #include <string>
+ #include <iostream>
+ #include <sstream>
+@@ -355,10 +356,6 @@
+ typedef signed int SINT32;
+ typedef float FLOAT32;
+ typedef double FLOAT64;
+-// added by RBD
+-#ifdef __linux__
+-#define intptr_t long
+-#endif
+ 
+ // The default sampling rate.
+ const StkFloat SRATE = 44100.0;
+