gentoo auto-resync : 08:05:2024 - 00:00:57

10 files changed, 48 insertions, 8 deletions

diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index ff2a2e2606dd..94087430c92f 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -2,6 +2,7 @@ AUX wine-vanilla-7.0-noexecstack.patch 223 BLAKE2B dff1867e2977bd14fcfab9dfa2c2f
 AUX wine-vanilla-7.0-unwind.patch 1694 BLAKE2B 017c7b761d692f8e8d23f52e51529880f95bddf5fee4309ab97bee951527bd427924dbb335e4bf57a27405e3d2440666f774c6859b81933d3007247e1cbf4898 SHA512 5d20960a8eda2d80097d6db81287c9d05ed4ea50df974c93391a427b743383a6806f24bc552c18a9336e7aea0ceb801972865ff470bde8ea7fd9423f57eb09ae
 AUX wine-vanilla-7.20-unwind.patch 1450 BLAKE2B 3f90cc131104ad72a11ae30c582b79b3e4d8c0278d51c0a193fb9e460cf088b315503bd08bd904e8d28f72f40ab3df90f83f2542b991888a2f504cc7d2adad4d SHA512 a6c4672a44c1220d5b1efabeca535a4a3510fe92aac73c38f65a09bfbd271af8b8b1bfe2c408ba5356806cb71252a6956b8130fcd06a475037b9e51d28c2a156
 AUX wine-vanilla-8.13-rpath.patch 554 BLAKE2B 209d8c581a9178242ee622338c5252f79b798cf5574f72b3984d71b7933e011b488060502715aa75630fbc3d10fcb03743ac31ed31664cacfc22b725253a117b SHA512 bbb25e02d19bd7c1a1f2d7db331d93cfcd5ce9172206ad9e19a44c52e5ece865d474eac024c2a5791dfa006c6efe0f68cd783ffc925ac793bf447d56090bdd02
+AUX wine-vanilla-9.8-musl-ioctls-header.patch 938 BLAKE2B a101f1fc7a6bcd6e8c22ce7f79f66b16be194732b7c354ba7f23aa33e9b0a938913449906b42580cf1fd8089e412cb6d049899d9f5a7d3ddb248901533e966e6 SHA512 f05cc3c37dc955e44aaa60366c945778567dd4bad6cc33e54af9debc1d35b0c27181deddbb6b951cb894707294a47b711042430cce8be794fcba6aa6994788df
 DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 721ab574092638b32d3a483b6ae3def0c9d706cc888662ca461ab8c7060b10077e83cede69663ea2a8b97729f3801209fbba5f8e8828ce20454700ffbbd76cb5 SHA512 330c71005a6a8054b5068ac4484e9015e9f8bf55d5a451aaf5f79b7f78a025732b454251c31473abf21504cce3b78e50cf7e3e0d0116bb755dc8396bd790289a
 DIST wine-8.0.2.tar.xz 29060452 BLAKE2B dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb SHA512 e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f
 DIST wine-9.0.tar.xz 30007216 BLAKE2B cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1 SHA512 838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
@@ -9,12 +10,12 @@ DIST wine-9.5.tar.xz 30371420 BLAKE2B c14ebf02f0f5b91bc2b2517ff3630f22c6af7fdc82
 DIST wine-9.6.tar.xz 30261488 BLAKE2B 53115a8a80593856679718b2055340860221701bc82a784a111a992f5e67b031d7407a16f6df6d4da67f382f30c35d2dd82af2a671a058a76b621c91199e426e SHA512 cc2ea5597636da8d392d1d63b9c135679eff69ea671dc6b53b6f2d44a890aee0e17275174485f6e8dd99c7db737eb82a800a2b05c4966f15e28167c5a6098922
 DIST wine-9.7.tar.xz 30281616 BLAKE2B 4d27f6f2dfd088a0590bfce7228c7eca25b66a9a04706ddecb25af6364e83100c15a78c8d46f3294a42dc7f3503756506f752a02d7058a72ce16716994b334bc SHA512 0c15c3a0901162a386126f2dc987b276b379cc027fc72d9e31cf3122614742f876f30a5f24a495f546cd9c5bd5efce096bd9ca190d0f378fea3d42a298a06e80
 DIST wine-9.8.tar.xz 30297460 BLAKE2B 689d1b4e55f7d66b8fad8432ad35a52e2fad303e8a9382b8893222c696697efa5de5b56cc2b933bed96d6382f9fdc919fa15e6517ffdb50105cdaea904a7d77f SHA512 3d1b0e6b7b633a0b45ba6b23e741e808dec29355721baf4489c3ad34c67d714b40897ef510c4a84f31be390d7f8b86b93a725787d733eaf77df5c82b322d2662
-EBUILD wine-vanilla-7.0.2.ebuild 12259 BLAKE2B ef6935304df1cf45bbdc4c2e53c2206999d2fa077196a72d32428a246b743b40cf08894cc22c11f803c44eae82119c7494091ea2a02e101309f8e966c67cba36 SHA512 0807bc326a4d8c3d09f65908cdd0074cfbba119d9119d47f1d6b075a00f7aec6689b9c2dd34984bff877cdaf3e2670e83e061abafebb986383525debe150ee5f
-EBUILD wine-vanilla-8.0.2.ebuild 12347 BLAKE2B d05c298ebde69ccd30ca0f95d3650fda262a85d283655220dc62911b7b5e9472d8b92b7155c48737ed0c1d459b41a49e5fed1d877d982d9e34ed3adc9fc6d0f6 SHA512 0edf660e07380c61402e23a5b09f230c0d9872be915e12edf3bc40a10b1a894245f2a3208b01babeaa6251fe45e7add8c94ab294935b1a1d9eaae259a0f7ea2d
-EBUILD wine-vanilla-9.0.ebuild 13624 BLAKE2B 30440f86b3ac4249110cbaaeb87857c1ab887b238934433194f3adf6de1ad7d5bfe4c50d7d7acb5d22362c2b0b23c0e8a3ce0bf62252e15c847eb3826398b23d SHA512 7f75b451702d86706e0fdecb4ef2395c5873d254892a94c616a6a9812dd9d5c751cebc255e2d5bdde852468af3dfa55f873e563316f609b5d8afea2fcec1b6e8
-EBUILD wine-vanilla-9.5.ebuild 13756 BLAKE2B 90a043c49e5687f218489eafda64b7da0366716df7cc13ef5505835814eb3aa2092137e285402f04b28a8adacc21a4c8e233cbfccbcd88da326b9fbeac140246 SHA512 1e847fd8d35aa7a91e6567c9990d4a5acd1bff549e492079526299c7924309966b8558747d516c2ee708a4cc5615b7accce69a94a5d4fa047b95a4149670fa3e
-EBUILD wine-vanilla-9.6.ebuild 13756 BLAKE2B 90a043c49e5687f218489eafda64b7da0366716df7cc13ef5505835814eb3aa2092137e285402f04b28a8adacc21a4c8e233cbfccbcd88da326b9fbeac140246 SHA512 1e847fd8d35aa7a91e6567c9990d4a5acd1bff549e492079526299c7924309966b8558747d516c2ee708a4cc5615b7accce69a94a5d4fa047b95a4149670fa3e
-EBUILD wine-vanilla-9.7.ebuild 13756 BLAKE2B 90a043c49e5687f218489eafda64b7da0366716df7cc13ef5505835814eb3aa2092137e285402f04b28a8adacc21a4c8e233cbfccbcd88da326b9fbeac140246 SHA512 1e847fd8d35aa7a91e6567c9990d4a5acd1bff549e492079526299c7924309966b8558747d516c2ee708a4cc5615b7accce69a94a5d4fa047b95a4149670fa3e
-EBUILD wine-vanilla-9.8.ebuild 13756 BLAKE2B 96dc89f3afee5c696d933c9cba9e997cecad742b0ff29596179907685c65cd6280267f9f04e4f2e88e2b78d5d8c8a8bed7db99cd449b4bfd2fb903cb99877273 SHA512 7e76432dcf5e726b9a9c19e21c7b41e6733f34eb49e8adc456c5bedbb650f820533a03b6c08cc4c15b101072088720c9cfdfb19f0a31b96842389550ad04ff11
-EBUILD wine-vanilla-9999.ebuild 13756 BLAKE2B 96dc89f3afee5c696d933c9cba9e997cecad742b0ff29596179907685c65cd6280267f9f04e4f2e88e2b78d5d8c8a8bed7db99cd449b4bfd2fb903cb99877273 SHA512 7e76432dcf5e726b9a9c19e21c7b41e6733f34eb49e8adc456c5bedbb650f820533a03b6c08cc4c15b101072088720c9cfdfb19f0a31b96842389550ad04ff11
+EBUILD wine-vanilla-7.0.2.ebuild 12322 BLAKE2B 764435cd9c532ae8fc64557103086dc068ba62efd6f98e14c0d5043cd21b305b59998916abecb04dbff1c0968a24f03908a236f49a27ed775ceeea63d93ea913 SHA512 285604899a9554660069479afdd91ddf2b310fc2281544f8c8691a8d50a2a2e0ba8f2624496b439e83be74d104d9f45b2cec1f25b10c357700e9e44ab2bc0655
+EBUILD wine-vanilla-8.0.2.ebuild 12410 BLAKE2B 4b98a14f4fc3676b6716ad43c53b4f9e2afe799200be8e5cf529b071273e1efd2530e03e92a7f4652d7249b771d3bbf2ebfe4afdcd68f4bf6fc70affe65300f4 SHA512 4e843ee0aae81c966095063f0350da599620a8b00a429c4fc2d20eada04b4c4c545675d670bd314de95fe2a75381f8f660b5b77437cd2accbe2c053fe3e794ca
+EBUILD wine-vanilla-9.0.ebuild 13687 BLAKE2B 29ed04e9b3655463b32a146f3586f1f39bc45bd249933ef4b15530477f588850f97c04d2640e76bb6dd695c23267f6715347cc8e9c2e985800a7a8de5d04d66d SHA512 d3e13b460001b4793e92b886d021e7b8368c1963b11d479da35dbe48d20280aa2bf501ea4d649e21586869b31df0c363cf5784caa118dcc0ea5f8d54e59104e6
+EBUILD wine-vanilla-9.5.ebuild 13819 BLAKE2B f477e1fcbd73bc019e3828ca4236e4275be6b428b6c6eeded8254e6608d4a02d062ecddb90b2c0417c4df4dd34bb638d6a8a7982edafaf8f9ed5399626b65ffa SHA512 5cccc54e4335cd0e0447da4e5746a8aa7e3574176f082f288eee73afb723acd3df9f34d08a8ab816075dd205d99f20e4d695b23fa7e8b619363a1c1cb97095dc
+EBUILD wine-vanilla-9.6.ebuild 13819 BLAKE2B f477e1fcbd73bc019e3828ca4236e4275be6b428b6c6eeded8254e6608d4a02d062ecddb90b2c0417c4df4dd34bb638d6a8a7982edafaf8f9ed5399626b65ffa SHA512 5cccc54e4335cd0e0447da4e5746a8aa7e3574176f082f288eee73afb723acd3df9f34d08a8ab816075dd205d99f20e4d695b23fa7e8b619363a1c1cb97095dc
+EBUILD wine-vanilla-9.7.ebuild 13819 BLAKE2B f477e1fcbd73bc019e3828ca4236e4275be6b428b6c6eeded8254e6608d4a02d062ecddb90b2c0417c4df4dd34bb638d6a8a7982edafaf8f9ed5399626b65ffa SHA512 5cccc54e4335cd0e0447da4e5746a8aa7e3574176f082f288eee73afb723acd3df9f34d08a8ab816075dd205d99f20e4d695b23fa7e8b619363a1c1cb97095dc
+EBUILD wine-vanilla-9.8.ebuild 13864 BLAKE2B b6a72239026a77893502065b23b11e25e0088859236b5f719c3dc69ffafec80efbd8adfb18444c2449759d7591a49603cd73964ee6f99e1a0ed4566dd2e0c71f SHA512 6fe9173b3490ecf89d2891cc8e4733178c25c0ffddbb0c657f1d79a9e2e3cbfc94ed4584d471206575d4a07e9c4e4c6152cd5cab7ef8f227dcbb2d534a42d0bc
+EBUILD wine-vanilla-9999.ebuild 13819 BLAKE2B e2eb8d18951fc020a99d5b29fdebdd5b867a04ccd675ecaaf622486660bf7e8427890b12956b85dc6948ef989352020f0707d33f937ca0c4b2b6a0fba6818f20 SHA512 9bfca4195e50e52bdd9d83e432a8cac7a6fe0c7f59138d6374398e5f8c6888582f5d3fa9801ba6b858ec095b41869ee8d961b0bbfa2688547fe2afb2283465cd
 MISC metadata.xml 2726 BLAKE2B 7dc7490fabcda06a27061726225890ee203fe7d22209697c3997f0ccdb4699bfaa09f983c22c4919ce75d2eab6ebdb1add9d9af04f24aee63bae81116fc04094 SHA512 5cdbb062462ae791ff9727d184935af3af147c0bd1e49846731941513301b720313b3356f56a8295780ab822e3117146c9a669d2d96efba6f072d84adba770e6
diff --git a/app-emulation/wine-vanilla/files/wine-vanilla-9.8-musl-ioctls-header.patch b/app-emulation/wine-vanilla/files/wine-vanilla-9.8-musl-ioctls-header.patch
new file mode 100644
index 000000000000..7aa1a4c00587
--- /dev/null
+++ b/app-emulation/wine-vanilla/files/wine-vanilla-9.8-musl-ioctls-header.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/931341
+https://gitlab.winehq.org/wine/wine/-/commit/24ca848c568d5a2786abd26f2e7314b2e3f509f3
+From: Fotios Valasiadis <fvalasiad@gmail.com>
+Date: Sun, 5 May 2024 03:34:57 +0300
+Subject: [PATCH] ntdll/unix: Fix building on musl by explicitly including
+ asm/ioctls.h.
+
+After commit 898ab8dab19d498c17859f39a55e317ee7e367a5 wine would no longer
+build on musl.
+
+Issue is that apparently TCSETS2 isn't defined when including sys/ioctl.h.
+
+A little digging shows that glibc goes ahead and includes asm/ioctls.h in
+sys/ioctl.h, providing said macro.  Musl on the other hand doesn't and relies
+on bits/ioctl.h, which lacks said macro.
+
+Signed-off-by: Fotios Valasiadis <fvalasiad@gmail.com>
+--- a/dlls/ntdll/unix/serial.c
++++ b/dlls/ntdll/unix/serial.c
+@@ -33,6 +33,7 @@
+ #include <stdio.h>
+ #ifdef HAVE_ASM_TERMBITS_H
+ # include <asm/termbits.h>
++# include <asm/ioctls.h>
+ #else
+ # include <termios.h>
+ #endif
+-- 
+GitLab
+
diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
index 88eaa6f3c226..583683c9685c 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -257,6 +257,7 @@ src_configure() {
 
 	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
 	filter-lto # build failure
+	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
index f0641aa921fe..d9243957dadb 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -251,6 +251,7 @@ src_configure() {
 
 	tc-ld-force-bfd # builds with non-bfd but broken at runtime (bug #867097)
 	filter-lto # build failure
+	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 	use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
 
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
index 7326ea74dd64..d17683e5dff0 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
@@ -278,6 +278,7 @@ src_configure() {
 	)
 
 	filter-lto # build failure
+	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild
index 162e8b9a993c..bb8117b3b1b3 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.5.ebuild
@@ -278,6 +278,7 @@ src_configure() {
 	)
 
 	filter-lto # build failure
+	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild
index 162e8b9a993c..bb8117b3b1b3 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.6.ebuild
@@ -278,6 +278,7 @@ src_configure() {
 	)
 
 	filter-lto # build failure
+	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
index 162e8b9a993c..bb8117b3b1b3 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
@@ -278,6 +278,7 @@ src_configure() {
 	)
 
 	filter-lto # build failure
+	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
index 61e41c9d9b98..7a5546bbfd70 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
@@ -161,6 +161,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.0-noexecstack.patch
 	"${FILESDIR}"/${PN}-7.20-unwind.patch
 	"${FILESDIR}"/${PN}-8.13-rpath.patch
+	"${FILESDIR}"/${P}-musl-ioctls-header.patch
 )
 
 pkg_pretend() {
@@ -278,6 +279,7 @@ src_configure() {
 	)
 
 	filter-lto # build failure
+	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 61e41c9d9b98..13bbfdc159ea 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -278,6 +278,7 @@ src_configure() {
 	)
 
 	filter-lto # build failure
+	filter-flags -Wl,--gc-sections # runtime issues (bug #931329)
 	use custom-cflags || strip-flags # can break in obscure ways at runtime
 
 	# wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097)