Merge pull request #1066 from mashir43/p11-kit

p11-kit: Update to 0.23.9

p11-kit/PKGBUILD

@@ -4,13 +4,13 @@
 
 pkgbase=p11-kit
 pkgname=('p11-kit' 'libp11-kit' 'libp11-kit-devel')
-pkgver=0.23.8
+pkgver=0.23.9
 pkgrel=1
 pkgdesc="Library to work with PKCS#11 modules"
 arch=('i686' 'x86_64')
 url="https://p11-glue.freedesktop.org/p11-kit.html"
 license=('BSD')
-makedepends=('gettext-devel' 'libiconv-devel' 'libtasn1-devel' 'libffi-devel' 'gtk-doc')
+makedepends=('gettext-devel' 'libiconv-devel' 'libtasn1-devel' 'libffi-devel' 'glib2-devel' 'gtk-doc')
 options=('!debug' 'strip' 'staticlibs')
 source=(https://github.com/p11-glue/p11-kit/releases/download/${pkgver}/${pkgbase}-${pkgver}.tar.gz{,.sig}
         0001-allow-gtkdocize.all.patch
@@ -19,8 +19,8 @@ source=(https://github.com/p11-glue/p11-kit/releases/download/${pkgver}/${pkgbas
         0017-0.23.5-implicit-decls.patch
         0018-placeholder-debug.patch
         0100-msysize.patch)
-validpgpkeys=('C0F67099B808FB063E2C81117BFB1108D92765AF')
-sha256sums=('4ba134e5fe4b62bcaf7a2d66841767d9d23e875b977bba6939367a9f400b133f'
+validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871')
+sha256sums=('e1c1649c335107a8d33cf3762eb7f57b2d0681f0c7d8353627293a58d6b4db63'
             'SKIP'
             '195b2e8695f701caf545e2a468383ad29457febd9b1ee57de1986de04ad3c31c'
             'afc0fdcbf34327fadcc90e514cda72cce98c6813fb9dc6b9cb0fe233b07fc67c'
@@ -35,7 +35,7 @@ prepare() {
   patch -p1 -i ${srcdir}/0015-0.18.7-parallel-make.patch
   patch -p1 -i ${srcdir}/0016-0.18.7-win8-x64.patch
   patch -p1 -i ${srcdir}/0017-0.23.5-implicit-decls.patch
-  patch -p1 -i ${srcdir}/0018-placeholder-debug.patch
+  #patch -p1 -i ${srcdir}/0018-placeholder-debug.patch
   patch -p1 -i ${srcdir}/0100-msysize.patch
 
   autoreconf -vfi
@@ -74,7 +74,7 @@ build() {
 }
 
 package_p11-kit() {
-  depends=('libffi' 'libp11-kit' 'libtasn1')
+  depends=("libp11-kit=${pkgver}")
 
   mkdir -p ${pkgdir}/usr/{bin,lib,share}
   cp -rf ${srcdir}/dest/etc ${pkgdir}/
@@ -88,7 +88,7 @@ package_p11-kit() {
 }
 
 package_libp11-kit() {
-  depends=('libintl' 'libtasn1')
+  depends=('libffi' 'libintl' 'libtasn1' 'glib2')
   groups=('libraries')
 
   mkdir -p ${pkgdir}/usr/bin
@@ -103,6 +103,6 @@ package_libp11-kit-devel() {
   mkdir -p ${pkgdir}/usr/lib/pkcs11
   cp -rf ${srcdir}/dest/usr/include ${pkgdir}/usr/
   cp -rf ${srcdir}/dest/usr/lib/pkgconfig ${pkgdir}/usr/lib/
-  cp -f ${srcdir}/dest/usr/lib/*.a ${pkgdir}/usr/lib/pkcs11/
+  cp -f ${srcdir}/dest/usr/lib/*.a ${pkgdir}/usr/lib/
   cp -f ${srcdir}/dest/usr/lib/pkcs11/*.a ${pkgdir}/usr/lib/pkcs11/
 }