diff options
Diffstat (limited to 'app-emulation/wine-vanilla')
| -rw-r--r-- | app-emulation/wine-vanilla/Manifest | 7 | ||||
| -rw-r--r-- | app-emulation/wine-vanilla/files/wine-vanilla-8.13-rpath.patch | 15 | ||||
| -rw-r--r-- | app-emulation/wine-vanilla/metadata.xml | 2 | ||||
| -rw-r--r-- | app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild | 3 | ||||
| -rw-r--r-- | app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 3 |
5 files changed, 24 insertions, 6 deletions
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest index 5a2edab21bc7..7170c20235c1 100644 --- a/app-emulation/wine-vanilla/Manifest +++ b/app-emulation/wine-vanilla/Manifest @@ -1,6 +1,7 @@ AUX wine-vanilla-7.0-noexecstack.patch 223 BLAKE2B dff1867e2977bd14fcfab9dfa2c2f1d3288f7edca75ddd7c9f02bfd06e9f63fac37bd59ea8aa891e13ab77bac35b369825d5490a9175ed9a7736e523b61d8944 SHA512 4ba3677042b693e513fc7a133c76a509f63d0ca20633d1e8d448bca9534c0d1a0fc58e77fa9b28fd8d936393605e97ee6e3bb5fac00872d6ac5808b7712586e3 AUX wine-vanilla-7.0-unwind.patch 1694 BLAKE2B 017c7b761d692f8e8d23f52e51529880f95bddf5fee4309ab97bee951527bd427924dbb335e4bf57a27405e3d2440666f774c6859b81933d3007247e1cbf4898 SHA512 5d20960a8eda2d80097d6db81287c9d05ed4ea50df974c93391a427b743383a6806f24bc552c18a9336e7aea0ceb801972865ff470bde8ea7fd9423f57eb09ae AUX wine-vanilla-7.20-unwind.patch 1450 BLAKE2B 3f90cc131104ad72a11ae30c582b79b3e4d8c0278d51c0a193fb9e460cf088b315503bd08bd904e8d28f72f40ab3df90f83f2542b991888a2f504cc7d2adad4d SHA512 a6c4672a44c1220d5b1efabeca535a4a3510fe92aac73c38f65a09bfbd271af8b8b1bfe2c408ba5356806cb71252a6956b8130fcd06a475037b9e51d28c2a156 +AUX wine-vanilla-8.13-rpath.patch 554 BLAKE2B 209d8c581a9178242ee622338c5252f79b798cf5574f72b3984d71b7933e011b488060502715aa75630fbc3d10fcb03743ac31ed31664cacfc22b725253a117b SHA512 bbb25e02d19bd7c1a1f2d7db331d93cfcd5ce9172206ad9e19a44c52e5ece865d474eac024c2a5791dfa006c6efe0f68cd783ffc925ac793bf447d56090bdd02 DIST wine-7.0.2.tar.xz 27179980 BLAKE2B 721ab574092638b32d3a483b6ae3def0c9d706cc888662ca461ab8c7060b10077e83cede69663ea2a8b97729f3801209fbba5f8e8828ce20454700ffbbd76cb5 SHA512 330c71005a6a8054b5068ac4484e9015e9f8bf55d5a451aaf5f79b7f78a025732b454251c31473abf21504cce3b78e50cf7e3e0d0116bb755dc8396bd790289a DIST wine-8.0.1.tar.xz 29057128 BLAKE2B f1e04ddc7531704b4229d1bdb6e742ff20886dfff181b8b44e01e9921574e8c433553aaddb2453532902e89252244080d1cf9f904aa7d14d76709d830116e4b4 SHA512 9264a3dbe8b0168aa94b8266d5686b1da39352baefa4e72a63b0ed5aa2daca8811633dc89da3bb2aff497fb2b3b917f5cd021d0baae390490f1ca5ffd5ac4b3a DIST wine-8.0.2.tar.xz 29060452 BLAKE2B dcffaba6c90c4e02a7bc591a81e11aced06c006370c4c316c8a367b2f5814926063482959fabfe9d674ee1b5a560e59087e9b711e28360ced3aee2bbd6bb8fdb SHA512 e86dd31247d757d48ffb2d24f20edab3fc6ef9c3e395567a7b363951bb681335ba3adb8b84639011b24b6eb274582d56880298d6d95fb100acc072383d4e973f @@ -12,6 +13,6 @@ EBUILD wine-vanilla-8.0.1.ebuild 10985 BLAKE2B 7b93e79599ebcf73c6fc743ffd3fe883e EBUILD wine-vanilla-8.0.2.ebuild 11059 BLAKE2B 7a9da133c7eb9402d6fd96a907cf9cb7fae17e12f960839628ceea2f01ace53a3c20217eba0ad9857b65c5536c0a40baacad43049757a9f1883b0300e884badd SHA512 228319c47c2f9962aa12edde4eaec14da3142f00f80b5546b03dec93749c5be030339abc123ebe328cc57b423d75a51770b1b9ae68410d5eb245f0b2563a586d EBUILD wine-vanilla-8.11-r1.ebuild 11168 BLAKE2B aa9617531bb05bc9fc27881772062da0982ece732a269adcb7b09a31b9e63ffef84bf795c10a34d1475d7a3c52910bd0012652bb2f4875365b0fb0d8e853984a SHA512 fb6cf93d21420a893a20d5738a4f57e9530eeb7af4a2080667b29820a8d1a1f87e3f48075b90e3ed4705eaf65af72e5982a6300579fe321d1f34e15d4e5e40c2 EBUILD wine-vanilla-8.12.ebuild 11168 BLAKE2B aa9617531bb05bc9fc27881772062da0982ece732a269adcb7b09a31b9e63ffef84bf795c10a34d1475d7a3c52910bd0012652bb2f4875365b0fb0d8e853984a SHA512 fb6cf93d21420a893a20d5738a4f57e9530eeb7af4a2080667b29820a8d1a1f87e3f48075b90e3ed4705eaf65af72e5982a6300579fe321d1f34e15d4e5e40c2 -EBUILD wine-vanilla-8.13.ebuild 12136 BLAKE2B afb4c5f72bf049523c9e1afeaaabe05d6a220731b374100b02df439e817838a14223faf9262dfa3054946931e0ac0679976b5868720f009ba3c796d40b5569c2 SHA512 8f3d37d25108a5d4cddfbfc7f3a8e02f40b953b21e53befe2d3ad06efbd83fcbd76e7be4f97d72c725636e026f55013eb55005d2c5fbbda9949b910a1767fcf7 -EBUILD wine-vanilla-9999.ebuild 12136 BLAKE2B afb4c5f72bf049523c9e1afeaaabe05d6a220731b374100b02df439e817838a14223faf9262dfa3054946931e0ac0679976b5868720f009ba3c796d40b5569c2 SHA512 8f3d37d25108a5d4cddfbfc7f3a8e02f40b953b21e53befe2d3ad06efbd83fcbd76e7be4f97d72c725636e026f55013eb55005d2c5fbbda9949b910a1767fcf7 -MISC metadata.xml 2601 BLAKE2B 7ea5c29a376394f61536668a7a675f6206bad0e3abdd07b361d8652189ccc81e9b508c60c22994c520927686ec20b81ca50de9da39718ffc594c71e16745985a SHA512 286b346dd6785331f26b75c0437b4cd90f2d8041b6b7d079f0ce9d39b55de45fab8ae2823a4550f2f95312de491e7cdbe29e0ee34d283303523cd22f489b6641 +EBUILD wine-vanilla-8.13.ebuild 12173 BLAKE2B a82f88b539caa45a6d0e4f16131a73719628a7a62e528edbd6736d3ce3a49d316b40dfdfbeab508d708b4106d1658d4f9dbebf9e12196e43d74eefcaadd74a0b SHA512 c70426d2dc0b158eb2277d13376a49d6793934fa0d7e5256ad7fc6742427ab7d463514a80b3b4613d0fed46a1a5346487d2efe369772f6a56b6920979dbd60cd +EBUILD wine-vanilla-9999.ebuild 12173 BLAKE2B a82f88b539caa45a6d0e4f16131a73719628a7a62e528edbd6736d3ce3a49d316b40dfdfbeab508d708b4106d1658d4f9dbebf9e12196e43d74eefcaadd74a0b SHA512 c70426d2dc0b158eb2277d13376a49d6793934fa0d7e5256ad7fc6742427ab7d463514a80b3b4613d0fed46a1a5346487d2efe369772f6a56b6920979dbd60cd +MISC metadata.xml 2605 BLAKE2B 11bdcd81e6e4620229177026a6eea5bbbff4f2f8c92deabd08d096bd1ffab0bea06f950fe4631f227bb31dcf22e9d41456803a3924c0cf934c5d7b28aa7f0308 SHA512 e96b8ab85a6b124ae154b514b8dd9385158b999f7ffbd0a1e04d9bbb52288cd07b81a2fe989431ac214fc0ae37445e2c819b6593d31001fa54b0aa6f48561e8a diff --git a/app-emulation/wine-vanilla/files/wine-vanilla-8.13-rpath.patch b/app-emulation/wine-vanilla/files/wine-vanilla-8.13-rpath.patch new file mode 100644 index 000000000000..5f0d63b0ec33 --- /dev/null +++ b/app-emulation/wine-vanilla/files/wine-vanilla-8.13-rpath.patch @@ -0,0 +1,15 @@ +Patch Source: https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/community/wine/rpath.patch +Alpine Bug: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13249 + +--- a/configure.ac ++++ b/configure.ac +@@ -784,6 +784,9 @@ case $host_os in + [WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -Wl,-z,max-page-size=0x1000"]) + ;; + esac ++ ++ # do this at the end because it needs double dollar for makefile ++ WINE_TRY_CFLAGS([-Wl,-rpath,\\\$ORIGIN],[UNIXLDFLAGS="$UNIXLDFLAGS '-Wl,-rpath,\$\$ORIGIN'"]) + ;; + esac + diff --git a/app-emulation/wine-vanilla/metadata.xml b/app-emulation/wine-vanilla/metadata.xml index 08f1c1fa3035..f035ae003809 100644 --- a/app-emulation/wine-vanilla/metadata.xml +++ b/app-emulation/wine-vanilla/metadata.xml @@ -32,7 +32,7 @@ This variant of the Wine packaging does not include external patchsets <flag name="vkd3d">Enable DirectX 12 support using <pkg>app-emulation/vkd3d</pkg></flag> <flag name="wow64"> Enable running 32bit applications without 32bit ELF - multilib by mapping to 64bit calls (experimental, + multilib by mapping to 64bit calls (experimental/WIP, USE=abi_x86_32 is recommended for complete support) </flag> </use> diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild index f68c984f64a3..9f0672c16b6e 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild @@ -146,6 +146,7 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext PATCHES=( "${FILESDIR}"/${PN}-7.0-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch + "${FILESDIR}"/${PN}-8.13-rpath.patch ) pkg_pretend() { @@ -374,7 +375,7 @@ pkg_postinst() { ewarn "32bit support is disabled. While 64bit applications themselves will" ewarn "work, be warned that it is not unusual that installers or other helpers" ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32," - ewarn "note that the experimental USE=wow64 can allow 32bit without multilib." + ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib." fi eselect wine update --if-unset || die diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index f68c984f64a3..9f0672c16b6e 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -146,6 +146,7 @@ QA_TEXTRELS="usr/lib/*/wine/i386-unix/*.so" # uses -fno-PIC -Wl,-z,notext PATCHES=( "${FILESDIR}"/${PN}-7.0-noexecstack.patch "${FILESDIR}"/${PN}-7.20-unwind.patch + "${FILESDIR}"/${PN}-8.13-rpath.patch ) pkg_pretend() { @@ -374,7 +375,7 @@ pkg_postinst() { ewarn "32bit support is disabled. While 64bit applications themselves will" ewarn "work, be warned that it is not unusual that installers or other helpers" ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32," - ewarn "note that the experimental USE=wow64 can allow 32bit without multilib." + ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib." fi eselect wine update --if-unset || die |