commit: 4cedbb14272257f87b4c611f5dfd55c5eaf68f9b
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 12 12:31:57 2016 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 12:31:57 2016 +0000
URL: https://gitweb.gentoo.org/dev/bircoph.git/commit/?id=4cedbb14
app-emulation/wine: sync with portage
app-emulation/wine/Manifest | 6 +--
app-emulation/wine/metadata.xml | 1 +
.../{wine-1.9.15.ebuild => wine-1.9.16.ebuild} | 44 ++++++++++------------
3 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 7a52730..cfcbc24 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -1,7 +1,7 @@
-DIST wine-1.9.15.tar.bz2 23357574 SHA256
cf992ac991b0e49fd0b186305021acf6e612d5df18d30e3d5808fa6f6731adda SHA512
39eda9c0123453321d414690db5ca5849326bf44d116a353296e88026fa618535a306b9e0c6666ea6716dc8d44f81a2caeae11be80f15448b67bde2be9e1210a
WHIRLPOOL
cdaa74399ef4849a297a9d8040333500e1007ca8374b76e0677ba8b21e087feac262cf449f90826f4cd417989742670f86eed4c2fb5ef4345e8b955e8213fbef
-DIST wine-d3d9-1.9.15.tar.gz 46418 SHA256
e6d8029e37c4afa8018f595ae8ee23a547782a614d5605352301685889996388 SHA512
6ad990ebd023d0125146c3b785cf38862368c3034daac6dad1a2e3a04737c5a31fbc81b562e4571ea386f515a04b50d42699b783ab15d9e3b19b12b1a7148c08
WHIRLPOOL
01a37e81fbbf99bbeab7b3c06eaadd52e8d4cf6459958465aa53d76b1717fb8bda356bae3f36c790bca29f38f80546c8d32a376f5fcb4d35f1593b647c9f5109
+DIST wine-1.9.16.tar.bz2 23419636 SHA256
e120d6673aada93935c6661b75c2edc835a45a8e658b80934c36434b56940f04 SHA512
6848d53064d2eaea207ed4e5440104408cb6a6b9c62241788abce31b8d115529428427a1e3bf0e94eac43b71bd8641597060b6ea7391d1a87b36ff557a964018
WHIRLPOOL
055abf278ada0dae4eaa73b70c9426664533e941b024be688ce0a1e24a88527104cf986e8cabed9bcc17758219d93d7b218c80ba68ea3449785c22ba6d222409
+DIST wine-d3d9-1.9.16.tar.gz 46413 SHA256
bf45d4ccd900147bacb7f66c7fcc28dac9d3d7a0b3c0708a0ad05f519c5a5cec SHA512
fbd5b4c9ff342740404ad4ec0f059ffed470b60f87a8b56617cf7af83a357f93dcb19f6e0ab7203bd5e0e3821cb6c6ea3b4455fbda22f09cbbd679152f259aa6
WHIRLPOOL
ad70b1a683672fc83913b83b8686b2abeceaca0fc8922cb88c5a3101712cc40fbd1d9fc78af0acc48cd50c239a7e0e84f2f7776218b868b53c90a60e1f3254b1
DIST wine-gentoo-2015.03.07.tar.bz2 85419 SHA256
f13f93dc49bbc33a294c4d511b6e01aec2d38bff77a1e44d07668291add1ab04 SHA512
bae1d2d5575d340d01f44008104f0e5ec0c4a4982995dec37d501594cd21d07a2b4ad4465c4273646d5bf6521996b4b82471097864be75342abe3e7d478a56bd
WHIRLPOOL
0f254dd692e87a1f71dd19f6c1c8c59b8a91b994e75912a2e6e3ba5e875b85119fe497a331a95c2ce33bbf5f064143d23ee00275da92c494227de0807c9abb06
DIST wine-mono-4.6.3.msi 45591040 SHA256
f883e88ae78c7ea3d887c24023aa1ed03bb71a83f717c6595abf18b31fef28b9 SHA512
b940d7c07d0892ac76ad9e4c3d4d159afeee43765b6bfe07f14beee1fc8674b58a9af20a5ee0a4d9667a15b83a0e6538c0143b9072c677dd753e32bbdd17065b
WHIRLPOOL
f04002904d99dc2615a179c13ae810c8208808c60c5e5eda7f9c3f07163d645cccf6f74d4354331fa25dfb41ef2c24e432f83670a3e7c3a90fa6d144b3d193b9
-DIST wine-staging-1.9.15.tar.gz 9926094 SHA256
10b836e4f78b7da1693cf1199f1b16c160a844a6372733817be31de67ea85150 SHA512
7eb1774381925944abe6bcbe1a8e1810b4d7f51d1f3c15bcdc15084420bfdb6f90b8edbbc0876ad87e896471ab9c9f21d14420c3ecb485aa8ead4256ff8ca60b
WHIRLPOOL
bcb9e7f15437a03baed57aeb082267b47a06504246f029bf31ead117a258b1b26dd70924427c0cda1526f7fab5ac1eb17a756fb5c1b2f87d8f8727923a185d4e
+DIST wine-staging-1.9.16.tar.gz 9919553 SHA256
24b0386b3bd04a2e48b5233487b2b3479d6e4042b44378ad3b9f1e04c5082a1d SHA512
bc5b1d3526fd56755a7874417eba86757295745252a0a157c14f0d02f211e1bc11530c47387f68d69b5fdb4028365e55dbd01028c36475d71d9b6d7a585ff391
WHIRLPOOL
233c8f49d379a1c59d62676fcfb332b2dc006d4424eb9440cfb9e8ec1b99c92d2f7bf8da5fe46f10f60d3d90db448ee84c3cda3c54727a6a0c14c0daa3845790
DIST wine_gecko-2.47-x86.msi 49266176 SHA256
3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a SHA512
e0d06102dcb8ec2d24e8c8c3f5c2ee5cb47c18e203dfb43d85de008d682ff874fb664fef1df909a5a7857de39c7e8ce5175e734a11964ec4cd35f8fbacaea3a4
WHIRLPOOL
2b4e3e88d530106d942200e5cdc67e51fc529c51864dee687ff1d6ae4cc94557481f74797a5ca7c1de8ca5ad00f7d9cb71e484ab24d73867d1032ccd88c0c376
DIST wine_gecko-2.47-x86_64.msi 50806272 SHA256
c565ea25e50ea953937d4ab01299e4306da4a556946327d253ea9b28357e4a7d SHA512
7c2496b15a06bc6906bc60afb3ac082e3f9931207fa624e60297020211d66aa9b420a61e95730a0dbdcefbe4b26c811d0c896ecd9c363b5107d08c3fa22fef41
WHIRLPOOL
c7619954da22a47dae86ef4c6c0cfbece41943edcceb2c21babe610e0a0b2197b244ebbddd2f3986ee4d5251b062e5f3b8e079426ec77c311b928d18c8451677
diff --git a/app-emulation/wine/metadata.xml b/app-emulation/wine/metadata.xml
index aa61670..be1ec4a 100644
--- a/app-emulation/wine/metadata.xml
+++ b/app-emulation/wine/metadata.xml
@@ -41,6 +41,7 @@ Think of Wine as a compatibility layer for running Windows
programs. Wine does n
http://wiki.winehq.org/NtlmSigningAndSealing</flag>
<flag name="staging">Apply Wine-Staging patches for advanced
feature support that haven't made it into upstream Wine yet
For versions before wine-1.8, this patchset is
unofficial.</flag>
+ <flag name="themes">Support GTK+:3 window theming through
Wine-Staging</flag>
</use>
<upstream>
<remote-id type="github">wine-compholio/wine-staging</remote-id>
diff --git a/app-emulation/wine/wine-1.9.15.ebuild
b/app-emulation/wine/wine-1.9.16.ebuild
similarity index 94%
rename from app-emulation/wine/wine-1.9.15.ebuild
rename to app-emulation/wine/wine-1.9.16.ebuild
index 4433df1..2e919eb 100644
--- a/app-emulation/wine/wine-1.9.15.ebuild
+++ b/app-emulation/wine/wine-1.9.16.ebuild
@@ -61,7 +61,7 @@ fi
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos
elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms
ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl
pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner
selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite
xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags d3d9 dos
elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg kernel_FreeBSD +lcms
ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl
pcap pipelight +png prelink pulseaudio +realtime +run-exes s3tc samba scanner
selinux +ssl staging test themes +threads +truetype +udisks v4l vaapi +X
+xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -69,6 +69,7 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
pipelight? ( staging )
s3tc? ( staging )
test? ( abi_x86_32 )
+ themes? ( staging )
vaapi? ( staging )" # osmesa-opengl #286560 # X-truetype #551124
# FIXME: the test suite is unsuitable for us; many tests require net access
@@ -120,6 +121,11 @@ COMMON_DEPEND="
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] )
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] )
staging? ( sys-apps/attr[${MULTILIB_USEDEP}] )
+ themes? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ x11-libs/cairo[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+ )
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] )
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] )
@@ -197,8 +203,7 @@ wine_compiler_check() {
$(tc-getCC) -O2 "${FILESDIR}"/pr66838.c -o
"${T}"/pr66838 || die
# Run in subshell to prevent "Aborted" message
( "${T}"/pr66838 || false ) >/dev/null 2>&1
- eend $?
- if [[ $? -ne 0 ]] ; then
+ if ! eend $?; then
eerror "64-bit wine cannot be built with
gcc-5.1 or initial patchset of 5.2.0"
eerror "due to compiler bugs; please re-emerge
the latest gcc-5.2.x ebuild,"
eerror "or use gcc-config to select a different
compiler version."
@@ -211,9 +216,8 @@ wine_compiler_check() {
if use abi_x86_64 && [[ $(gcc-major-version) = 5 &&
$(gcc-minor-version) = 3 ]]; then
ebegin "Checking for gcc-5-3 stack realignment compiler
bug"
# Compile in subshell to prevent "Aborted" message
- ( $(tc-getCC) -O2 -mincoming-stack-boundary=3
"${FILESDIR}"/pr69140.c -o "${T}"/pr69140 || false ) >/dev/null 2>&1
- eend $?
- if [[ $? -ne 0 ]] ; then
+ ( $(tc-getCC) -O2 -mincoming-stack-boundary=3
"${FILESDIR}"/pr69140.c -o "${T}"/pr69140 ) >/dev/null 2>&1
+ if ! eend $?; then
eerror "Wine cannot be built with this version
of gcc-5.3"
eerror "due to compiler bugs; please re-emerge
the latest gcc-5.3.x ebuild,"
eerror "or use gcc-config to select a different
compiler version."
@@ -229,8 +233,7 @@ wine_compiler_check() {
ebegin "Checking for 64-bit compiler with builtin_ms_va_list
support"
# Compile in subshell to prevent "Aborted" message
( $(tc-getCC) -O2 "${FILESDIR}"/builtin_ms_va_list.c -o
"${T}"/builtin_ms_va_list >/dev/null 2>&1)
- eend $?
- if [[ $? -ne 0 ]]; then
+ if ! eend $?; then
eerror "This version of $(tc-getCC) does not support
builtin_ms_va_list, can't enable 64-bit wine"
eerror
eerror "You need gcc-4.4+ or clang 3.8+ to build 64-bit
wine"
@@ -243,7 +246,7 @@ wine_compiler_check() {
wine_build_environment_check() {
[[ ${MERGE_TYPE} = "binary" ]] && return 0
- if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2>
/dev/null) = "xintel" ]]; then
+ if use abi_x86_32 && use opencl && [[ "$(eselect opencl show 2>
/dev/null)" == "intel" ]]; then
eerror "You cannot build wine with USE=opencl because
intel-ocl-sdk is 64-bit only."
eerror "See https://bugs.gentoo.org/487864 for more details."
eerror
@@ -257,8 +260,7 @@ pkg_pretend() {
# Verify OSS support
if use oss && ! use kernel_FreeBSD; then
- local oss_vers=$(best_version media-sound/oss)
- if [[ -z ${oss_vers} ]] || ! version_is_at_least "4"
${oss_vers}; then
+ if ! has_version ">=media-sound/oss-4"; then
eerror "You cannot build wine with USE=oss without
having support from a"
eerror "FreeBSD kernel or >=media-sound/oss-4 (only
available through external repos)"
eerror
@@ -285,10 +287,8 @@ src_unpack() {
if use staging; then
local WINE_COMMIT=${EGIT_VERSION}
- EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
- unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
-
- EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
+ git-r3_fetch "${STAGING_EGIT_REPO_URI}"
+ git-r3_checkout "${STAGING_EGIT_REPO_URI}"
"${STAGING_DIR}"
local
STAGING_COMMIT=$("${STAGING_DIR}/patches/patchinstall.sh" --upstream-commit) ||
die
@@ -299,17 +299,12 @@ src_unpack() {
fi
fi
if use d3d9; then
- EGIT_REPO_URI="${D3D9_EGIT_REPO_URI}"
- unset ${PN}_LIVE_{REPO,BRANCH,COMMIT} EGIT_COMMIT;
- EGIT_CHECKOUT_DIR="${D3D9_DIR}" git-r3_src_unpack
+ git-r3_fetch "${D3D9_EGIT_REPO_URI}"
+ git-r3_checkout "${D3D9_EGIT_REPO_URI}" "${D3D9_DIR}"
fi
- else
- unpack ${P}.tar.bz2
- use staging && unpack "${STAGING_P}.tar.gz"
- use d3d9 && unpack "${D3D9_P}.tar.gz"
fi
- unpack "${WINE_GENTOO}.tar.bz2"
+ default
l10n_find_plocales_changes "${S}/po" "" ".po"
}
@@ -336,7 +331,7 @@ src_prepare() {
cd "${STAGING_DIR}/patches"
source "${STAGING_DIR}/patches/patchinstall.sh"
)
- eend $?
+ eend $? || die "Failed to apply Wine-Staging patches"
# To differentiate unofficial staging releases
if [[ ! -z ${SUFFIX} ]]; then
@@ -422,6 +417,7 @@ multilib_src_configure() {
use staging && myconf+=(
--with-xattr
+ $(use_with themes gtk3)
$(use_with vaapi va)
)
use d3d9 && myconf+=( $(use_with d3d9 d3dadapter) )
