From 83d3d41caa3a36f15cc0a90b8c3bbe5cd63e8525 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Sat, 26 Oct 2019 00:11:39 +0300
Subject: [PATCH] libxkbcommon:ver.bump

---
 x11/library/libxkbcommon/actions.py | 42 ++++++++++++++++-------------
 x11/library/libxkbcommon/pspec.xml  | 16 ++++++++++-
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/x11/library/libxkbcommon/actions.py b/x11/library/libxkbcommon/actions.py
index d56064b3e5..e50cdf53da 100644
--- a/x11/library/libxkbcommon/actions.py
+++ b/x11/library/libxkbcommon/actions.py
@@ -1,32 +1,36 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 #
-# Copyright 2010 TUBITAK/BILGEM
-# Licensed under the GNU General Public License, version 2.
-# See the file http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/licenses/gpl.txt
 
+from pisi.actionsapi import get
 from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
-from pisi.actionsapi import get
+from pisi.actionsapi import shelltools
 
 def setup():
-    autotools.autoreconf("-vif")
-    
-    options = " --disable-static \
+    shelltools.makedirs("build")
+    shelltools.cd("build") 
+    options = "meson --prefix=/usr -Denable-docs=false \
               "
     
     if get.buildTYPE() == "emul32":
-        options += " --libdir=/usr/lib32 \
-                   "
-        
-    autotools.configure(options)
-
+        options += "--libdir=lib32 .."
+                
+    shelltools.system(options)
+    
+   
 def build():
-    autotools.make()
-
+    shelltools.cd("build")
+    shelltools.system("ninja")
+    
 def install():
-    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-    if not get.buildTYPE() == "emul32":
+    shelltools.cd("build")
+    shelltools.system("DESTDIR=%s ninja install" % get.installDIR())
+    
+    if get.buildTYPE() == "emul32":
         return
-
-    pisitools.dodoc("NEWS", "README.md", "LICENSE")
+    
+    shelltools.cd("..")
+    pisitools.dodoc("README*", "NEWS", "LICENSE")
diff --git a/x11/library/libxkbcommon/pspec.xml b/x11/library/libxkbcommon/pspec.xml
index a26cee88d7..b2ccbeb1eb 100644
--- a/x11/library/libxkbcommon/pspec.xml
+++ b/x11/library/libxkbcommon/pspec.xml
@@ -12,11 +12,17 @@
         <IsA>library</IsA>
         <Summary>Library to convert evdev keycodes to keysyms</Summary>
         <Description>Library to convert evdev keycodes to keysyms</Description>
-        <Archive sha1sum="0f533ffdc7fe888eedf10648895b64b01e94d06e" type="targz">https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-0.8.4.tar.gz</Archive>
+        <Archive sha1sum="42971c287a4fd0fd432040ccae6c6f789854947e" type="targz">https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-0.9.1.tar.gz</Archive>
         <BuildDependencies>
+            <Dependency>meson</Dependency>
             <Dependency>xorg-proto</Dependency>
             <Dependency>util-macros</Dependency>
             <Dependency>libxcb-devel</Dependency>
+            <Dependency>wayland-cursor</Dependency>
+            <Dependency>wayland-server</Dependency>
+            <Dependency>wayland-client</Dependency>
+            <Dependency>wayland-devel</Dependency>
+            <Dependency>wayland-protocols-devel</Dependency>
             <Dependency>xkeyboard-config</Dependency>
         </BuildDependencies>
     </Source>
@@ -53,6 +59,7 @@
         <BuildType>emul32</BuildType>
         <BuildDependencies>
             <Dependency>libxcb-32bit</Dependency>
+            <Dependency>wayland-32bit</Dependency>
         </BuildDependencies>
         <RuntimeDependencies>
             <Dependency release="current">libxkbcommon</Dependency>
@@ -64,6 +71,13 @@
     </Package>
 
     <History>
+        <Update release="8">
+            <Date>2019-10-25</Date>
+            <Version>0.9.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="7">
             <Date>2019-10-20</Date>
             <Version>0.8.4</Version>