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