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 @@
library
Library to convert evdev keycodes to keysyms
Library to convert evdev keycodes to keysyms
- https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-0.8.4.tar.gz
+ https://github.com/xkbcommon/libxkbcommon/archive/xkbcommon-0.9.1.tar.gz
+ meson
xorg-proto
util-macros
libxcb-devel
+ wayland-cursor
+ wayland-server
+ wayland-client
+ wayland-devel
+ wayland-protocols-devel
xkeyboard-config
@@ -53,6 +59,7 @@
emul32
libxcb-32bit
+ wayland-32bit
libxkbcommon
@@ -64,6 +71,13 @@
+
+ 2019-10-25
+ 0.9.1
+ Version bump.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2019-10-20
0.8.4