diff --git a/x11/misc/xkeyboard-config/actions.py b/x11/misc/xkeyboard-config/actions.py index 9cf1e3b3d5..fd3cf5d73a 100644 --- a/x11/misc/xkeyboard-config/actions.py +++ b/x11/misc/xkeyboard-config/actions.py @@ -5,16 +5,18 @@ from pisi.actionsapi import autotools from pisi.actionsapi import pisitools +from pisi.actionsapi import mesontools from pisi.actionsapi import get def setup(): - autotools.configure("--enable-compat-rules \ - --with-xkb-rules-symlink=xorg") + mesontools.configure("-Dcompat-rules=true \ + -Dxorg-rules-symlinks=true") + def build(): - autotools.make() + mesontools.build() def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + mesontools.install() pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README*", "NEWS") diff --git a/x11/misc/xkeyboard-config/pspec.xml b/x11/misc/xkeyboard-config/pspec.xml index d0c5124470..30f18149ff 100644 --- a/x11/misc/xkeyboard-config/pspec.xml +++ b/x11/misc/xkeyboard-config/pspec.xml @@ -12,8 +12,9 @@ data X keyboard configuration database xkeyboard-config aims to provide consistent and well-structured X keyboard configuration data for X Window System implementations. - mirrors://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.32.tar.bz2 + mirrors://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.35.1.tar.xz + meson intltool xorg-proto xorg-app @@ -52,6 +53,13 @@ + + 2022-02-09 + 2.35.1 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2021-06-10 2.32