From 79726d7cdd02ab90becb1fb6cf8ecdb33cd45ce5 Mon Sep 17 00:00:00 2001
From: Biswapriyo Nath <nathbappai@gmail.com>
Date: Mon, 16 Aug 2021 15:32:13 +0530
Subject: [PATCH] pinentry: Update to 1.1.1, fix clang build

Remove -Wl,-rpath option from qt.m4 file
---
 mingw-w64-pinentry/0001-m4-remove-rpath.patch | 11 +++++++
 mingw-w64-pinentry/PKGBUILD                   | 30 ++++++++++++-------
 2 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100644 mingw-w64-pinentry/0001-m4-remove-rpath.patch

diff --git a/mingw-w64-pinentry/0001-m4-remove-rpath.patch b/mingw-w64-pinentry/0001-m4-remove-rpath.patch
new file mode 100644
index 0000000000..a178c83d91
--- /dev/null
+++ b/mingw-w64-pinentry/0001-m4-remove-rpath.patch
@@ -0,0 +1,11 @@
+--- a/m4/qt.m4
++++ b/m4/qt.m4
+@@ -59,7 +59,7 @@
+ 
+     qtlibdir=`"$PKG_CONFIG" --variable libdir Qt5Core`
+     if test -n "$qtlibdir"; then
+-        PINENTRY_QT_LDFLAGS="$PINENTRY_QT_LDFLAGS -Wl,-rpath \"$qtlibdir\""
++        PINENTRY_QT_LDFLAGS="$PINENTRY_QT_LDFLAGS"
+     fi
+ 
+     AC_CHECK_TOOL(MOC, moc)
diff --git a/mingw-w64-pinentry/PKGBUILD b/mingw-w64-pinentry/PKGBUILD
index 22fcccceb8..90ef02f8e6 100644
--- a/mingw-w64-pinentry/PKGBUILD
+++ b/mingw-w64-pinentry/PKGBUILD
@@ -1,26 +1,34 @@
-# $Id$
 # Maintainer: Yuui Tanabe <yuuitanabe@163.com>
 
 _realname=pinentry
 pkgbase=mingw-w64-${_realname}
 pkgname=(${MINGW_PACKAGE_PREFIX}-${_realname})
-pkgver=1.1.0
-pkgrel=3
+pkgver=1.1.1
+pkgrel=1
 url="https://www.gnupg.org/software/pinentry/index.html"
 license=('GPL')
 pkgdesc='Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 depends=("${MINGW_PACKAGE_PREFIX}-qt5-base"
          "${MINGW_PACKAGE_PREFIX}-libsecret"
          "${MINGW_PACKAGE_PREFIX}-libassuan")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
-source=(https://www.gnupg.org/ftp/gcrypt/pinentry/pinentry-${pkgver}.tar.bz2{,.sig})
-sha256sums=('68076686fa724a290ea49cdf0d1c0c1500907d1b759a3bcbfbec0293e8f56570'
-            '8425fbe9ddff3de980cb33ef3ae3bc8a00d214b2554cd73b3a8680eb35fbe6c8')
-validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6'
-              '46CC730865BB5C78EBABADCF04376F3EE0856959'
-              '031EC2536E580D8EA286A9F22071B08A33BD3F06')
+source=("https://www.gnupg.org/ftp/gcrypt/pinentry/pinentry-${pkgver}.tar.bz2"{,.sig}
+        "0001-m4-remove-rpath.patch")
+sha256sums=('cd12a064013ed18e2ee8475e669b9f58db1b225a0144debdb85a68cecddba57f'
+            'SKIP'
+            '58a3e99e1d243cb867da5943a12b0e9174b2a154cc127f48b44d3bbc1f285a84')
+validpgpkeys=('D8692123C4065DEA5E0F3AB5249B39D24F25E3B6' # Werner Koch (dist sig)
+              '6DAA6E64A76D2840571B4902528897B826403ADA') # Werner Koch (dist signing 2020)
+
+prepare() {
+  cd "${srcdir}/${_realname}-${pkgver}"
+  patch -p1 -i "${srcdir}/0001-m4-remove-rpath.patch"
+
+  # Empty VERSION file for clang
+  echo > VERSION
+  autoreconf -fiv
+}
 
 build()
 {