sync with wine-staging-wow64

3 files changed, 46 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 784be6619bc4..c9c72fe3a2c3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -59,8 +59,8 @@ pkgbase = wine-wow64
 	source = https://dl.winehq.org/wine/source/9.0/wine-9.0-rc2.tar.xz
 	source = 30-win32-aliases.conf
 	source = wine-binfmt.conf
-	b2sums = 2eddc96df30a8239b4b3314b7127eb3a11f953826506f12b8f5dc2acfe45f8a4fc3de7a4af4ada5c14c60783771ba865eb35189dcdb09eeb7e52438dd34fe668
-	b2sums = 45db34fb35a679dc191b4119603eba37b8008326bd4f7d6bd422fbbb2a74b675bdbc9f0cc6995ed0c564cf088b7ecd9fbe2d06d42ff8a4464828f3c4f188075b
-	b2sums = e9de76a32493c601ab32bde28a2c8f8aded12978057159dd9bf35eefbf82f2389a4d5e30170218956101331cf3e7452ae82ad0db6aad623651b0cc2174a61588
+	sha256sums = d9d7cc0bb4cabc28ae80e054e8743bceaa50dcfc6ac2fd9bf419deadfa43066f
+	sha256sums = 9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7
+	sha256sums = 6dfdefec305024ca11f35ad7536565f5551f09119dda2028f194aee8f77077a4
 
 pkgname = wine-wow64
diff --git a/.gitignore b/.gitignore
index 3af6ba66b5e6..018a3de08144 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-pkg
-src
-wine-8*
-wine-wow64*
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 8760d61954f2..fdf3a19a1eeb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,10 +4,17 @@
 # https://www.winehq.org
 # https://gitlab.winehq.org/wine/wine
 
-pkgname=wine-wow64
-_name=wine
+## options
+: ${_build_staging:=false}
+: ${_build_wow64:=true}
+
+[[ "${_build_staging::1}" == "t" ]] && _pkgtype+="-staging"
+[[ "${_build_wow64::1}" == "t" ]] && _pkgtype+="-wow64"
+
+## basic info
+_pkgname=wine
+pkgname="${_pkgname}${_pkgtype:-}"
 pkgver=9.0rc2
-_pkgver=9.0-rc2
 pkgrel=2
 pkgdesc="A compatibility layer for running Windows programs"
 url="https://www.winehq.org"
@@ -73,15 +80,36 @@ conflicts=("wine")
 options=(staticlibs !lto)
 install=wine.install
 
-_pkgsrc="$_name-$_pkgver"
+_pkgver="${pkgver/rc/-rc}"
+_pkgsrc="$_pkgname-$_pkgver"
 source=(
-  https://dl.winehq.org/wine/source/9.0/$_name-$_pkgver.tar.xz
-  30-win32-aliases.conf
-  wine-binfmt.conf
+  "https://dl.winehq.org/wine/source/${pkgver::1}.0/$_pkgsrc.tar.xz"
+  "30-win32-aliases.conf"
+  "wine-binfmt.conf"
 )
-b2sums=('2eddc96df30a8239b4b3314b7127eb3a11f953826506f12b8f5dc2acfe45f8a4fc3de7a4af4ada5c14c60783771ba865eb35189dcdb09eeb7e52438dd34fe668'
-        '45db34fb35a679dc191b4119603eba37b8008326bd4f7d6bd422fbbb2a74b675bdbc9f0cc6995ed0c564cf088b7ecd9fbe2d06d42ff8a4464828f3c4f188075b'
-        'e9de76a32493c601ab32bde28a2c8f8aded12978057159dd9bf35eefbf82f2389a4d5e30170218956101331cf3e7452ae82ad0db6aad623651b0cc2174a61588')
+sha256sums=(
+  'd9d7cc0bb4cabc28ae80e054e8743bceaa50dcfc6ac2fd9bf419deadfa43066f'
+  '9901a5ee619f24662b241672a7358364617227937d5f6d3126f70528ee5111e7'
+  '6dfdefec305024ca11f35ad7536565f5551f09119dda2028f194aee8f77077a4'
+)
+
+if [[ "${_build_staging::1}" == "t" ]] ; then
+  makedepends+=('git')
+
+  provides+=(
+    "wine-staging=$pkgver"
+    "wine-wow64=$pkgver"
+  )
+
+  source+=("git+https://gitlab.winehq.org/wine/wine-staging.git#tag=v$_pkgver")
+  sha256sums+=('SKIP')
+
+  prepare() {
+    # apply wine-staging patchset
+    cd "$_pkgsrc"
+    ../wine-staging/staging/patchinstall.py --all
+  }
+fi
 
 build() {
   cd "$_pkgsrc"
@@ -105,7 +133,7 @@ package() {
   ln -sf /usr/bin/wine "$pkgdir"/usr/bin/wine64
 
   # Font aliasing settings for Win32 applications
-  install -Dm644 "$srcdir"/30-win32-aliases.conf "$pkgdir"/usr/share/fontconfig/conf.avail
+  install -Dm644 "$srcdir"/30-win32-aliases.conf -t "$pkgdir"/usr/share/fontconfig/conf.avail/
   install -d "$pkgdir"/usr/share/fontconfig/conf.default
   ln -s ../conf.avail/30-win32-aliases.conf "$pkgdir"/usr/share/fontconfig/conf.default/30-win32-aliases.conf