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/files/, app-emulation/wine-staging/
Date: Fri, 16 Jul 2021 23:27:03
Message-Id: 1626477983.d34e98d753b6c4138628e36f0220d0a75ca54e05.sarnex@gentoo
1 commit: d34e98d753b6c4138628e36f0220d0a75ca54e05
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 16 23:26:23 2021 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 16 23:26:23 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=d34e98d7
7
8 app-emulation/wine-staging: Sync with ::gentoo
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
12
13 .../files/wine-staging-6.12-winegcc-equals-args.patch | 13 +++++++++++++
14 app-emulation/wine-staging/wine-staging-6.12.ebuild | 1 +
15 2 files changed, 14 insertions(+)
16
17 diff --git a/app-emulation/wine-staging/files/wine-staging-6.12-winegcc-equals-args.patch b/app-emulation/wine-staging/files/wine-staging-6.12-winegcc-equals-args.patch
18 new file mode 100644
19 index 0000000..562b63a
20 --- /dev/null
21 +++ b/app-emulation/wine-staging/files/wine-staging-6.12-winegcc-equals-args.patch
22 @@ -0,0 +1,13 @@
23 +https://bugs.winehq.org/show_bug.cgi?id=51413
24 +https://bugs.gentoo.org/800809
25 +--- a/tools/winegcc/winegcc.c
26 ++++ b/tools/winegcc/winegcc.c
27 +@@ -1982,7 +1982,7 @@ int main(int argc, char **argv)
28 + if (strncmp("-Wl,", opts.args->base[i], 4) == 0)
29 + {
30 + unsigned int j;
31 +- strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ",=");
32 ++ strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ",");
33 + for (j = 0; j < Wl->size; j++)
34 + {
35 + if (!strcmp(Wl->base[j], "--image-base") && j < Wl->size - 1)
36
37 diff --git a/app-emulation/wine-staging/wine-staging-6.12.ebuild b/app-emulation/wine-staging/wine-staging-6.12.ebuild
38 index 77c35e1..a2848d5 100644
39 --- a/app-emulation/wine-staging/wine-staging-6.12.ebuild
40 +++ b/app-emulation/wine-staging/wine-staging-6.12.ebuild
41 @@ -172,6 +172,7 @@ PATCHES=(
42 "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615
43 "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
44 "${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch"
45 + "${FILESDIR}/wine-staging-6.12-winegcc-equals-args.patch" #800809
46 )
47 PATCHES_BIN=()