summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2020-03-19 23:06:02 +0000
committerDaniel Bermond2020-03-19 23:06:02 +0000
commitf0c082f2b1a1b84e8307a6f91135fd85df4ade3d (patch)
treeea6c3936677c42ac479accf1e11da78d8f07aba8
parent714c8bd82cbcf0405c56c5572c75167a34e6a2e0 (diff)
downloadaur-f0c082f2b1a1b84e8307a6f91135fd85df4ade3d.tar.gz
Enable xactengine-initial patchset (fixed upstream)
The build error with the xactengine-initial patchset was fixed[1] upstream and now it can be enabled. References ---------- [1] https://github.com/wine-staging/wine-staging/commit/a1246b5e921ea950851e4a971fb3dae535d7b982
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD6
2 files changed, 8 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 007b8a05581d..c191da0a0279 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = wine-staging-git
pkgdesc = A compatibility layer for running Windows programs (staging branch, git version)
- pkgver = 5.3.r14.g5213d551+wine.5.3.r139.g4f53be1a6e
+ pkgver = 5.4.r8.g53b02cd0+wine.5.4.r128.gc43998cb51
pkgrel = 1
url = https://www.wine-staging.com/
install = wine-staging-git.install
@@ -154,10 +154,10 @@ pkgbase = wine-staging-git
optdepends = cups
optdepends = samba
optdepends = dosbox
- provides = wine=5.3.r139.g4f53be1a6e
- provides = wine-wow64=5.3.r139.g4f53be1a6e
- provides = wine-git=5.3.r139.g4f53be1a6e
- provides = wine-staging=5.3.r14.g5213d551
+ provides = wine=5.4.r128.gc43998cb51
+ provides = wine-wow64=5.4.r128.gc43998cb51
+ provides = wine-git=5.4.r128.gc43998cb51
+ provides = wine-staging=5.4.r8.g53b02cd0
conflicts = wine
conflicts = wine-wow64
options = staticlibs
diff --git a/PKGBUILD b/PKGBUILD
index 80686e38590d..81f62727391b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
pkgname=wine-staging-git
-pkgver=5.3.r14.g5213d551+wine.5.3.r139.g4f53be1a6e
+pkgver=5.4.r8.g53b02cd0+wine.5.4.r128.gc43998cb51
pkgrel=1
pkgdesc='A compatibility layer for running Windows programs (staging branch, git version)'
arch=('i686' 'x86_64')
@@ -147,10 +147,10 @@ prepare() {
# fix path of opencl headers
sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure*
- # apply wine-staging patches (exclude xactengine-initial due to build error)
+ # apply all wine-staging patches
printf '%s\n' ' -> Applying wine-staging patches...'
cd "${srcdir}/wine-staging/patches"
- ./patchinstall.sh DESTDIR="${srcdir}/wine" --all -W xactengine-initial
+ ./patchinstall.sh DESTDIR="${srcdir}/wine" --all
}
pkgver() {