1 |
commit: 4f0f82a6418b98a894111478e8f7ff25aa7b2617 |
2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 22 19:00:27 2019 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 22 19:01:04 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f0f82a6 |
7 |
|
8 |
app-emulation/wine-staging: Sync with ::wine |
9 |
|
10 |
Rebase patches for 9999 |
11 |
|
12 |
Package-Manager: Portage-2.3.82, Repoman-2.3.20 |
13 |
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> |
14 |
|
15 |
app-emulation/wine-staging/Manifest | 1 + |
16 |
app-emulation/wine-staging/wine-staging-9999.ebuild | 6 +++--- |
17 |
2 files changed, 4 insertions(+), 3 deletions(-) |
18 |
|
19 |
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest |
20 |
index 20ad91c7a55..1c572920787 100644 |
21 |
--- a/app-emulation/wine-staging/Manifest |
22 |
+++ b/app-emulation/wine-staging/Manifest |
23 |
@@ -1,4 +1,5 @@ |
24 |
DIST gentoo-wine-patches-20190511.tar.xz 58996 BLAKE2B 571c30d94341f567261893f884345b39eab42adc8b5c306a30d03943fd770055e070ae01e41e5add5b873063d3aaa69641faf81b16ac6039970d8a22b177dd7e SHA512 ccd74d0d6acecc7b24dc89466f93099bd6991d607a4fe89d68637d1fa82e02ebd76b532fe1afd8ab8de8ef3f2d49fe8d71f797796a9434f4b0f7a8183c084969 |
25 |
+DIST gentoo-wine-patches-20191222.tar.xz 59236 BLAKE2B 1b2c7b3ab69e5603d0f176a88c13b6d532f94f319ad29821faa699e828d90cfbe92c02b6e73b72eb16e565707c49885833fe557809ed16f4a6f0f182de9bb6e6 SHA512 a030fad55be5e1d909bc50e430c9a99846b88d7555f12749e101ba83f04df5af23eeb726b5ed78f847a66d11ac0a838bc69bd5bf8cf53da77ad454d2a2fe65cf |
26 |
DIST wine-4.18.tar.xz 22263936 BLAKE2B 710d6d90ff1ef9adeb5bb9012c8f354985c1610f46607a144ef12499571373563f8ce204dc3dbed975a9ab47e0b07e65f8fe0ff3e38a698076d95c58fc0797c4 SHA512 794802289fa021092a86c939a3618563ad1523689cdafb6fd58aed06c6a5c867fc5ef0d3dbb2435a65c3eb0d3b982b37e983257a7a7d20c3b6d71df9bf5bf1f1 |
27 |
DIST wine-4.19.tar.xz 22283616 BLAKE2B 0d648d931737bc381bca3ad0fa2bfcc089c8324c47c80bdaa85aaddb5a63f5145ef5cc442da299591edbd1723ff1dd49fbf629363ec5e4c6152b7016aed612f3 SHA512 a86bd7ccfb1878445ea946e4ca72769c10b4d966bcc893536a8c3eaa29484ba687dc3a44755ec92a2ad6073e736985b814c0c682bf4f90b5ffe2bca0ebbf4b25 |
28 |
DIST wine-4.20.tar.xz 22314856 BLAKE2B c3734029583bf17929a92475f4ad3ac97df632d967b9f7fc2d9f076a7f8492ec144b41227812271703ee665a6a17e9b1e3eed6697d5f7394824d3783fcd8de5a SHA512 c01af88106b8a808fbceb6ace45882c300656a47913142ba7052283b358d6d5b4379895804e15a2ca1870a4e955ea3ca857ec042a8070ea4ffaefa0c7a84e701 |
29 |
|
30 |
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild |
31 |
index 018e0d7d63f..e6f10b74750 100644 |
32 |
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild |
33 |
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild |
34 |
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}" |
35 |
|
36 |
STAGING_P="wine-staging-${PV}" |
37 |
STAGING_DIR="${WORKDIR}/${STAGING_P}" |
38 |
-GWP_V="20190511" |
39 |
+GWP_V="20191222" |
40 |
PATCHDIR="${WORKDIR}/gentoo-wine-patches" |
41 |
|
42 |
DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset" |
43 |
@@ -162,9 +162,9 @@ usr/share/applications/wine-uninstaller.desktop |
44 |
usr/share/applications/wine-winecfg.desktop" |
45 |
|
46 |
PATCHES=( |
47 |
- "${PATCHDIR}/patches/${MY_PN}-4.8-winegcc.patch" #260726 |
48 |
+ "${PATCHDIR}/patches/${MY_PN}-5.0-winegcc.patch" #260726 |
49 |
"${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615 |
50 |
- "${PATCHDIR}/patches/${MY_PN}-4.7-memset-O3.patch" #480508 |
51 |
+ "${PATCHDIR}/patches/${MY_PN}-5.0-memset-O3.patch" #480508 |
52 |
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 |
53 |
) |
54 |
PATCHES_BIN=() |