summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-10-16 12:17:13 +0000
committerDaniel Bermond2018-10-17 18:36:03 +0000
commit7238dfe5ce96217fae0cb064a9c760977a3cb33b (patch)
tree7e26cedd5bfb7740d43a08e7c27eec803df3dc14
parent376fd4d6e75686eb5ae898548afa86e97ca6214a (diff)
downloadaur-7238dfe5ce96217fae0cb064a9c760977a3cb33b.tar.gz
Remove makepkg internal function
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD20
2 files changed, 15 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 43eb8536430..389fc97a908 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = wine-staging-git
pkgdesc = A compatibility layer for running Windows programs (staging branch, git version)
- pkgver = 3.17.r13.g4beed4a3+wine.3.17.r144.g9f05343013
+ pkgver = 3.18.r8.g8519a9ea+wine.3.18.r75.ge55aca8f49
pkgrel = 1
url = https://www.wine-staging.com/
install = wine-staging-git.install
@@ -138,14 +138,12 @@ pkgbase = wine-staging-git
optdepends = cups
optdepends = samba
optdepends = dosbox
- provides = wine=3.17.r144.g9f05343013
- provides = wine-wow64=3.17.r144.g9f05343013
- provides = wine-git=3.17.r144.g9f05343013
- provides = wine-staging=3.17.r13.g4beed4a3
+ provides = wine=3.18.r75.ge55aca8f49
+ provides = wine-wow64=3.18.r75.ge55aca8f49
+ provides = wine-git=3.18.r75.ge55aca8f49
+ provides = wine-staging=3.18.r8.g8519a9ea
conflicts = wine
conflicts = wine-wow64
- conflicts = wine-git
- conflicts = wine-staging
options = staticlibs
source = wine-git::git://source.winehq.org/git/wine.git
source = wine-staging-git::git+https://github.com/wine-staging/wine-staging.git
diff --git a/PKGBUILD b/PKGBUILD
index a596d951bbc..ec3f0ba35d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Bermond < yahoo-com: danielbermond >
pkgname=wine-staging-git
-pkgver=3.17.r13.g4beed4a3+wine.3.17.r144.g9f05343013
+pkgver=3.18.r8.g8519a9ea+wine.3.18.r75.ge55aca8f49
pkgrel=1
pkgdesc='A compatibility layer for running Windows programs (staging branch, git version)'
arch=('i686' 'x86_64')
@@ -101,7 +101,7 @@ then
"wine-git=$( printf '%s' "$pkgver" | sed 's/.*\+wine\.//')"
"wine-staging=$(printf '%s' "$pkgver" | sed 's/\+wine.*//')"
)
- conflicts=('wine' 'wine-git' 'wine-staging')
+ conflicts=('wine')
else
makedepends=("${makedepends[@]}" "${_depends[@]}")
provides=(
@@ -110,7 +110,7 @@ else
"wine-git=$( printf '%s' "$pkgver" | sed 's/.*\+wine\.//')"
"wine-staging=$(printf '%s' "$pkgver" | sed 's/\+wine.*//')"
)
- conflicts=('wine' 'wine-wow64' 'wine-git' 'wine-staging')
+ conflicts=('wine' 'wine-wow64')
fi
prepare() {
@@ -119,12 +119,12 @@ prepare() {
# restore the wine tree to its git origin state, without wine-staging patches
# (necessary for reapllying wine-staging patches in succedent builds,
# otherwise the patches will fail to be reapplied)
- msg2 'Cleaning wine source code tree...'
+ printf '%s\n' ' -> Cleaning wine source code tree...'
git reset --hard HEAD # restore tracked files
git clean -xdf # delete untracked files
# change back to the wine upstream commit that this version of wine-staging is based in
- msg2 'Changing wine HEAD to the wine-staging base commit...'
+ printf '%s\n' ' -> Changing wine HEAD to the wine-staging base commit...'
git checkout "$(../"$pkgname"/patches/patchinstall.sh --upstream-commit)"
# fix path of opencl headers
@@ -149,7 +149,7 @@ build() {
mkdir -p "$pkgname"-32-build
# apply all wine-staging patches
- msg2 'Applying wine-staging patches...'
+ printf '%s\n' ' -> Applying wine-staging patches...'
./"${pkgname}"/patches/patchinstall.sh DESTDIR="${srcdir}/wine-git" --all
# workaround for FS#55128
@@ -162,7 +162,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 -p "$pkgname"-64-build
cd "$pkgname"-64-build
../wine-git/configure \
@@ -181,7 +181,7 @@ build() {
fi
# build wine-staging 32-bit
- msg2 'Building Wine-32...'
+ printf '%s\n' ' -> Building Wine-32...'
cd "${srcdir}/${pkgname}"-32-build
../wine-git/configure \
--prefix='/usr' \
@@ -197,7 +197,7 @@ package() {
# package wine-staging 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
if [ "$CARCH" = 'i686' ]
@@ -209,7 +209,7 @@ package() {
dlldir="${pkgdir}/usr/lib32/wine" install
# package wine-staging 64-bit
- msg2 'Packaging Wine-64...'
+ printf '%s\n' ' -> Packaging Wine-64...'
cd "${srcdir}/${pkgname}"-64-build
make prefix="${pkgdir}/usr" \
libdir="${pkgdir}/usr/lib" \