diff options
author | Bermond | 2016-03-28 16:24:12 -0300 |
---|---|---|
committer | Bermond | 2016-03-28 16:24:12 -0300 |
commit | 415cba6692fb6f041fc8f1c83e9bbe7827d5d6b3 (patch) | |
tree | cea87e2b7a3e755ba568e31b68ba34bd354e815a | |
parent | 717c113761c945195aca39f18a7aaf2ef88094e1 (diff) | |
download | aur-415cba6692fb6f041fc8f1c83e9bbe7827d5d6b3.tar.gz |
Fix patchisntall error
Before applying wine-staging patches it's necessary to change back
to the wine upstream commit that the current wine-staging version
is based in.
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 7 |
2 files changed, 9 insertions, 6 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Mon Mar 28 18:36:21 UTC 2016 +# Mon Mar 28 19:20:17 UTC 2016 pkgbase = wine-staging-git pkgdesc = A compatibility layer for running Windows programs (staging branch, Git version) - pkgver = 1.9.6.r34.g96fddf8+wine.1.9.6.r144.g4315cae - pkgrel = 2 + pkgver = 1.9.6.r37.g0a391fa+wine.1.9.6.r144.g4315cae + pkgrel = 1 url = https://github.com/wine-compholio/wine-staging/ install = wine-staging.install arch = i686 @@ -136,7 +136,7 @@ pkgbase = wine-staging-git optdepends = samba provides = wine=1.9.6.r144.g4315cae provides = wine-wow64=1.9.6.r144.g4315cae - provides = wine-staging=1.9.6.r34.g96fddf8 + provides = wine-staging=1.9.6.r37.g0a391fa provides = wine-git conflicts = wine conflicts = wine-wow64 @@ -1,8 +1,8 @@ # Maintainer: Daniel Bermond < yahoo-com: danielbermond > pkgname=wine-staging-git -pkgver=1.9.6.r34.g96fddf8+wine.1.9.6.r144.g4315cae -pkgrel=2 +pkgver=1.9.6.r37.g0a391fa+wine.1.9.6.r144.g4315cae +pkgrel=1 pkgdesc="A compatibility layer for running Windows programs (staging branch, Git version)" arch=('i686' 'x86_64') url="https://github.com/wine-compholio/wine-staging/" @@ -129,6 +129,9 @@ prepare() { #+otherwise the patches will fail to be reapplied) git reset --hard HEAD # Restore tracked files git clean -d -x -f # Delete untracked files + + # Change back to the wine upstream commit that this version of wine-staging is based in + git checkout $(../"$pkgname"/patches/patchinstall.sh --upstream-commit) } build() { |