xkeyboard-config: update to 2.36 and meson and https

As of version 2.35: autotools has been dropped and only meson is available now.

packages/x11/data/xkeyboard-config/package.mk

@@ -3,14 +3,13 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="xkeyboard-config"
-PKG_VERSION="2.34"
+PKG_VERSION="2.36"
-PKG_SHA256="b321d27686ee7e6610ffe7b56e28d5bbf60625a1f595124cd320c0caa717b8ce"
+PKG_SHA256="1f1bb1292a161d520a3485d378609277d108cd07cde0327c16811ff54c3e1595"
 PKG_LICENSE="MIT"
-PKG_SITE="http://www.X.org"
+PKG_SITE="https://www.X.org"
-PKG_URL="http://www.x.org/releases/individual/data/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://www.x.org/releases/individual/data/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain util-macros"
 PKG_LONGDESC="X keyboard extension data files."
-PKG_TOOLCHAIN="autotools"
 
 configure_package() {
   if [ "${DISPLAYSERVER}" = "x11" ]; then
@@ -19,17 +18,13 @@ configure_package() {
 }
 
 pre_configure_target() {
-  PKG_CONFIGURE_OPTS_TARGET="--without-xsltproc \
+  PKG_MESON_OPTS_TARGET="-Dcompat-rules=true \
-                             --enable-compat-rules \
+                         -Ddatadir=lib"
-                             --disable-runtime-deps \
-                             --enable-nls \
-                             --disable-rpath \
-                             --datadir=/usr/lib \
-                             --with-gnu-ld"
 
   if [ "${DISPLAYSERVER}" = "x11" ]; then
-    PKG_CONFIGURE_OPTS_TARGET+=" XKBCOMP=/usr/bin/xkbcomp \
+    PKG_MESON_OPTS_TARGET+=" -Dxkb-base=${XORG_PATH_XKB} \
-                               --with-xkb-base=${XORG_PATH_XKB} \
+                            -Dxorg-rules-symlinks=true"
-                               --with-xkb-rules-symlink=xorg"
+  else
+    PKG_MESON_OPTS_TARGET+=" -Dxorg-rules-symlinks=false"
   fi
 }

packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0001-dont-require-util-macros.patch

@@ -1,39 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac	2018-01-31 11:06:08.000000000 -0800
-+++ b/configure.ac	2018-12-05 16:32:04.016734637 -0800
-@@ -2,13 +2,6 @@
- AC_CONFIG_SRCDIR(rules/base.xml.in)
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
- 
--# Require X.Org macros 1.12 or later for XORG_WITH_XSLTPROC
--m4_ifndef([XORG_MACROS_VERSION],
--          [m4_fatal([must install xorg-macros 1.12 or later before
--          running autoconf/autogen])])
--XORG_MACROS_VERSION(1.12)
--XORG_MANPAGE_SECTIONS
--XORG_WITH_XSLTPROC
- AC_PROG_SED
- 
- AC_SUBST(VERSION)
-diff -Naur a/man/Makefile.am b/man/Makefile.am
---- a/man/Makefile.am	2018-01-31 11:06:08.000000000 -0800
-+++ b/man/Makefile.am	2018-12-05 16:35:35.787618428 -0800
-@@ -1,18 +1,2 @@
- EXTRA_DIST = man.xsl
- 
--if HAVE_XSLTPROC
--miscmandir = $(MISC_MAN_DIR)
--miscman_PRE = xkeyboard-config.man
--miscman_DATA = $(miscman_PRE:man=@MISC_MAN_SUFFIX@)
--CLEANFILES = $(miscman_DATA) $(miscman_PRE)
--SUFFIXES = .$(MISC_MAN_SUFFIX) .man
--MAN_SUBSTS += -e 's|__xkb_base__|$(xkb_base)|g'
--
--xkeyboard-config.man: $(top_srcdir)/rules/evdev.xml $(srcdir)/man.xsl
--	$(XSLTPROC) -nonet $(srcdir)/man.xsl $(top_srcdir)/rules/evdev.xml > $@
--
--# First sed swaps @appmansuffix@ back to __appmansuffix__ for the MAN_SUBSTS
--.man.$(MISC_MAN_SUFFIX):
--	$(SED) -e 's|@\(\<[a-z_]*\>\)@|__\1__|g' < $< | $(SED) $(MAN_SUBSTS) > $@
--
--endif