summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2017-09-04 13:45:11 -0300
committerDaniel Bermond2017-09-04 13:45:11 -0300
commit7b328a0f25e1d9898d5cd16679751a522954f0c1 (patch)
tree9be04f3d2c5ae64b100f1c93857564ad96c539af
parentbf8af300c07d016d542e7d6da745050776fb7617 (diff)
downloadaur-7b328a0f25e1d9898d5cd16679751a522954f0c1.tar.gz
Workaround for FS#55128
References ---------- https://git.archlinux.org/svntogit/community.git/commit/trunk?h=packages/wine-staging&id=5291badb8c9cac99909a028342e037303d73c370 https://bugs.archlinux.org/task/55128 https://bugs.winehq.org/show_bug.cgi?id=43530
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD10
2 files changed, 15 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 123c39064da..a867ea44f12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Sep 4 16:03:23 UTC 2017
+# Mon Sep 4 16:44:55 UTC 2017
pkgbase = wine-staging-git
pkgdesc = A compatibility layer for running Windows programs (staging branch, git version)
- pkgver = 2.12.r6.g201e6261+wine.2.12.r134.gab313dd3be
- pkgrel = 4
+ pkgver = 2.15.r10.gc5046319+wine.2.15.r151.ge06b7693d6
+ pkgrel = 1
url = https://www.wine-staging.com/
arch = i686
arch = x86_64
@@ -135,10 +135,10 @@ pkgbase = wine-staging-git
optdepends = cups
optdepends = samba
optdepends = dosbox
- provides = wine=2.12.r134.gab313dd3be
- provides = wine-wow64=2.12.r134.gab313dd3be
- provides = wine-git=2.12.r134.gab313dd3be
- provides = wine-staging=2.12.r6.g201e6261
+ provides = wine=2.15.r151.ge06b7693d6
+ provides = wine-wow64=2.15.r151.ge06b7693d6
+ provides = wine-git=2.15.r151.ge06b7693d6
+ provides = wine-staging=2.15.r10.gc5046319
conflicts = wine
conflicts = wine-wow64
conflicts = wine-git
diff --git a/PKGBUILD b/PKGBUILD
index f2b04e102a6..71760507058 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Daniel Bermond < yahoo-com: danielbermond >
pkgname=wine-staging-git
-pkgver=2.12.r6.g201e6261+wine.2.12.r134.gab313dd3be
-pkgrel=4
+pkgver=2.15.r10.gc5046319+wine.2.15.r151.ge06b7693d6
+pkgrel=1
pkgdesc='A compatibility layer for running Windows programs (staging branch, git version)'
arch=('i686' 'x86_64')
url='https://www.wine-staging.com/'
@@ -147,6 +147,12 @@ build() {
msg2 'Applying wine-staging patches...'
./"${pkgname}"/patches/patchinstall.sh DESTDIR="${srcdir}/wine-git" --all
+ # workaround for FS#55128
+ # https://bugs.archlinux.org/task/55128
+ # https://bugs.winehq.org/show_bug.cgi?id=43530
+ export CFLAGS="${CFLAGS/-fno-plt/}"
+ export LDFLAGS="${LDFLAGS/,-z,now/}"
+
# build wine-staging 64-bit
# (according to the wine wiki, this 64-bit/32-bit building order is mandatory)
if [ "$CARCH" = "x86_64" ]