commit:     368a264f5f0bd1cfe1107a131e0f0c4c3128d867
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  4 17:30:55 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jan  4 18:05:29 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=368a264f

app-emulation/wine-staging: skip patches broken with USE=-mingw

Closes: https://bugs.gentoo.org/921360
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 app-emulation/wine-staging/wine-staging-8.21.ebuild | 7 ++++++-
 app-emulation/wine-staging/wine-staging-9999.ebuild | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app-emulation/wine-staging/wine-staging-8.21.ebuild 
b/app-emulation/wine-staging/wine-staging-8.21.ebuild
index bd1e1b1b87a8..3a29caad4415 100644
--- a/app-emulation/wine-staging/wine-staging-8.21.ebuild
+++ b/app-emulation/wine-staging/wine-staging-8.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -213,6 +213,11 @@ src_prepare() {
        local patchinstallargs=(
                --all
                --no-autoconf
+               # patches known broken with USE=-mingw, retry occasionally (bug 
#921360)
+               $(usev !mingw '
+                       -W winedevice-Default_Drivers
+                       -W fltmgr.sys-FltBuildDefaultSecurityDescriptor
+               ')
                ${MY_WINE_STAGING_CONF}
        )
 

diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild 
b/app-emulation/wine-staging/wine-staging-9999.ebuild
index ab626045c10d..841cad91bcda 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -213,6 +213,11 @@ src_prepare() {
        local patchinstallargs=(
                --all
                --no-autoconf
+               # patches known broken with USE=-mingw, retry occasionally (bug 
#921360)
+               $(usev !mingw '
+                       -W winedevice-Default_Drivers
+                       -W fltmgr.sys-FltBuildDefaultSecurityDescriptor
+               ')
                ${MY_WINE_STAGING_CONF}
        )
 

Reply via email to