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 @@
library
Library to convert evdev keycodes to keysyms
Library to convert evdev keycodes to keysyms
- https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-0.9.1.tar.gz
+ https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-1.3.0.tar.gz
meson
xorg-proto
util-macros
libxcb-devel
+ libxml2-devel
wayland-cursor
wayland-server
wayland-client
@@ -31,9 +32,14 @@
libxkbcommon
libxcb
+ libxml2
+ wayland-client
+ /usr/bin
+ /usr/libexec
/usr/share/doc/libxkbcommon/
+ /usr/share/man
/usr/lib/lib*.so*
@@ -44,6 +50,7 @@
libxkbcommon
libxcb-devel
+ libxml2-devel
/usr/include
@@ -59,11 +66,13 @@
emul32
libxcb-32bit
+ libxml2-32bit
wayland-32bit
libxkbcommon
libxcb-32bit
+ libxml2-32bit
/usr/lib32
@@ -71,6 +80,13 @@
+
+ 2021-06-03
+ 1.3.0
+ Version bump.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2021-01-03
0.9.1