Gentoo Archives: gentoo-commits

From: Nick Sarnie <sarnex@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/
Date: Thu, 02 Apr 2020 02:20:48
Message-Id: 1585793937.78a31d50c4598a4ad05ed2481770a1ccc996f320.sarnex@gentoo
1 commit: 78a31d50c4598a4ad05ed2481770a1ccc996f320
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 2 02:18:57 2020 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 2 02:18:57 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=78a31d50
7
8 app-emulation/wine-staging: Fix shortcut bug
9
10 Closes: https://bugs.gentoo.org/652176
11 Package-Manager: Portage-2.3.96, Repoman-2.3.22
12 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
13
14 .../{wine-staging-9999.ebuild => wine-staging-5.5-r1.ebuild} | 2 +-
15 app-emulation/wine-staging/wine-staging-9999.ebuild | 2 +-
16 2 files changed, 2 insertions(+), 2 deletions(-)
17
18 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-5.5-r1.ebuild
19 similarity index 99%
20 copy from app-emulation/wine-staging/wine-staging-9999.ebuild
21 copy to app-emulation/wine-staging/wine-staging-5.5-r1.ebuild
22 index c4c429f..4fec765 100644
23 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
24 +++ b/app-emulation/wine-staging/wine-staging-5.5-r1.ebuild
25 @@ -354,7 +354,7 @@ src_prepare() {
26 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
27 ewarn "Wine bugzilla should explicitly state that staging was used."
28
29 - local STAGING_EXCLUDE=""
30 + local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176
31 use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
32
33 # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
34
35 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
36 index c4c429f..4fec765 100644
37 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
38 +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
39 @@ -354,7 +354,7 @@ src_prepare() {
40 ewarn "Applying the Wine-Staging patchset. Any bug reports to the"
41 ewarn "Wine bugzilla should explicitly state that staging was used."
42
43 - local STAGING_EXCLUDE=""
44 + local STAGING_EXCLUDE="-W winemenubuilder-Desktop_Icon_Path" #652176
45 use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
46
47 # Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches