Merge pull request #3057 from lazka/libksba-rebuild

libksba: drop install, msysize patch

libksba/PKGBUILD

@@ -2,23 +2,20 @@
 
 pkgname=('libksba' 'libksba-devel')
 pkgver=1.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A CMS and X.509 access library"
 arch=('i686' 'x86_64')
 url="https://www.gnupg.org/related_software/libksba/"
 license=('GPL')
 makedepends=('libgpg-error-devel' 'autotools' 'gcc')
 options=('strip' 'libtool')
-source=(https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
-        'msysize.patch')
+source=(https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
 sha256sums=('dad683e6f2d915d880aa4bed5cea9a115690b8935b78a1bbe01669189307a48b'
-            'SKIP'
-            '8329b743fa106622ac30451b60decdafce9149b94980de0d79489ed768301f3a')
+            'SKIP')
 validpgpkeys=('6DAA6E64A76D2840571B4902528897B826403ADA') # Werner Koch (dist signing 2020)
 
 prepare() {
   cd "$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/msysize.patch"
 
   autoreconf -fiv
 }
@@ -26,8 +23,10 @@ prepare() {
 build() {
   cd "$pkgname-$pkgver"
 
+  local CYGWIN_CHOST="${CHOST/-msys/-cygwin}"
   ./configure \
     --prefix=/usr \
+    --build="${CYGWIN_CHOST}" \
     --enable-shared \
     --disable-static
 
@@ -44,7 +43,6 @@ check() {
 package_libksba() {
   groups=('libraries')
   depends=('gcc-libs' 'libgpg-error')
-  install=libksba.install
 
   mkdir -p $pkgdir/usr/bin
   cp -f ${srcdir}/dest/usr/bin/*.dll $pkgdir/usr/bin/

libksba/libksba.install

@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=ksba.info
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist}; do
-    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-  done
-}

libksba/msysize.patch

@@ -1,13 +0,0 @@
-diff -Naur a/build-aux/config.guess b/build-aux/config.guess
---- a/build-aux/config.guess	2013-02-22 17:56:24.000000000 +0400
-+++ b/build-aux/config.guess	2014-08-01 09:40:46.402400000 +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 ;;
-     p*:CYGWIN*:*)
- 	echo powerpcle-unknown-cygwin
- 	exit ;;