From dfebc2edfd167c45bfd737d9861b7df627b6cea5 Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sun, 2 Jan 2022 21:01:21 +0100
Subject: [PATCH] file: drop msysize patch

---
 file/PKGBUILD              | 11 +++++------
 file/file-5.38-msys2.patch | 34 ----------------------------------
 2 files changed, 5 insertions(+), 40 deletions(-)
 delete mode 100644 file/file-5.38-msys2.patch

diff --git a/file/PKGBUILD b/file/PKGBUILD
index 5f77bac8..2e80e437 100644
--- a/file/PKGBUILD
+++ b/file/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=file
 pkgver=5.41
-pkgrel=1
+pkgrel=2
 pkgdesc="File type identification utility"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -11,22 +11,21 @@ url="https://www.darwinsys.com/file/"
 depends=('gcc-libs' 'zlib' 'libbz2')
 makedepends=('python' 'zlib-devel' 'libbz2-devel' 'autotools' 'gcc')
 options=('!libtool')
-source=("https://astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc}
-        file-5.38-msys2.patch)
+source=("https://astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz"{,.asc})
 sha256sums=('13e532c7b364f7d57e23dfeea3147103150cb90593a57af86c10e4f6e411603f'
-            'SKIP'
-            'b9ba0c890e7eccbc9913918daa675e48d7211f7b8182a4e2a87657cd5d1c9acf')
+            'SKIP')
 validpgpkeys=('BE04995BA8F90ED0C0C176C471112AB16CB33B3A') # Christos Zoulas <christos@zoulas.com>
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p1 -i ${srcdir}/file-5.38-msys2.patch
 
   autoreconf -fiv
 }
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  CHOST="${CHOST/-msys/-cygwin}" \
   ./configure \
     --prefix=/usr \
     --build=${CHOST} \
diff --git a/file/file-5.38-msys2.patch b/file/file-5.38-msys2.patch
deleted file mode 100644
index b4a847fa..00000000
--- a/file/file-5.38-msys2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -Naur file-5.38-orig/compile file-5.38/compile
---- file-5.38-orig/compile	2019-12-17 05:13:46.000000000 +0300
-+++ file-5.38/compile	2020-04-18 10:58:46.889418800 +0300
-@@ -53,7 +53,7 @@
- 	  MINGW*)
- 	    file_conv=mingw
- 	    ;;
--	  CYGWIN*)
-+	  CYGWIN*|MSYS*)
- 	    file_conv=cygwin
- 	    ;;
- 	  *)
-@@ -67,7 +67,7 @@
- 	mingw/*)
- 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
- 	  ;;
--	cygwin/*)
-+	cygwin/*|msys/*)
- 	  file=`cygpath -m "$file" || echo "$file"`
- 	  ;;
- 	wine/*)
-diff -Naur file-5.38-orig/config.guess file-5.38/config.guess
---- file-5.38-orig/config.guess	2019-12-17 05:13:46.000000000 +0300
-+++ file-5.38/config.guess	2020-04-18 10:55:41.924167300 +0300
-@@ -911,6 +911,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-pc-cygwin
- 	exit ;;
-+    amd64:MSYS*:*:* | x86_64:MSYS*:*:*)
-+	echo x86_64-unknown-msys
-+	exit ;;
-     prep*:SunOS:5.*:*)
- 	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
- 	exit ;;