From 7b83c559a58b8c69d247dd249d2661b54642352d Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@gmail.com>
Date: Thu, 3 Jun 2021 21:21:45 +0300
Subject: [PATCH] libxkbcommon ver. bump

---
 x11/library/libxkbcommon/actions.py | 32 ++++++++++++++---------------
 x11/library/libxkbcommon/pspec.xml  | 18 +++++++++++++++-
 2 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/x11/library/libxkbcommon/actions.py b/x11/library/libxkbcommon/actions.py
index e50cdf53da..fc2634bfae 100644
--- a/x11/library/libxkbcommon/actions.py
+++ b/x11/library/libxkbcommon/actions.py
@@ -8,29 +8,29 @@ from pisi.actionsapi import get
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
+from pisi.actionsapi import mesontools
 
 def setup():
-    shelltools.makedirs("build")
-    shelltools.cd("build") 
-    options = "meson --prefix=/usr -Denable-docs=false \
-              "
+    
+    options = "-Denable-docs=false"
+    
     
     if get.buildTYPE() == "emul32":
-        options += "--libdir=lib32 .."
-                
-    shelltools.system(options)
-    
-   
+        options += " --libdir=lib32 --bindir=bin32 --libexecdir=libexec32"
+        
+        
+    mesontools.configure(options)
+
 def build():
-    shelltools.cd("build")
-    shelltools.system("ninja")
-    
+	
+    mesontools.build()
+
 def install():
-    shelltools.cd("build")
-    shelltools.system("DESTDIR=%s ninja install" % get.installDIR())
-    
+    mesontools.install()
+
     if get.buildTYPE() == "emul32":
+        pisitools.removeDir("/usr/libexec32")
+        pisitools.removeDir("/usr/bin32")
         return
     
-    shelltools.cd("..")
     pisitools.dodoc("README*", "NEWS", "LICENSE")
diff --git a/x11/library/libxkbcommon/pspec.xml b/x11/library/libxkbcommon/pspec.xml
index 736fd1c864..2867fba7ea 100644
--- a/x11/library/libxkbcommon/pspec.xml
+++ b/x11/library/libxkbcommon/pspec.xml
@@ -12,12 +12,13 @@
         <IsA>library</IsA>
         <Summary>Library to convert evdev keycodes to keysyms</Summary>
         <Description>Library to convert evdev keycodes to keysyms</Description>
-        <Archive sha1sum="42971c287a4fd0fd432040ccae6c6f789854947e" type="targz">https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-0.9.1.tar.gz</Archive>
+        <Archive sha1sum="eaa67cbbf8837c8ef14e685bdf5386f88e4d6ad6" type="targz">https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-1.3.0.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>meson</Dependency>
             <Dependency>xorg-proto</Dependency>
             <Dependency>util-macros</Dependency>
             <Dependency>libxcb-devel</Dependency>
+            <Dependency>libxml2-devel</Dependency>
             <Dependency>wayland-cursor</Dependency>
             <Dependency>wayland-server</Dependency>
             <Dependency>wayland-client</Dependency>
@@ -31,9 +32,14 @@
         <Name>libxkbcommon</Name>
         <RuntimeDependencies>
             <Dependency>libxcb</Dependency>
+            <Dependency>libxml2</Dependency>
+            <Dependency>wayland-client</Dependency>
         </RuntimeDependencies>
         <Files>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="executable">/usr/libexec</Path>
             <Path fileType="doc">/usr/share/doc/libxkbcommon/</Path>
+            <Path fileType="man">/usr/share/man</Path>
             <Path fileType="library">/usr/lib/lib*.so*</Path>
         </Files>
     </Package>
@@ -44,6 +50,7 @@
         <RuntimeDependencies>
             <Dependency release="current">libxkbcommon</Dependency>
             <Dependency>libxcb-devel</Dependency>
+            <Dependency>libxml2-devel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
@@ -59,11 +66,13 @@
         <BuildType>emul32</BuildType>
         <BuildDependencies>
             <Dependency>libxcb-32bit</Dependency>
+            <Dependency>libxml2-32bit</Dependency>
             <Dependency>wayland-32bit</Dependency>
         </BuildDependencies>
         <RuntimeDependencies>
             <Dependency release="current">libxkbcommon</Dependency>
             <Dependency>libxcb-32bit</Dependency>
+            <Dependency>libxml2-32bit</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib32</Path>
@@ -71,6 +80,13 @@
     </Package>
 
     <History>
+        <Update release="10">
+            <Date>2021-06-03</Date>
+            <Version>1.3.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="9">
             <Date>2021-01-03</Date>
             <Version>0.9.1</Version>