p11-kit: Converted to meson build

3 files changed, 26 insertions, 27 deletions

diff --git a/p11-kit/.footprint b/p11-kit/.footprint
index 639a94ab4..b768fde78 100644
--- a/p11-kit/.footprint
+++ b/p11-kit/.footprint
@@ -5,7 +5,7 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/p11-kit
 -rwxr-xr-x	root/root	usr/bin/trust
-lrwxrwxrwx	root/root	usr/bin/update-ca-trust -> ../lib/p11-kit/trust-extract-compat
+lrwxrwxrwx	root/root	usr/bin/update-ca-trust -> /usr/lib/p11-kit/trust-extract-compat
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/p11-kit-1/
 drwxr-xr-x	root/root	usr/include/p11-kit-1/p11-kit/
@@ -18,23 +18,24 @@ drwxr-xr-x	root/root	usr/include/p11-kit-1/p11-kit/
 -rw-r--r--	root/root	usr/include/p11-kit-1/p11-kit/remote.h
 -rw-r--r--	root/root	usr/include/p11-kit-1/p11-kit/uri.h
 drwxr-xr-x	root/root	usr/lib/
--rwxr-xr-x	root/root	usr/lib/libp11-kit.la
-lrwxrwxrwx	root/root	usr/lib/libp11-kit.so -> libp11-kit.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/libp11-kit.so -> libp11-kit.so.0
 lrwxrwxrwx	root/root	usr/lib/libp11-kit.so.0 -> libp11-kit.so.0.3.0
 -rwxr-xr-x	root/root	usr/lib/libp11-kit.so.0.3.0
-lrwxrwxrwx	root/root	usr/lib/p11-kit-proxy.so -> libp11-kit.so.0.3.0
+lrwxrwxrwx	root/root	usr/lib/p11-kit-proxy.so -> libp11-kit.so.0
 drwxr-xr-x	root/root	usr/lib/p11-kit/
 -rwxr-xr-x	root/root	usr/lib/p11-kit/p11-kit-remote
 -rwxr-xr-x	root/root	usr/lib/p11-kit/p11-kit-server
 -rwxr-xr-x	root/root	usr/lib/p11-kit/trust-extract-compat
 drwxr-xr-x	root/root	usr/lib/pkcs11/
--rwxr-xr-x	root/root	usr/lib/pkcs11/p11-kit-client.la
 -rwxr-xr-x	root/root	usr/lib/pkcs11/p11-kit-client.so
--rwxr-xr-x	root/root	usr/lib/pkcs11/p11-kit-trust.la
 -rwxr-xr-x	root/root	usr/lib/pkcs11/p11-kit-trust.so
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/p11-kit-1.pc
 drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/bash-completion/
+drwxr-xr-x	root/root	usr/share/bash-completion/completions/
+-rw-r--r--	root/root	usr/share/bash-completion/completions/p11-kit
+-rw-r--r--	root/root	usr/share/bash-completion/completions/trust
 drwxr-xr-x	root/root	usr/share/p11-kit/
 drwxr-xr-x	root/root	usr/share/p11-kit/modules/
 -rw-r--r--	root/root	usr/share/p11-kit/modules/p11-kit-trust.module
diff --git a/p11-kit/.signature b/p11-kit/.signature
index 49d347944..9270d1a06 100644
--- a/p11-kit/.signature
+++ b/p11-kit/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Yvq3W+zpoePKSlMe6yyuzd9FPMpFx6rROvSAMoQHTnJNiuWElUUh5wptKiWJuOqxix4eM9O+vuuFSNnHU5pzw0=
-SHA256 (Pkgfile) = e750e64bf0aa4cb5a121c0db60b02954036e37b03bf742ebdc1ce0bf0d74922e
-SHA256 (.footprint) = 4a57f118bc98c03a14643c715ab813dcabedb8f719a0faedaeac2d1e165c650c
+RWSE3ohX2g5d/emgVhuqzDfUwgmqJuJZnM9xRMPzNuXh1sEOsECR49J4fRGkZVGrGulEL+XzzjmlJ/qM7E+efpi+2PkFe+MbQQw=
+SHA256 (Pkgfile) = 9794e8184e86de12d6d5487f8aab349372eea5e3eaaf381bfeeeb903b8cd5ece
+SHA256 (.footprint) = 33d7c2fe4466bc55ab67470da333269166ace71c487e77de91b3384c155dab02
 SHA256 (p11-kit-0.24.0.tar.xz) = 81e6140584f635e4e956a1b93a32239acf3811ff5b2d3a5c6094e94e99d2c685
diff --git a/p11-kit/Pkgfile b/p11-kit/Pkgfile
index 73f69cba0..7a8e33591 100644
--- a/p11-kit/Pkgfile
+++ b/p11-kit/Pkgfile
@@ -1,18 +1,16 @@
 # Description: Provides a way to load and enumerate PKCS#11 modules
 # URL: https://p11-glue.github.io/p11-glue/p11-kit.html
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: libtasn1 libffi make-ca
+# Depends on: libffi libtasn1 make-ca meson ninja
 
 name=p11-kit
 version=0.24.0
-release=1
+release=2
 source=(https://github.com/p11-glue/$name/releases/download/$version/$name-$version.tar.xz)
 
 build() {
-	cd $name-$version
-
-	sed '20,$ d' -i trust/trust-extract-compat
-	cat >> trust/trust-extract-compat << "EOF"
+	sed '20,$ d' -i $name-$version/trust/trust-extract-compat
+	cat >> $name-$version/trust/trust-extract-compat << "EOF"
 # Copy existing anchor modifications to /etc/ssl/local
 /usr/lib/make-ca/copy-trust-modifications
 
@@ -20,19 +18,19 @@ build() {
 /usr/sbin/make-ca -f -g
 EOF
 
-	./configure \
+	meson setup $name-$version build \
 		--prefix=/usr \
 		--libexecdir=/usr/lib \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--with-module-path=/usr/lib/pkcs11 \
-		--with-trust-paths=/etc/pki/anchors
-
-	make
-	make DESTDIR=$PKG install
-
-	ln -s ../lib/p11-kit/trust-extract-compat \
+		--buildtype=plain \
+		--wrap-mode=nodownload \
+		-D b_lto=true \
+		-D b_pie=true \
+		-D trust_paths=/etc/pki/anchors \
+		-D module_path=/usr/lib/pkcs11 \
+		-D nls=false
+	meson compile -C build
+	DESTDIR=$PKG meson install -C build
+
+	ln -s /usr/lib/p11-kit/trust-extract-compat \
 		$PKG/usr/bin/update-ca-trust
-
-	rm -r $PKG/usr/share/gtk-doc
 }