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

8 files changed, 44 insertions, 6 deletions

diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 0755d469d080..ddd1dd5e92ec 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -1,6 +1,7 @@
 AUX wine-staging-7.17-noexecstack.patch 223 BLAKE2B 6e6cfc208f11c2c2b7bbc392e3703c50669ba9abf088dac0dd7aa8d6e59fcdd6656f5ad6955e4ef87c25d6f4082d83af71a09b2928934222b25847b8b2b5089f SHA512 43fc5c50c33e09f028c2369a660499fbb6c240931c6b7d44c4e838deee1df0390706967b375d36ee8eea339e86a5af1c7a49a76d884860c045c3476d8c8d2a5f
 AUX wine-staging-7.20-unwind.patch 1450 BLAKE2B 80e9222c95393aaa4b95e05597a4181030fc988d95e416d2f92631f29f640b9abb3dd0853d005de4725b41c09224e478741902075259d48a30830a923790579f SHA512 e1a72f1463be32975daa02064acb96189cd79cb41ff98f89b58e46c97100a3ac46405b1b9982378c9de275acbdb74168853e47b932e06398cdd2981b23f483ce
 AUX wine-staging-8.13-rpath.patch 554 BLAKE2B 209d8c581a9178242ee622338c5252f79b798cf5574f72b3984d71b7933e011b488060502715aa75630fbc3d10fcb03743ac31ed31664cacfc22b725253a117b SHA512 bbb25e02d19bd7c1a1f2d7db331d93cfcd5ce9172206ad9e19a44c52e5ece865d474eac024c2a5791dfa006c6efe0f68cd783ffc925ac793bf447d56090bdd02
+AUX wine-staging-9.8-musl-ioctls-header.patch 938 BLAKE2B a101f1fc7a6bcd6e8c22ce7f79f66b16be194732b7c354ba7f23aa33e9b0a938913449906b42580cf1fd8089e412cb6d049899d9f5a7d3ddb248901533e966e6 SHA512 f05cc3c37dc955e44aaa60366c945778567dd4bad6cc33e54af9debc1d35b0c27181deddbb6b951cb894707294a47b711042430cce8be794fcba6aa6994788df
 DIST wine-9.0.tar.xz 30007216 BLAKE2B cf53177201a2f7eeb35d0d8ce220f80808d979099a928ad60652d1dee92620c433cc105dffab4e9309f41766087ad1544ef49d2922538bb420d62f6dd64117a1 SHA512 838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
 DIST wine-9.5.tar.xz 30371420 BLAKE2B c14ebf02f0f5b91bc2b2517ff3630f22c6af7fdc827c5d024d809a383a65446284a5349c8109835112f5353f361088f4f32de1a3d04299fbf39deacbc0e8e8bf SHA512 8ccad8f6e6b1428886dee9fae771796e2021b4122cd96464350352bede25421406e6a6a0fdd63d8b99b896db8dc529aa6e05d6ac7966bee49ce3055b18a8af91
 DIST wine-9.6.tar.xz 30261488 BLAKE2B 53115a8a80593856679718b2055340860221701bc82a784a111a992f5e67b031d7407a16f6df6d4da67f382f30c35d2dd82af2a671a058a76b621c91199e426e SHA512 cc2ea5597636da8d392d1d63b9c135679eff69ea671dc6b53b6f2d44a890aee0e17275174485f6e8dd99c7db737eb82a800a2b05c4966f15e28167c5a6098922
@@ -11,10 +12,10 @@ DIST wine-staging-9.5.tar.gz 9526239 BLAKE2B a6f5a351a3979fc81a0d8c6325da4f08021
 DIST wine-staging-9.6.tar.gz 9522775 BLAKE2B 5598d408774e3142d6de5ccddccb68d8e1e4544c43b5691751599e6b86df6b8899f6113b8b58d75fb8e032a6c7aed9ffbb3ecb1553aa2d7593d69513e9a0177a SHA512 83691eb560c860d40669a524196a522007c76420b5b5076da4f446a4180fee7558ef228cf1f4179eb78a6d36c8ab78fd2784ffc879b0aacbef7c72a7f88e7ed2
 DIST wine-staging-9.7.tar.gz 9573710 BLAKE2B 34eee97f51268c07d649f0ed498b5e92bbc8bb1d8cee860040ee660d968307a7d9d3b59305567c50338d2ce97b3071f615b8782ca74716b42904ae4514404316 SHA512 3c5f100f715c6b3399c356b304b8eca1e51706e03782f2f834965474a7efeca4174ae806dff85080cded93501e9cfcd097eca43230d9425c78ae73a6f4485c76
 DIST wine-staging-9.8.tar.gz 9580231 BLAKE2B 74d0b7d4eb49b5cb16abf17a2aae52bad9db04d3e207762f1d37a9f18870683c0115ce41b29e24edad827557de4a07235980588115b61fa86eeaaa5573460535 SHA512 8132c1fd98b55ef04993e894e11063e43ac1cae059f80e0dc3b2a4c6bf08a6ab80f7bdd02b97f62733f31850b41e5d2d6c5085b22bf873fc03ab67b79bdd3c1d
-EBUILD wine-staging-9.0.ebuild 15140 BLAKE2B 9cf2b75ba5e6bb5e848b4613efe79e648811b7dde47101c6127b51feaf6aa9e8e265eeec6c52a1936526e1802aeebbd46d1209f535f00bfb4189e6afb62f61eb SHA512 9e5daf00b51c77d63678b335ceb3f83bd0a855cf9c3e04fdd8922edd833795f084a25fb75eebee708a94278f41ad6b45258ebce10d302d1e2d8a27227a01478f
-EBUILD wine-staging-9.5.ebuild 15270 BLAKE2B 42149c5410f49fcdd3b7ba420c31cedb1b2f5ef0250304a519231d45ba34de1fb46046c8306ba751f5a24e8b472203533de950adb98d1b8b94ab28a6c59389f5 SHA512 85260163a4e5198662fc7a14760a123fb5307a6f05eb7350462733f7df97b22f351ab9fc8c34a1f4291e1e524dffcefe47fbb205fefb1b4e1b8fadc1fd6f0cbb
-EBUILD wine-staging-9.6.ebuild 15088 BLAKE2B 4d1c0dd32324c5f627712c6804ac09d625337b862a807eb7b51a3ae67c9ba6f86816a258881f07470263f505d1269b0c70f4791669691425c959d9136288d9ef SHA512 8bfcdf1450ff8b7b36b1245d9056482f455404bd56c5e4dc9589e08a1a69654a3bb30d041741faedfe9ae94928269b8ea7027f0d20e584ba67c4bc27f69a489b
-EBUILD wine-staging-9.7.ebuild 15088 BLAKE2B 4d1c0dd32324c5f627712c6804ac09d625337b862a807eb7b51a3ae67c9ba6f86816a258881f07470263f505d1269b0c70f4791669691425c959d9136288d9ef SHA512 8bfcdf1450ff8b7b36b1245d9056482f455404bd56c5e4dc9589e08a1a69654a3bb30d041741faedfe9ae94928269b8ea7027f0d20e584ba67c4bc27f69a489b
-EBUILD wine-staging-9.8.ebuild 15088 BLAKE2B 16b1ae3566de27f2dd20952230ace5c8ec1bf1b929ae44443907b312ca676ace0e37937885027677ed347e6b5f48265d79dc90ac0d14d85e97d583bd6bb671ba SHA512 96ed03f1a75616129ae32a235662945ad5d3376ba12960b479a2a79caf16e94fa1717d1488edc8c1dc86023916a400dedc4795434a4610ad36f9162b7f20daa4
-EBUILD wine-staging-9999.ebuild 15088 BLAKE2B 16b1ae3566de27f2dd20952230ace5c8ec1bf1b929ae44443907b312ca676ace0e37937885027677ed347e6b5f48265d79dc90ac0d14d85e97d583bd6bb671ba SHA512 96ed03f1a75616129ae32a235662945ad5d3376ba12960b479a2a79caf16e94fa1717d1488edc8c1dc86023916a400dedc4795434a4610ad36f9162b7f20daa4
+EBUILD wine-staging-9.0.ebuild 15203 BLAKE2B ab543044224b88e09dbec6563bb3e55b92d8ff336b88e612a48a541d8431ae887fd795bec803a6dfe29a7d9deb5cc452861e1e226dd0a854be463dda3f8a261e SHA512 e4236a6e50635f36056061d3085b9c6adf548f37ab535735fab1c1b9660262c964c351ef9803f04d7a05f04665ccb18638744efadfc82c77d4c210107417f776
+EBUILD wine-staging-9.5.ebuild 15333 BLAKE2B 5e3c6de2b94c062fb5d2b09bc2075aebbf43fa2ad34ff390c7fd1455b7cacc0ebfd950d0419a79c2ffde691764881785a906959facde8984cbe718575b0ef116 SHA512 fcecea87be0777864db343caf2218cb71db93f490fe7ac39fce8d2f6c2c4755a56a98948fa50b9e4ca328b6ceeb3d677ca546bfe115119f8887fe3ab32e435cf
+EBUILD wine-staging-9.6.ebuild 15151 BLAKE2B 8a95266c25196c7c6ba30ab59a40eac66542e5bb0a6bd2f7f22b490005538d41ab4b8cc085ef505f2f5221f0785cd8ca7923839043be909997cf2586b38a9430 SHA512 a2e9e7ab2dbf81b5495d0b0de3efccda109157a5bb2701b8b03f7b6274dc821002448f787d539ca3fdb578d423231cdcf47066573d99da5b3d808b00a2d8e2ca
+EBUILD wine-staging-9.7.ebuild 15151 BLAKE2B 8a95266c25196c7c6ba30ab59a40eac66542e5bb0a6bd2f7f22b490005538d41ab4b8cc085ef505f2f5221f0785cd8ca7923839043be909997cf2586b38a9430 SHA512 a2e9e7ab2dbf81b5495d0b0de3efccda109157a5bb2701b8b03f7b6274dc821002448f787d539ca3fdb578d423231cdcf47066573d99da5b3d808b00a2d8e2ca
+EBUILD wine-staging-9.8.ebuild 15196 BLAKE2B 438b05bcc05584d104d94881859bf5b3960562b95e4a5388aa580502b91550352e339c74df3ab970aca7b78012903a67f295a24e83cca354a55d8e8147f8a698 SHA512 0ca4b3f5375cf020080bfc27de9cc3dcd8a51ed9159274c5b92987521433a83aaf1afb7af8b5cc2ba2f5c172a617f4448daf537a72067134f743f6f99b2bf8b0
+EBUILD wine-staging-9999.ebuild 15151 BLAKE2B 9d417a3a467e4e6f217f47fe02c6ed76ceecd76c03ddf6d91a000bfeedd27047b784f6a8557cfd889b64f5fc03bbcfc39bcd61e9d676af75776abd3987856a86 SHA512 ffdcb33f7b6fac64d938644f52aee18154625337fbcaf959e821627028d09d8fe1cbdbc5b04a72766704f44f59d0e9922ff691b78518b15ad07cb0b4906ea7c0
 MISC metadata.xml 2659 BLAKE2B 8a80b12643e82b98b71bc408e2fd79736da01c8f7d914c7a592cb685893ea3896bc44fecf0160faec803b284d3f6bb38cf36fb4745d9d43e0e1ced8702fcaf9d SHA512 a271e537318a4e90236c195f1f8c24c3255b5465345246627797d37238e2b6292d0734a9ab19542ee34fc1e9312dc4418694992f5ce3c53310228cc6bf14ef90
diff --git a/app-emulation/wine-staging/files/wine-staging-9.8-musl-ioctls-header.patch b/app-emulation/wine-staging/files/wine-staging-9.8-musl-ioctls-header.patch
new file mode 100644
index 000000000000..7aa1a4c00587
--- /dev/null
+++ b/app-emulation/wine-staging/files/wine-staging-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-staging/wine-staging-9.0.ebuild b/app-emulation/wine-staging/wine-staging-9.0.ebuild
index 537675f10ba0..d2133a1ead43 100644
--- a/app-emulation/wine-staging/wine-staging-9.0.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild
@@ -325,6 +325,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-staging/wine-staging-9.5.ebuild b/app-emulation/wine-staging/wine-staging-9.5.ebuild
index 08b56968b3ac..ca1f794f201c 100644
--- a/app-emulation/wine-staging/wine-staging-9.5.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.5.ebuild
@@ -325,6 +325,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-staging/wine-staging-9.6.ebuild b/app-emulation/wine-staging/wine-staging-9.6.ebuild
index 2c9f8fc4ef2a..3c4de14f4d45 100644
--- a/app-emulation/wine-staging/wine-staging-9.6.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.6.ebuild
@@ -320,6 +320,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-staging/wine-staging-9.7.ebuild b/app-emulation/wine-staging/wine-staging-9.7.ebuild
index 2c9f8fc4ef2a..3c4de14f4d45 100644
--- a/app-emulation/wine-staging/wine-staging-9.7.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.7.ebuild
@@ -320,6 +320,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-staging/wine-staging-9.8.ebuild b/app-emulation/wine-staging/wine-staging-9.8.ebuild
index f4a2a5ce7f73..5bf74a8b36bc 100644
--- a/app-emulation/wine-staging/wine-staging-9.8.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9.8.ebuild
@@ -177,6 +177,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-7.17-noexecstack.patch
 	"${FILESDIR}"/${PN}-7.20-unwind.patch
 	"${FILESDIR}"/${PN}-8.13-rpath.patch
+	"${FILESDIR}"/${P}-musl-ioctls-header.patch
 )
 
 pkg_pretend() {
@@ -320,6 +321,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-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
index f4a2a5ce7f73..f0ed10e52b22 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -320,6 +320,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)