[arch-commits] Commit in wine-staging/trunk (PKGBUILD)

[Felix Yan]

    Date: Wednesday, July 15, 2020 @ 09:16:30
  Author: felixonmars
Revision: 663879

upgpkg: wine-staging 5.12.1-1

Modified:
  wine-staging/trunk/PKGBUILD

----------+
 PKGBUILD |   17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-15 09:16:05 UTC (rev 663878)
+++ PKGBUILD	2020-07-15 09:16:30 UTC (rev 663879)
@@ -5,22 +5,19 @@
 # Contributor: Giovanni Scafora <giovanni at archlinux.org>
 
 pkgname=wine-staging
-pkgver=5.12
+pkgver=5.12.1
 pkgrel=1
 
+_winever=${pkgver%.*}
 _pkgbasever=${pkgver/rc/-rc}
 
-source=(https://dl.winehq.org/wine/source/5.x/wine-$_pkgbasever.tar.xz{,.sign}
+source=(https://dl.winehq.org/wine/source/5.x/wine-$_winever.tar.xz{,.sign}
         "wine-staging-v$_pkgbasever.tar.gz::https://github.com/wine-staging/wine-staging/archive/v$_pkgbasever.tar.gz"
-        $pkgname-build-fix.patch::https://github.com/wine-staging/wine-staging/commit/3f3a05f91c85cb5ccdc4c8185bcc862c6e96cd52.patch
-        $pkgname-build-fix-again.patch::https://github.com/wine-staging/wine-staging/commit/3dd8d0e647ee0bd304f4d2e265580f1ba536bf0d.patch
         30-win32-aliases.conf
         wine-binfmt.conf)
 sha512sums=('1272b143d64ed6083cd797474f18dbd2bca7a38d488474ae5f054f47789b4fc1d386c7bbf8aa1bd86f9507908fc799b4f45e10e1d8c628c5bd52c42b1d74c8a8'
             'SKIP'
-            '1ad23128b6d6183b8e5e814214c2ff2b6f1173e8f599248e6e38fa78c20701ac7295e87c2fdc809787ab284e1270ff0dc9edbc5adc80b1fc2067f0fc4cb0ac16'
-            'a38b69923a35ed8dc69bd7fd1d19ed605641b7e0812544f8c50b9e0d0ad0ae65d189466efdb1c6904e67ce4d9c6ebb31a465e4c4a05bc406860f6649aa96aad6'
-            '2ff1373f0ddf00b4c25cd0d7877242365839c9e0b657a0a3e6468c6b5f3cf34d12cb07b7f2867d22d6f01bca42ef5ba238f080785a228ee4f8499ad00bf2296a'
+            '1a4cead8f17d41f1e5ab1be2f8dd8e098fc655b6240bdae49d3e8ab8f112ea4b46a92a95780b325c037dd3e5099e481392860c8dbf72dd03acee39855335750d'
             '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb'
             'bdde7ae015d8a98ba55e84b86dc05aca1d4f8de85be7e4bd6187054bfe4ac83b5a20538945b63fb073caab78022141e9545685e4e3698c97ff173cf30859e285')
 validpgpkeys=(5AC1A08B03BD7A313E0A955AF5E6E9EEB9461DD7
@@ -123,12 +120,8 @@
 
 prepare() {
   # Allow ccache to work
-  mv wine-$_pkgbasever $pkgname
+  mv wine-$_winever $pkgname
 
-  # https://bugs.winehq.org/show_bug.cgi?id=49514
-  patch -d wine-staging-$_pkgbasever -p1 < $pkgname-build-fix.patch
-  patch -d wine-staging-$_pkgbasever -p1 < $pkgname-build-fix-again.patch
-
   # apply wine-staging patchset
   pushd wine-staging-$_pkgbasever/patches
   ./patchinstall.sh DESTDIR="$srcdir/$pkgname" --all