summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2017-12-08 23:42:49 -0200
committerDaniel Bermond2017-12-08 23:42:49 -0200
commit3fa525377754a7010d58253d4c7aa2c5ba87cbbc (patch)
tree04fd3aeefd9eb0e89585879460ee39c4aa910ba8
parent7b328a0f25e1d9898d5cd16679751a522954f0c1 (diff)
downloadaur-3fa525377754a7010d58253d4c7aa2c5ba87cbbc.tar.gz
Remove gcc-multilib (merged into [core]/gcc). RC version fix.
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD11
2 files changed, 11 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a867ea44f12..e4ba9f70843 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon Sep 4 16:44:55 UTC 2017
+# Sat Dec 9 01:42:42 UTC 2017
pkgbase = wine-staging-git
pkgdesc = A compatibility layer for running Windows programs (staging branch, git version)
- pkgver = 2.15.r10.gc5046319+wine.2.15.r151.ge06b7693d6
+ pkgver = 2.21.r0.g90679f2f+wine.2.21.r0.g53290d2ec4
pkgrel = 1
url = https://www.wine-staging.com/
arch = i686
@@ -16,7 +16,6 @@ pkgbase = wine-staging-git
makedepends = fontforge
makedepends = flex
makedepends = gcc>=4.5.0-2
- makedepends = gcc-multilib>=4.5.0-2
makedepends = giflib
makedepends = lib32-giflib
makedepends = libpng
@@ -135,10 +134,10 @@ pkgbase = wine-staging-git
optdepends = cups
optdepends = samba
optdepends = dosbox
- 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
+ provides = wine=2.21.r0.g53290d2ec4
+ provides = wine-wow64=2.21.r0.g53290d2ec4
+ provides = wine-git=2.21.r0.g53290d2ec4
+ provides = wine-staging=2.21.r0.g90679f2f
conflicts = wine
conflicts = wine-wow64
conflicts = wine-git
diff --git a/PKGBUILD b/PKGBUILD
index 71760507058..1ec5c9469ee 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Bermond < yahoo-com: danielbermond >
pkgname=wine-staging-git
-pkgver=2.15.r10.gc5046319+wine.2.15.r151.ge06b7693d6
+pkgver=2.21.r0.g90679f2f+wine.2.21.r0.g53290d2ec4
pkgrel=1
pkgdesc='A compatibility layer for running Windows programs (staging branch, git version)'
arch=('i686' 'x86_64')
@@ -25,7 +25,7 @@ _depends=(
'desktop-file-utils'
)
makedepends=('git' 'autoconf' 'ncurses' 'bison' 'perl' 'fontforge' 'flex'
- 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2'
+ 'gcc>=4.5.0-2'
'giflib' 'lib32-giflib'
'libpng' 'lib32-libpng'
'gnutls' 'lib32-gnutls'
@@ -89,7 +89,6 @@ then
# strip lib32 etc. on i686
_depends=("${_depends[@]/*32-*/}")
makedepends=("${makedepends[@]/*32-*/}" "${_depends[@]}")
- makedepends=("${makedepends[@]/*-multilib*/}")
optdepends=("${optdepends[@]/*32-*/}")
provides=(
"wine=$( printf '%s' "$pkgver" | sed 's/.*\+wine\.//')"
@@ -128,12 +127,12 @@ prepare() {
pkgver() {
cd "$pkgname"
- local _staging_tag="$(git tag --sort='version:refname' | tail -n1 | sed 's/-/./g;s/^v//')"
+ 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//' \
+ | 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//')"
+ 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"
}