From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EA47815803E for ; Thu, 4 Jan 2024 18:06:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34D472BC015; Thu, 4 Jan 2024 18:06:04 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 190842BC015 for ; Thu, 4 Jan 2024 18:06:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 495FA343015 for ; Thu, 4 Jan 2024 18:06:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DBD3BAE5 for ; Thu, 4 Jan 2024 18:06:01 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1704391529.368a264f5f0bd1cfe1107a131e0f0c4c3128d867.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-staging/wine-staging-8.21.ebuild app-emulation/wine-staging/wine-staging-9999.ebuild X-VCS-Directories: app-emulation/wine-staging/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 368a264f5f0bd1cfe1107a131e0f0c4c3128d867 X-VCS-Branch: master Date: Thu, 4 Jan 2024 18:06:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ab78e065-c307-4c8a-a96b-eb868d473cc3 X-Archives-Hash: 4da690fc987877a5a0ef204e4b2ec67b commit: 368a264f5f0bd1cfe1107a131e0f0c4c3128d867 Author: Ionen Wolkens gentoo org> AuthorDate: Thu Jan 4 17:30:55 2024 +0000 Commit: Ionen Wolkens gentoo 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 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} )