summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2017-12-08 22:45:39 -0200
committerDaniel Bermond2017-12-08 22:45:39 -0200
commit084aae7f61585b1c4fdccc7a650134b52379d051 (patch)
tree21e7702fdc4866d2ba0e390f0ae57eea0480d569
parent746bdb75fb07f01d62bf8aa7934ffa6ccbaf583a (diff)
downloadaur-084aae7f61585b1c4fdccc7a650134b52379d051.tar.gz
Remove gcc-multilib (merged into [core]/gcc). RC version fix.
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD7
2 files changed, 8 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 228f06e4b8b..a1f01a9d76d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Tue Oct 10 20:25:27 UTC 2017
+# Sat Dec 9 00:44:08 UTC 2017
pkgbase = wine-git
pkgdesc = A compatibility layer for running Windows programs (git version)
- pkgver = 2.18.r144.gee7ddd1ed3
+ pkgver = 3.0rc1.r0.g5a7ce7ccb1
pkgrel = 1
url = https://www.winehq.org
arch = i686
@@ -16,7 +16,6 @@ pkgbase = wine-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
@@ -121,9 +120,9 @@ pkgbase = wine-git
optdepends = cups
optdepends = samba
optdepends = dosbox
- provides = wine=2.18.r144.gee7ddd1ed3
- provides = bin32-wine=2.18.r144.gee7ddd1ed3
- provides = wine-wow64=2.18.r144.gee7ddd1ed3
+ provides = wine=3.0rc1.r0.g5a7ce7ccb1
+ provides = bin32-wine=3.0rc1.r0.g5a7ce7ccb1
+ provides = wine-wow64=3.0rc1.r0.g5a7ce7ccb1
conflicts = wine
conflicts = wine-staging
conflicts = wine-staging-git
diff --git a/PKGBUILD b/PKGBUILD
index 7b5f02940dc..5de7dff9e74 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: sxe <sxxe@gmx.de>
pkgname=wine-git
-pkgver=2.18.r144.gee7ddd1ed3
+pkgver=3.0rc1.r0.g5a7ce7ccb1
pkgrel=1
pkgdesc='A compatibility layer for running Windows programs (git version)'
arch=('i686' 'x86_64')
@@ -26,7 +26,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'
@@ -82,7 +82,6 @@ then
# strip lib32 etc. on i686
_depends=(${_depends[@]/*32-*/})
makedepends=(${makedepends[@]/*32-*/} ${_depends[@]})
- makedepends=(${makedepends[@]/*-multilib*/})
optdepends=(${optdepends[@]/*32-*/})
provides=("wine=${pkgver}")
conflicts=('wine' 'wine-staging' 'wine-staging-git')
@@ -102,7 +101,7 @@ prepare() {
pkgver() {
cd "$pkgname"
- git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^wine.//;s/^v//'
+ git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^wine.//;s/^v//;s/\.rc/rc/'
}
build() {