From 14799a3e6ef19c7204f3fe850d1818cabae7f301 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Sat, 29 Jan 2022 20:05:46 +0530
Subject: [PATCH] libgpg-error: Rebuild as cygwin

---
 libgpg-error/PKGBUILD                      | 10 +--
 libgpg-error/gnulib-weak.patch             | 12 ++++
 libgpg-error/libgpg-error-1.16-msys2.patch | 82 ----------------------
 3 files changed, 18 insertions(+), 86 deletions(-)
 create mode 100644 libgpg-error/gnulib-weak.patch
 delete mode 100644 libgpg-error/libgpg-error-1.16-msys2.patch

diff --git a/libgpg-error/PKGBUILD b/libgpg-error/PKGBUILD
index 442b9fb1..1cbf4fca 100644
--- a/libgpg-error/PKGBUILD
+++ b/libgpg-error/PKGBUILD
@@ -3,7 +3,7 @@
 pkgbase=libgpg-error
 pkgname=('libgpg-error' 'libgpg-error-devel') # 'gpg-error'
 pkgver=1.43
-pkgrel=1
+pkgrel=2
 pkgdesc="Support library for libgcrypt"
 arch=('i686' 'x86_64')
 url="https://gnupg.org"
@@ -11,11 +11,11 @@ license=('LGPL')
 depends=('sh' 'libiconv' 'libintl')
 makedepends=('libiconv-devel' 'gettext-devel' 'autotools' 'gcc')
 source=(https://gnupg.org/ftp/gcrypt/libgpg-error/${pkgname}-${pkgver}.tar.bz2{,.sig}
-        libgpg-error-1.16-msys2.patch
+        gnulib-weak.patch
         gpg-error-static-linking.patch)
 sha256sums=('a9ab83ca7acc442a5bd846a75b920285ff79bdb4e3d34aa382be88ed2c3aebaf'
             'SKIP'
-            '9f24d6b26a9da60b14dba9ce8bb55110609ab5496ed969adfb07464c1393d678'
+            '0df2f92ab866e9d9824086cca89ff286cfdfad5e659cb2b655061e0c7e562e3a'
             '9780e3e397b983ef52d5dae22d54c4453a47bddf04eafa2f874c75038e3485eb')
 #These might be signed by any of these keys https://gnupg.org/signature_key.html
 validpgpkeys=('5B80C5754298F0CB55D8ED6ABCEF7E294B092E28'
@@ -27,13 +27,15 @@ options=(!makeflags)
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  patch -p1 -i ${srcdir}/libgpg-error-1.16-msys2.patch
+  patch -p1 -i ${srcdir}/gnulib-weak.patch
   patch -p1 -i ${srcdir}/gpg-error-static-linking.patch
   autoreconf -fi
 }
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}
+
+  CHOST="${CHOST/-msys/-cygwin}" \
   ./configure \
     --prefix=/usr \
     --build=${CHOST} \
diff --git a/libgpg-error/gnulib-weak.patch b/libgpg-error/gnulib-weak.patch
new file mode 100644
index 00000000..40308acb
--- /dev/null
+++ b/libgpg-error/gnulib-weak.patch
@@ -0,0 +1,12 @@
+--- a/m4/threadlib.m4
++++ b/m4/threadlib.m4
+@@ -104,6 +104,9 @@
+ #pragma weak fputs
+ int main ()
+ {
++#ifdef __CYGWIN__
++  return 1;
++#endif
+   return (fputs == NULL);
+ }]])],
+          [gl_cv_have_weak=yes],
diff --git a/libgpg-error/libgpg-error-1.16-msys2.patch b/libgpg-error/libgpg-error-1.16-msys2.patch
deleted file mode 100644
index ef2f0a4b..00000000
--- a/libgpg-error/libgpg-error-1.16-msys2.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Naur libgpg-error-1.16/build-aux/compile libgpg-error-1.16-msys2/build-aux/compile
---- libgpg-error-1.16/build-aux/compile	2013-02-25 12:53:36.000000000 +0400
-+++ libgpg-error-1.16-msys2/build-aux/compile	2013-07-03 09:04:58.555664000 +0400
-@@ -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 libgpg-error-1.16/build-aux/config.guess libgpg-error-1.16-msys2/build-aux/config.guess
---- libgpg-error-1.16/build-aux/config.guess	2013-02-25 12:53:36.000000000 +0400
-+++ libgpg-error-1.16-msys2/build-aux/config.guess	2013-07-03 09:04:58.555664000 +0400
-@@ -845,6 +845,9 @@
-     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
- 	echo x86_64-unknown-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 ;;
-diff -Naur libgpg-error-1.16/build-aux/config.rpath libgpg-error-1.16-msys2/build-aux/config.rpath
---- libgpg-error-1.16/build-aux/config.rpath	2013-02-25 12:53:36.000000000 +0400
-+++ libgpg-error-1.16-msys2/build-aux/config.rpath	2013-07-03 09:04:58.555664000 +0400
-@@ -57,7 +57,7 @@
-     aix*)
-       wl='-Wl,'
-       ;;
--    mingw* | cygwin* | pw32* | os2* | cegcc*)
-+    mingw* | cygwin* | msys* | pw32* | os2* | cegcc*)
-       ;;
-     hpux9* | hpux10* | hpux11*)
-       wl='-Wl,'
-@@ -149,7 +149,7 @@
- hardcode_minus_L=no
- 
- case "$host_os" in
--  cygwin* | mingw* | pw32* | cegcc*)
-+  cygwin* | msys* | mingw* | pw32* | cegcc*)
-     # FIXME: the MSVC++ port hasn't been tested in a loooong time
-     # When not using gcc, we currently assume that we are using
-     # Microsoft Visual C++.
-@@ -198,7 +198,7 @@
-         ld_shlibs=no
-       fi
-       ;;
--    cygwin* | mingw* | pw32* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | cegcc*)
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-       # no search path for DLLs.
-       hardcode_libdir_flag_spec='-L$libdir'
-@@ -348,7 +348,7 @@
-       ;;
-     bsdi[45]*)
-       ;;
--    cygwin* | mingw* | pw32* | cegcc*)
-+    cygwin* | msys* | mingw* | pw32* | cegcc*)
-       # When not using gcc, we currently assume that we are using
-       # Microsoft Visual C++.
-       # hardcode_libdir_flag_spec is actually meaningless, as there is
-@@ -537,7 +537,7 @@
-   bsdi[45]*)
-     library_names_spec='$libname$shrext'
-     ;;
--  cygwin* | mingw* | pw32* | cegcc*)
-+  cygwin* | msys* | mingw* | pw32* | cegcc*)
-     shrext=.dll
-     library_names_spec='$libname.dll.a $libname.lib'
-     ;;