From 58f03fd5bf37de1136bb8a9aa711bb2da3e670ef Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Sat, 28 Oct 2023 12:01:04 +0300
Subject: [PATCH] p11-kit ver bump

---
 util/crypt/p11-kit/actions.py | 17 +++++++++--------
 util/crypt/p11-kit/pspec.xml  |  5 +++++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/util/crypt/p11-kit/actions.py b/util/crypt/p11-kit/actions.py
index 39860014bb..05a75173c6 100644
--- a/util/crypt/p11-kit/actions.py
+++ b/util/crypt/p11-kit/actions.py
@@ -7,29 +7,30 @@
 from pisi.actionsapi import get
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
-from pisi.actionsapi import shelltools
+from pisi.actionsapi import shelltools, mesontools
 
 def setup():
-    options = "--with-module-path=/usr/lib/pkcs11 \
-              "
+    options = "-Dmodule_path=/usr/lib/pkcs11 -Dtrust_paths=/etc/ssl/certs/ca-certificates.crt -Dman=true -Dgtk_doc=true\
+                    "
               
     if get.buildTYPE() == "emul32":
         shelltools.export("CC", "%s -m32" % get.CC())
         shelltools.export("CXX", "%s -m32" % get.CXX())
         shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")
-        options += "--libdir=/usr/lib32 \
+        options += " --libdir=/usr/lib32 \
                     --libexecdir=/_emul32/libexec \
-                    --with-module-path=/usr/lib32/pkcs11"
+                    --bindir=/_emul32/bin \
+                    -Dmodule_path=/usr/lib32/pkcs11"
                  
                  
-    autotools.configure(options)
+    mesontools.configure(options)
  
       
 def build():
-    autotools.make()
+    mesontools.build()
 
 def install():
-    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    mesontools.install()
 
     if get.buildTYPE() == "emul32":
         pisitools.removeDir("_emul32")
diff --git a/util/crypt/p11-kit/pspec.xml b/util/crypt/p11-kit/pspec.xml
index 9a7522179f..b89877f2f0 100644
--- a/util/crypt/p11-kit/pspec.xml
+++ b/util/crypt/p11-kit/pspec.xml
@@ -15,6 +15,9 @@
         <Description>The p11-kit package Provides a way to load and enumerate PKCS #11 (a Cryptographic Token Interface Standard) modules.</Description>
         <Archive sha1sum="a7496057299782d5db733bd021d583b78d6e887a" type="tarxz">https://github.com/p11-glue/p11-kit/releases/download/0.25.1/p11-kit-0.25.1.tar.xz</Archive>
         <BuildDependencies>
+            <Dependency>meson</Dependency>
+            <Dependency>gtk-doc</Dependency>
+            <Dependency>glib2-devel</Dependency>
             <Dependency versionFrom="4.16.0">libtasn1-devel</Dependency>
             <Dependency>libffi-devel</Dependency>
         </BuildDependencies>
@@ -34,7 +37,9 @@
             <Path fileType="doc">/usr/share/gtk-doc</Path>
             <Path fileType="doc">/usr/share/p11-kit</Path>
             <Path fileType="library">/usr/lib</Path>
+            <Path fileType="localedata">/usr/share/locale/</Path>
             <Path fileType="data">/usr/share/bash-completion</Path>
+            <Path fileType="man">/usr/share/man</Path>
         </Files>
     </Package>