diff options
Diffstat (limited to 'app-emulation/wine-staging')
4 files changed, 21 insertions, 8 deletions
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest index e23929d2666f..de666664be77 100644 --- a/app-emulation/wine-staging/Manifest +++ b/app-emulation/wine-staging/Manifest @@ -1,3 +1,4 @@ +AUX wine-staging-6.12-winegcc-equals-args.patch 666 BLAKE2B 1546e146a5942c46c01e72d06693e0875dc84483159a404d1a13824b29e2539f2abe95f2086509de049ef0477a0846be7149e82949f5c55aa5c8da925679773f SHA512 6377b3f86966a19c1129c75da6e2bfdbee2c2ee7d7c38460778239adc01fd56328a20b74b9c73d5b757f0d53abc91bc498d71f988eba316267bb508234a98a8f DIST gentoo-wine-patches-20200523.tar.xz 59740 BLAKE2B 951d7f305a6e5b3759c8095629d48de4830b8a0c9558de859a9e02d9824fe85553fda2bc0820ca97022a0ca63ac28473dadfe827821220445dbf1a7fd15c7c98 SHA512 46eea45c982b475e3ff444cbd87c6a0a235fc8dcaf3d83d89655a10ed8841a9ddb09e5a638a05803f3bf2c3bd34165c16067aba561efa4c183ee396dc31cdf75 DIST wine-6.10.tar.xz 24562432 BLAKE2B aeb4efc6fcbdbbbfa71a99112224c77e1da10468e47d49de87ecf06556008e83d6e3d8655fa4439293820663910897d512a77bb78ab771632f893b46745915af SHA512 f0e8f0bdab09c979772965d167d687e88998f3fd6537a592e201a2dc9097552e03b1c413516cc8c82665a8bf17580777f48bd1ed9033641f04e7ef7f0b29cc60 DIST wine-6.11.tar.xz 24599644 BLAKE2B 47b8eefadd59e649ac331ee236b90dfffd86ea812699f3d804bd3a7d939d099c88c4b19cf8d8e0bbe2463298abe398528c132443350f3d5eba0d23e7a3a2889c SHA512 d041ad99b6311f99df6ef40a64bc393acdc77ad4bf5f28111ebb88c133c3d338aff18f129fb30ae38cca24bf579834d4e6c7d252d5391f35b1ee81a91cc70c21 @@ -9,7 +10,7 @@ DIST wine-staging-6.12.1.tar.gz 9658943 BLAKE2B 9ea46ef75f2fd42790da35631893d634 DIST wine-staging-6.9.tar.gz 9687986 BLAKE2B 72cf53616a619638fdc91d7501c8fcc2bb9c102a1a445a9c58dd23fbb5bccc27fcf2f9635ec65b23d93839514d8aa9ede29d84d6737e49776a1d99b716295ea4 SHA512 09732ce6fe5e5460ef5f30ab3dd5581c94b27e1d2c228bc395b1defd32fc5e908ab32eb2a56e489b154e1d0f638ad792c80a64d82d90a33c943102b379bef937 EBUILD wine-staging-6.10.ebuild 21988 BLAKE2B 5ec71d6ed2b25316b5f34f5ea3b04b4ac8e5dd71ac8eecb78dc6b8ea1ad9c3a120ca10bc08055589ef58456acbfbea18002a98dfa05afc7d993881e20ebb9114 SHA512 6d7783fcd3aefb7c034621b239a2a77d43163140c98073703038f878df25dee0aad3de3fcf7fe6eb08ec1a083aeb2b5ea9a5d0e0175ad098522504829b4a402e EBUILD wine-staging-6.11.ebuild 21988 BLAKE2B 5ec71d6ed2b25316b5f34f5ea3b04b4ac8e5dd71ac8eecb78dc6b8ea1ad9c3a120ca10bc08055589ef58456acbfbea18002a98dfa05afc7d993881e20ebb9114 SHA512 6d7783fcd3aefb7c034621b239a2a77d43163140c98073703038f878df25dee0aad3de3fcf7fe6eb08ec1a083aeb2b5ea9a5d0e0175ad098522504829b4a402e -EBUILD wine-staging-6.12.ebuild 21992 BLAKE2B 3020040698a9678a72328287ce335f7523c79108b3abf81bb0555de50cc9135c66c58aa0d68d79a5c9b25f6d7dc30ef53a4f94069ad3d5bacedefab3342af4db SHA512 91e243a045bb8889bfe1115ac1b47059c669a1df5aea6b8ce5f56b00a511ff86be7daf4956828dd343bef635a0a33fcc7405f2ded95641ac98603af7d2af45ed +EBUILD wine-staging-6.12.ebuild 21984 BLAKE2B b685531dc6e0df7ff9cffedec50a5fc6d2fdd50d8a62c16a5164c1c3c73c23a83a8fa116bc02a2b76c037fbafbbe7e738fb19d93a38dcd2d5743c353fbff8b36 SHA512 a509f03f95b6eebe03eb44ab5b55471722d373f51e27818d6aa565791f0286ecd485b50f12428449b449c5f1716d276b40b55f63d2cdef9226238f0674becefe EBUILD wine-staging-6.9.ebuild 21988 BLAKE2B 7f8b7431a69b618ef9202c270d34bc8981555fe27cb29d7447ed447e7d6c42844544bc721bb9439f61b56adad9ffba6c6817d5191cd6991e39e60699839d2dfc SHA512 d0b5e90ff86627bc8e45fe351ac558c8e05e2486b5d4d49187ddee2292d9132541e3bf1341650b4a23c6b0ca1fd1aff1ba566c108491f4e3e3c54fb8cf768d58 -EBUILD wine-staging-9999.ebuild 21988 BLAKE2B 5ec71d6ed2b25316b5f34f5ea3b04b4ac8e5dd71ac8eecb78dc6b8ea1ad9c3a120ca10bc08055589ef58456acbfbea18002a98dfa05afc7d993881e20ebb9114 SHA512 6d7783fcd3aefb7c034621b239a2a77d43163140c98073703038f878df25dee0aad3de3fcf7fe6eb08ec1a083aeb2b5ea9a5d0e0175ad098522504829b4a402e +EBUILD wine-staging-9999.ebuild 21913 BLAKE2B 99bba8fb8a7e11fba23be040ca3e95595b68f9a16d452d602604c3cbfe495536dd90d59a7a781357bbb4e46977a6bf7a90eae41b2da2a35423b69d7805920051 SHA512 6ba6dea0e8811385d7e9ff5eeb2c6705d238968c9577d5757c3fe2387ca638bdd74d5680e59166b3eb2f32bbffa241cf42f233c31fcb1b6bfe56a501066682aa MISC metadata.xml 3966 BLAKE2B ee3d47cb51499adfa3a98d09c9a718f1c51f0dc4b24a57b8d3c1f18e45584bc12ccdb54250162a146f0b7c95b835b84684a16f0164a21832df80bbaa4cefece4 SHA512 7db52c79172194fb0e151431273fbb02694144c3a7d39746e78fcb195471ce0d702d0643cfe24414eda070943b58d21d06db341e3607924de89c34ad5e7b5033 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 new file mode 100644 index 000000000000..562b63af063a --- /dev/null +++ b/app-emulation/wine-staging/files/wine-staging-6.12-winegcc-equals-args.patch @@ -0,0 +1,13 @@ +https://bugs.winehq.org/show_bug.cgi?id=51413 +https://bugs.gentoo.org/800809 +--- a/tools/winegcc/winegcc.c ++++ b/tools/winegcc/winegcc.c +@@ -1982,7 +1982,7 @@ int main(int argc, char **argv) + if (strncmp("-Wl,", opts.args->base[i], 4) == 0) + { + unsigned int j; +- strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ",="); ++ strarray* Wl = strarray_fromstring(opts.args->base[i] + 4, ","); + for (j = 0; j < Wl->size; j++) + { + if (!strcmp(Wl->base[j], "--image-base") && j < Wl->size - 1) diff --git a/app-emulation/wine-staging/wine-staging-6.12.ebuild b/app-emulation/wine-staging/wine-staging-6.12.ebuild index 9f66da3e67f9..a2848d52589b 100644 --- a/app-emulation/wine-staging/wine-staging-6.12.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.12.ebuild @@ -172,6 +172,7 @@ PATCHES=( "${PATCHDIR}/patches/${MY_PN}-4.7-multilib-portage.patch" #395615 "${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611 "${PATCHDIR}/patches/${MY_PN}-5.9-Revert-makedep-Install-also-generated-typelib-for-in.patch" + "${FILESDIR}/wine-staging-6.12-winegcc-equals-args.patch" #800809 ) PATCHES_BIN=() @@ -528,10 +529,9 @@ multilib_src_configure() { $(use_with vaapi va) ) - local PKG_CONFIG AR RANLIB + local PKG_CONFIG # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 - # set AR and RANLIB to make QA scripts happy; #483342 - tc-export PKG_CONFIG AR RANLIB + tc-export PKG_CONFIG if use amd64; then if [[ ${ABI} == amd64 ]]; then diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 5fa927046960..97f1f4176260 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -528,10 +528,9 @@ multilib_src_configure() { $(use_with vaapi va) ) - local PKG_CONFIG AR RANLIB + local PKG_CONFIG # Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038 - # set AR and RANLIB to make QA scripts happy; #483342 - tc-export PKG_CONFIG AR RANLIB + tc-export PKG_CONFIG if use amd64; then if [[ ${ABI} == amd64 ]]; then |