summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-10-16 12:15:34 +0000
committerDaniel Bermond2018-10-17 18:30:52 +0000
commit807e070b9c9eb122d09d16d85dbee5f655dc12ab (patch)
tree0002e6759e1f18c20082e42c223b30872ee0ab49
parent4da9d2460aa3e4376bb01b10ba3208bdf6c5f8c0 (diff)
downloadaur-807e070b9c9eb122d09d16d85dbee5f655dc12ab.tar.gz
Remove makepkg internal function
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD14
2 files changed, 11 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 56317227b35..6a0fc9d793f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = wine-git
pkgdesc = A compatibility layer for running Windows programs (git version)
- pkgver = 3.17.r156.gecea7a94c9
+ pkgver = 3.18.r75.ge55aca8f49
pkgrel = 1
url = https://www.winehq.org/
install = wine-git.install
@@ -124,12 +124,10 @@ pkgbase = wine-git
optdepends = cups
optdepends = samba
optdepends = dosbox
- provides = wine=3.17.r156.gecea7a94c9
- provides = bin32-wine=3.17.r156.gecea7a94c9
- provides = wine-wow64=3.17.r156.gecea7a94c9
+ provides = wine=3.18.r75.ge55aca8f49
+ provides = bin32-wine=3.18.r75.ge55aca8f49
+ provides = wine-wow64=3.18.r75.ge55aca8f49
conflicts = wine
- conflicts = wine-staging
- conflicts = wine-staging-git
conflicts = bin32-wine
conflicts = wine-wow64
replaces = bin32-wine
diff --git a/PKGBUILD b/PKGBUILD
index 00e7c6f819e..952f0da98f0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: sxe <sxxe@gmx.de>
pkgname=wine-git
-pkgver=3.17.r156.gecea7a94c9
+pkgver=3.18.r75.ge55aca8f49
pkgrel=1
pkgdesc='A compatibility layer for running Windows programs (git version)'
arch=('i686' 'x86_64')
@@ -90,11 +90,11 @@ then
makedepends=(${makedepends[@]/*32-*/} ${_depends[@]})
optdepends=(${optdepends[@]/*32-*/})
provides=("wine=${pkgver}")
- conflicts=('wine' 'wine-staging' 'wine-staging-git')
+ conflicts=('wine')
else
makedepends=(${makedepends[@]} ${_depends[@]})
provides=("wine=${pkgver}" "bin32-wine=${pkgver}" "wine-wow64=${pkgver}")
- conflicts=('wine' 'wine-staging' 'wine-staging-git' 'bin32-wine' 'wine-wow64')
+ conflicts=('wine' 'bin32-wine' 'wine-wow64')
replaces=('bin32-wine')
fi
@@ -125,7 +125,7 @@ build() {
# (according to the wine wiki, this 64-bit/32-bit building order is mandatory)
if [ "$CARCH" = 'x86_64' ]
then
- msg2 'Building Wine-64...'
+ printf '%s\n' ' -> Building Wine-64...'
mkdir "$pkgname"-64-build
cd "$pkgname"-64-build
@@ -147,7 +147,7 @@ build() {
fi
# build wine 32-bit
- msg2 'Building Wine-32...'
+ printf '%s\n' ' -> Building Wine-32...'
cd "${srcdir}/${pkgname}"-32-build
@@ -164,7 +164,7 @@ package() {
# package wine 32-bit
# (according to the wine wiki, this reverse 32-bit/64-bit packaging order is important)
- msg2 'Packaging Wine-32...'
+ printf '%s\n' ' -> Packaging Wine-32...'
cd "$pkgname"-32-build
@@ -177,7 +177,7 @@ package() {
dlldir="$pkgdir/usr/lib32/wine" install
# package wine 64-bit
- msg2 'Packaging Wine-64...'
+ printf '%s\n' ' -> Packaging Wine-64...'
cd "${srcdir}/${pkgname}"-64-build