summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2023-02-25 10:41:52 -0300
committerDaniel Bermond2023-02-25 10:41:52 -0300
commit1647033d9c8fb65de8b83c8d1ae328a5f5a22045 (patch)
treed322335ff6dd5fa35c1342515f2c3fcf2505bf34
parent15cf0e5e1564e76a73952c0e00b36bc2e49fb413 (diff)
downloadaur-wine-staging-git.tar.gz
Match latest upstream changes
patchinstall.sh was dropped in favor of patchinstall.py. https://gitlab.winehq.org/wine/wine-staging/-/commit/c1b4af92f74d7bd330003d39d0bb1f966fdb70a9
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD7
2 files changed, 8 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5070a45101dc..b4a3a65ddaed 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 = 8.1.r3.g87f33695
+ pkgver = 8.2.r7.g7b0d44f8
pkgrel = 1
url = https://www.wine-staging.com/
install = wine-staging-git.install
@@ -50,6 +50,7 @@ pkgbase = wine-staging-git
makedepends = ffmpeg
makedepends = samba
makedepends = opencl-headers
+ makedepends = python
depends = attr
depends = lib32-attr
depends = fontconfig
@@ -103,8 +104,8 @@ pkgbase = wine-staging-git
optdepends = cups
optdepends = samba
optdepends = dosbox
- provides = wine-staging=8.1.r3.g87f33695
- provides = wine=8.1
+ provides = wine-staging=8.2.r7.g7b0d44f8
+ provides = wine=8.2
provides = wine-wow64
conflicts = wine
conflicts = wine-wow64
diff --git a/PKGBUILD b/PKGBUILD
index cc07ce5fa15e..799250688016 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
pkgname=wine-staging-git
-pkgver=8.1.r3.g87f33695
+pkgver=8.2.r7.g7b0d44f8
pkgrel=1
pkgdesc='A compatibility layer for running Windows programs (staging branch, git version)'
arch=('x86_64')
@@ -43,6 +43,7 @@ makedepends=('git' 'perl' 'mingw-w64-gcc'
'ffmpeg'
'samba'
'opencl-headers'
+ 'python'
)
optdepends=(
'giflib' 'lib32-giflib'
@@ -91,11 +92,11 @@ prepare() {
# change back to the wine upstream commit that this version of wine-staging is based in
printf '%s\n' ' -> Changing wine HEAD to the wine-staging base commit...'
git -C wine config --local advice.detachedHead false
- git -C wine checkout "$(wine-staging/patches/patchinstall.sh --upstream-commit)"
+ git -C wine checkout "$(wine-staging/staging/patchinstall.py --upstream-commit)"
# apply all wine-staging patches
printf '%s\n' ' -> Applying wine-staging patches...'
- wine-staging/patches/patchinstall.sh DESTDIR="${srcdir}/wine" --all
+ wine-staging/staging/patchinstall.py DESTDIR="${srcdir}/wine" --all
}
pkgver() {