diff options
author | Adrià Cereto-Massagué | 2018-03-07 14:34:40 +0100 |
---|---|---|
committer | Adrià Cereto-Massagué | 2018-03-07 14:34:40 +0100 |
commit | d296016fa55c765cf5dec06b9132abd28ce980dc (patch) | |
tree | a055a8e19e5404ecdf06731e2215b8dc5b915444 | |
parent | 0a27bdededb098baea2db2f77bd18c3dad84cc25 (diff) | |
download | aur-d296016fa55c765cf5dec06b9132abd28ce980dc.tar.gz |
change to stable staging
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | PKGBUILD | 19 |
2 files changed, 15 insertions, 18 deletions
@@ -1,7 +1,7 @@ pkgbase = wine-staging-vulkan-git pkgdesc = A compatibility layer for running Windows programs (staging branch, git version) with Vulkan patches - pkgver = 3.3.r0.ge09e1fd3+ - pkgrel = 2 + pkgver = 3.3+20180304.58661056ff + pkgrel = 1 url = https://www.wine-staging.com/ install = wine-staging-vulkan-git.install arch = i686 @@ -137,17 +137,17 @@ pkgbase = wine-staging-vulkan-git optdepends = cups optdepends = samba optdepends = dosbox - provides = wine=3.3.r0.ge09e1fd3+ - provides = wine-wow64=3.3.r0.ge09e1fd3+ - provides = wine-git=3.3.r0.ge09e1fd3+ - provides = wine-staging=3.3.r0.ge09e1fd3+ + provides = wine=3.3+20180304.58661056ff + provides = wine-wow64=3.3+20180304.58661056ff + provides = wine-git=3.3+20180304.58661056ff + provides = wine-staging=3.3+20180304.58661056ff conflicts = wine conflicts = wine-wow64 conflicts = wine-git conflicts = wine-staging options = staticlibs source = wine-git::git+https://github.com/roderickc/wine-vulkan.git - source = wine-staging-vulkan-git::git+https://github.com/wine-staging/wine-staging.git + source = staging.tar.gz::https://github.com/wine-staging/wine-staging/archive/v3.3.tar.gz source = harmony-fix.diff source = 30-win32-aliases.conf source = wine-binfmt.conf @@ -2,8 +2,9 @@ # Contributor: Daniel Bermond < yahoo-com: danielbermond > pkgname=wine-staging-vulkan-git -pkgver=3.3.r0.ge09e1fd3+ -pkgrel=2 +_staging_ver=3.3 +pkgver=3.3+20180304.58661056ff +pkgrel=1 pkgdesc='A compatibility layer for running Windows programs (staging branch, git version) with Vulkan patches' arch=('i686' 'x86_64') url='https://www.wine-staging.com/' @@ -82,7 +83,7 @@ optdepends=( options=('staticlibs') install="$pkgname".install source=('wine-git'::'git+https://github.com/roderickc/wine-vulkan.git' - "$pkgname"::'git+https://github.com/wine-staging/wine-staging.git' + "staging.tar.gz"::'https://github.com/wine-staging/wine-staging/archive/v3.3.tar.gz' 'harmony-fix.diff' '30-win32-aliases.conf' 'wine-binfmt.conf') @@ -116,6 +117,9 @@ else fi prepare() { + tar xvf staging.tar.gz + rm -rf $pkgname + mv wine-staging-* $pkgname cd 'wine-git' # restore the wine tree to its git origin state, without wine-staging patches @@ -137,15 +141,8 @@ prepare() { } pkgver() { - cd "$pkgname" - local _staging_tag="$(git tag --sort='version:refname' | tail -n1 | sed 's/-/./g;s/^v//;s/\.rc/rc/')" - local _staging_version="$(git describe --long --tags \ - | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//;s/\.rc/rc/' \ - | sed "s/^latest.release/${_staging_tag}/")" cd "${srcdir}/wine-git" - local _wine_version="$(git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//;s/\.rc/rc/')" - - printf '%s+%s' "$_staging_version" "$_wine_version" + echo $_staging_ver+$(git log -1 --format=%cd.%h --date=short|tr -d -) } build() { |