[arch-commits] Commit in mingw-w64-headers/trunk (PKGBUILD)

[Felix Yan]

    Date: Wednesday, June 2, 2021 @ 20:19:39
  Author: felixonmars
Revision: 953309

upgpkg: mingw-w64-headers 9.0.0-2: add fix for FS#71074

Modified:
  mingw-w64-headers/trunk/PKGBUILD

----------+
 PKGBUILD |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-02 20:15:16 UTC (rev 953308)
+++ PKGBUILD	2021-06-02 20:19:39 UTC (rev 953309)
@@ -1,8 +1,8 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
-pkgname='mingw-w64-headers'
+pkgname=mingw-w64-headers
 pkgver=9.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="MinGW-w64 headers for Windows"
 arch=('any')
 url="http://mingw-w64.sourceforge.net"
@@ -10,12 +10,19 @@
 groups=('mingw-w64-toolchain' 'mingw-w64')
 options=('!strip' '!libtool' '!emptydirs')
 validpgpkeys=('CAF5641F74F7DFBA88AE205693BDB53CD4EBC740')
-source=(https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${pkgver}.tar.bz2{,.sig})
+source=(https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v${pkgver}.tar.bz2{,.sig}
+        __cpuidex-definition-conflicting-gcc-11.patch::https://github.com/mirror/mingw-w64/commit/d2374f898457b0f4ea8bd4084a94f2dafc87a99a.patch)
 sha512sums=('6691331a2ab521d22c1d32bebe0ed049bd62a7a7722cff38e7792b4e42c6b8df4356084afff6c916b487b3ebddc4372b398ab7cd0c7f4ff6991a70fe64177386'
-            'SKIP')
+            'SKIP'
+            'e5ad3e276c2f449dc680424813ae4d385066afd6591554e0422ff6607f00bae9f3b00ad4138395b651667cf8a7eb191f0e90562e677430b63af1d1920e5ff32d')
 
 _targets="i686-w64-mingw32 x86_64-w64-mingw32"
 
+prepare() {
+  # FS#71074
+  patch -d mingw-w64-v$pkgver -p1 < __cpuidex-definition-conflicting-gcc-11.patch
+}
+
 build() {
   for _target in ${_targets}; do
     echo "Configuring ${_target} headers"