From e67013facbb9dfaf42d9e19dee1f962539514b34 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 26 Jul 2022 13:10:36 +0000 Subject: [PATCH 01/15] weston: update to 10.0.2 ann: - https://lists.freedesktop.org/archives/wayland-devel/2022-July/042277.html --- packages/wayland/weston/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/wayland/weston/package.mk b/packages/wayland/weston/package.mk index 3ddec39343..9999639de8 100644 --- a/packages/wayland/weston/package.mk +++ b/packages/wayland/weston/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="weston" -PKG_VERSION="10.0.1" -PKG_SHA256="8a9e52506a865a7410981b04f8341b89b84106db8531ab1f9fdd37b5dc034115" +PKG_VERSION="10.0.2" +PKG_SHA256="89646ca0d9f8d413c2767e5c3828eaa3fa149c2a105b3729a6894fa7cf1549e7" PKG_LICENSE="MIT" PKG_SITE="https://wayland.freedesktop.org/" PKG_URL="https://gitlab.freedesktop.org/wayland/weston/-/releases/${PKG_VERSION}/downloads/${PKG_NAME}-${PKG_VERSION}.tar.xz" From cc22cbc5c9af24d76f885c8e715d5f9a24f8d3af Mon Sep 17 00:00:00 2001 From: heitbaum Date: Wed, 9 Feb 2022 10:36:22 +0000 Subject: [PATCH 02/15] 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 | 25 +++++------- ...config-0001-dont-require-util-macros.patch | 39 ------------------- 2 files changed, 10 insertions(+), 54 deletions(-) delete mode 100644 packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0001-dont-require-util-macros.patch diff --git a/packages/x11/data/xkeyboard-config/package.mk b/packages/x11/data/xkeyboard-config/package.mk index aec5c7c580..6a5341271b 100644 --- a/packages/x11/data/xkeyboard-config/package.mk +++ b/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_SHA256="b321d27686ee7e6610ffe7b56e28d5bbf60625a1f595124cd320c0caa717b8ce" +PKG_VERSION="2.36" +PKG_SHA256="1f1bb1292a161d520a3485d378609277d108cd07cde0327c16811ff54c3e1595" PKG_LICENSE="MIT" -PKG_SITE="http://www.X.org" -PKG_URL="http://www.x.org/releases/individual/data/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.bz2" +PKG_SITE="https://www.X.org" +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 \ - --enable-compat-rules \ - --disable-runtime-deps \ - --enable-nls \ - --disable-rpath \ - --datadir=/usr/lib \ - --with-gnu-ld" + PKG_MESON_OPTS_TARGET="-Dcompat-rules=true \ + -Ddatadir=lib" if [ "${DISPLAYSERVER}" = "x11" ]; then - PKG_CONFIGURE_OPTS_TARGET+=" XKBCOMP=/usr/bin/xkbcomp \ - --with-xkb-base=${XORG_PATH_XKB} \ - --with-xkb-rules-symlink=xorg" + PKG_MESON_OPTS_TARGET+=" -Dxkb-base=${XORG_PATH_XKB} \ + -Dxorg-rules-symlinks=true" + else + PKG_MESON_OPTS_TARGET+=" -Dxorg-rules-symlinks=false" fi } diff --git a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0001-dont-require-util-macros.patch b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0001-dont-require-util-macros.patch deleted file mode 100644 index a75bc13437..0000000000 --- a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-0001-dont-require-util-macros.patch +++ /dev/null @@ -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 From 260d056fc26206f5df861c4fc050b6961e4cdf58 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 19 Jul 2022 11:14:40 +0000 Subject: [PATCH 03/15] libxcvt: update to 0.1.2 --- packages/x11/lib/libxcvt/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/x11/lib/libxcvt/package.mk b/packages/x11/lib/libxcvt/package.mk index a2eb0da8bd..9020f9b20f 100644 --- a/packages/x11/lib/libxcvt/package.mk +++ b/packages/x11/lib/libxcvt/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libxcvt" -PKG_VERSION="0.1.1" -PKG_SHA256="27ebce180d355f94c1992930bedb40a36f6d7312ee50bf7f0acbcd22f33e8c29" +PKG_VERSION="0.1.2" +PKG_SHA256="0561690544796e25cfbd71806ba1b0d797ffe464e9796411123e79450f71db38" PKG_LICENSE="OSS" PKG_SITE="https://gitlab.freedesktop.org/xorg/lib/libxcvt" PKG_URL="https://www.x.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.xz" From c5d46a036ae00dc1a343d5bc7e35c1fbaa81c7b7 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 11 Aug 2022 11:05:11 +0000 Subject: [PATCH 04/15] xorgproto: update to 2022.2 --- packages/x11/proto/xorgproto/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/x11/proto/xorgproto/package.mk b/packages/x11/proto/xorgproto/package.mk index bf8f77f3f5..88b68d1460 100644 --- a/packages/x11/proto/xorgproto/package.mk +++ b/packages/x11/proto/xorgproto/package.mk @@ -2,11 +2,11 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="xorgproto" -PKG_VERSION="2022.1" -PKG_SHA256="1d2dcc66963f234d2c1e1f8d98a0d3e8725149cdac0a263df4097593c48bc2a6" +PKG_VERSION="2022.2" +PKG_SHA256="5d13dbf2be08f95323985de53352c4f352713860457b95ccaf894a647ac06b9e" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" -PKG_URL="https://xorg.freedesktop.org/archive/individual/proto/${PKG_NAME}-${PKG_VERSION}.tar.bz2" +PKG_URL="https://xorg.freedesktop.org/archive/individual/proto/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain util-macros" PKG_LONGDESC="combined X.Org X11 Protocol headers" PKG_TOOLCHAIN="meson" From 68c2ec4f3440263a9d2095ce21e4c528b3ac9922 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 8 Aug 2022 09:02:21 +0000 Subject: [PATCH 05/15] foot: update to 1.13.0 --- packages/wayland/util/foot/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/wayland/util/foot/package.mk b/packages/wayland/util/foot/package.mk index a7ef30fc7d..d796ef583b 100644 --- a/packages/wayland/util/foot/package.mk +++ b/packages/wayland/util/foot/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="foot" -PKG_VERSION="1.12.1" -PKG_SHA256="14e307ac89454b682bb9f1bc644043779f4462df656034fcc4c1e72b18fbffdd" +PKG_VERSION="1.13.0" +PKG_SHA256="9fd10584d40f6aac6b87c11a94e1fdfc4bac43aef9144f4aa84213257672da8c" PKG_LICENSE="MIT" PKG_SITE="https://codeberg.org/dnkl/foot/" PKG_URL="https://codeberg.org/dnkl/foot/archive/${PKG_VERSION}.tar.gz" From c08ebf79090e155388b5a3765455093282665ed7 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 9 Aug 2022 09:35:44 +0000 Subject: [PATCH 06/15] tllist: update to 1.1.0 --- packages/wayland/lib/tllist/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/wayland/lib/tllist/package.mk b/packages/wayland/lib/tllist/package.mk index e99e04174d..8405d6c0a4 100644 --- a/packages/wayland/lib/tllist/package.mk +++ b/packages/wayland/lib/tllist/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="tllist" -PKG_VERSION="1.0.5" -PKG_SHA256="b0f32c9b2c2015c8d8dd068fd4e8b586aa91ca1670badc274ec962559ee0aadd" +PKG_VERSION="1.1.0" +PKG_SHA256="0e7b7094a02550dd80b7243bcffc3671550b0f1d8ba625e4dff52517827d5d23" PKG_LICENSE="MIT" PKG_SITE="https://codeberg.org/dnkl/tllist" PKG_URL="https://codeberg.org/dnkl/tllist/archive/${PKG_VERSION}.tar.gz" From a0cf41109df2671ccad3233734f4cdbc8b26a66c Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 2 Aug 2022 08:51:36 +0000 Subject: [PATCH 07/15] libevdev: update to 1.13.0 --- packages/sysutils/libevdev/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/libevdev/package.mk b/packages/sysutils/libevdev/package.mk index 1258d316ed..c89433a844 100644 --- a/packages/sysutils/libevdev/package.mk +++ b/packages/sysutils/libevdev/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libevdev" -PKG_VERSION="1.12.1" -PKG_SHA256="1dbba41bc516d3ca7abc0da5b862efe3ea8a7018fa6e9b97ce9d39401b22426c" +PKG_VERSION="1.13.0" +PKG_SHA256="9edf2006cc86a5055279647c38ec923d11a821ee4dc2c3033e8d20e8ee237cd9" PKG_LICENSE="MIT" PKG_SITE="http://www.freedesktop.org/wiki/Software/libevdev/" PKG_URL="http://www.freedesktop.org/software/libevdev/${PKG_NAME}-${PKG_VERSION}.tar.xz" From b9dd29a7f94ca2ec11fa7ddbf996212690c801f7 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 23 Aug 2022 14:24:18 +0000 Subject: [PATCH 08/15] fcft: update to 3.1.3 --- packages/wayland/lib/fcft/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/wayland/lib/fcft/package.mk b/packages/wayland/lib/fcft/package.mk index ba10cd691a..4df0a944d9 100644 --- a/packages/wayland/lib/fcft/package.mk +++ b/packages/wayland/lib/fcft/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="fcft" -PKG_VERSION="3.1.2" -PKG_SHA256="f571afe693d3fa11fe36e97c7a2ecbbf9313755ee31c1ec3dcc648796b8e6db0" +PKG_VERSION="3.1.3" +PKG_SHA256="d9bff464ae5c31fbaad0fb8a50b6db2fc168c48aae169d005066ad358b9d432d" PKG_LICENSE="MIT" PKG_SITE="https://codeberg.org/dnkl/fcft" PKG_URL="https://codeberg.org/dnkl/fcft/archive/${PKG_VERSION}.tar.gz" From eb987b90b3b58a350f77099e4bad960cb02803a9 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 27 Aug 2022 09:28:31 +0000 Subject: [PATCH 09/15] libXau: update to 1.0.10 and https --- packages/x11/lib/libXau/package.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/x11/lib/libXau/package.mk b/packages/x11/lib/libXau/package.mk index 8753221c26..e476e5e84a 100644 --- a/packages/x11/lib/libXau/package.mk +++ b/packages/x11/lib/libXau/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libXau" -PKG_VERSION="1.0.9" -PKG_SHA256="ccf8cbf0dbf676faa2ea0a6d64bcc3b6746064722b606c8c52917ed00dcb73ec" +PKG_VERSION="1.0.10" +PKG_SHA256="8be6f292334d2f87e5b919c001e149a9fdc27005d6b3e053862ac6ebbf1a0c0a" PKG_LICENSE="OSS" -PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" +PKG_SITE="https://www.X.org" +PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain util-macros xorgproto" PKG_LONGDESC="X authorization file management libary" PKG_BUILD_FLAGS="+pic" From be563fcc5a4b397f2ba9770c2e8f649b89c7fdaa Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 27 Aug 2022 09:30:31 +0000 Subject: [PATCH 10/15] libXfont2: update to 2.0.6 and https --- packages/x11/lib/libXfont2/package.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/x11/lib/libXfont2/package.mk b/packages/x11/lib/libXfont2/package.mk index 473d8c2d70..4a5ebbb115 100644 --- a/packages/x11/lib/libXfont2/package.mk +++ b/packages/x11/lib/libXfont2/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libXfont2" -PKG_VERSION="2.0.5" -PKG_SHA256="aa7c6f211cf7215c0ab4819ed893dc98034363d7b930b844bb43603c2e10b53e" +PKG_VERSION="2.0.6" +PKG_SHA256="74ca20017eb0fb3f56d8d5e60685f560fc85e5ff3d84c61c4cb891e40c27aef4" PKG_LICENSE="OSS" -PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" +PKG_SITE="https://www.X.org" +PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain util-macros xtrans freetype libfontenc" PKG_LONGDESC="X font Library" From c73637159a32d73e30a92a6ae751a4b48e5ad957 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 27 Aug 2022 09:31:35 +0000 Subject: [PATCH 11/15] libfontenc: update to 1.1.5 and https --- packages/x11/lib/libfontenc/package.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/x11/lib/libfontenc/package.mk b/packages/x11/lib/libfontenc/package.mk index 42cc822e95..948f40b70b 100644 --- a/packages/x11/lib/libfontenc/package.mk +++ b/packages/x11/lib/libfontenc/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libfontenc" -PKG_VERSION="1.1.4" -PKG_SHA256="2cfcce810ddd48f2e5dc658d28c1808e86dcf303eaff16728b9aa3dbc0092079" +PKG_VERSION="1.1.5" +PKG_SHA256="43ef0387090ea526faf8d3b0907ee0e4be0fb433c17e0b1bdb8433aa1de2b12c" PKG_LICENSE="OSS" -PKG_SITE="http://www.X.org" -PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.bz2" +PKG_SITE="https://www.X.org" +PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain util-macros zlib font-util xorgproto" PKG_LONGDESC="Libfontenc is a library which helps font libraries portably determine and deal with different encodings of fonts." PKG_BUILD_FLAGS="+pic" From d23269f79d3b870c615464c5e5c1b028b389259c Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 28 Aug 2022 02:12:41 +0000 Subject: [PATCH 12/15] xorgproto: drop PKG_TOOLCHAIN hardcoding - was already meson and https --- packages/x11/proto/xorgproto/package.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/x11/proto/xorgproto/package.mk b/packages/x11/proto/xorgproto/package.mk index 88b68d1460..8d1299e5fb 100644 --- a/packages/x11/proto/xorgproto/package.mk +++ b/packages/x11/proto/xorgproto/package.mk @@ -5,11 +5,10 @@ PKG_NAME="xorgproto" PKG_VERSION="2022.2" PKG_SHA256="5d13dbf2be08f95323985de53352c4f352713860457b95ccaf894a647ac06b9e" PKG_LICENSE="OSS" -PKG_SITE="http://www.X.org" +PKG_SITE="https://www.X.org" PKG_URL="https://xorg.freedesktop.org/archive/individual/proto/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain util-macros" PKG_LONGDESC="combined X.Org X11 Protocol headers" -PKG_TOOLCHAIN="meson" PKG_MESON_OPTS_TARGET="-Dlegacy=false \ -Dpkgconfigdatadir=/usr/lib/pkgconfig" From df04574310c7ae7128e7d0aaa56e6767bfd05719 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 31 Aug 2022 10:26:57 +0000 Subject: [PATCH 13/15] libfontenc: update to 1.1.6 --- packages/x11/lib/libfontenc/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/x11/lib/libfontenc/package.mk b/packages/x11/lib/libfontenc/package.mk index 948f40b70b..a363666133 100644 --- a/packages/x11/lib/libfontenc/package.mk +++ b/packages/x11/lib/libfontenc/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libfontenc" -PKG_VERSION="1.1.5" -PKG_SHA256="43ef0387090ea526faf8d3b0907ee0e4be0fb433c17e0b1bdb8433aa1de2b12c" +PKG_VERSION="1.1.6" +PKG_SHA256="ea8606ed5255dda8f570b7d1a74d59ee8d198675b2f114d07807431e6ba1d111" PKG_LICENSE="OSS" PKG_SITE="https://www.X.org" PKG_URL="https://xorg.freedesktop.org/archive/individual/lib/${PKG_NAME}-${PKG_VERSION}.tar.xz" From a6197d2eb8052dd88daa91d30f0115c18366a96e Mon Sep 17 00:00:00 2001 From: SupervisedThinking Date: Wed, 31 Aug 2022 22:17:05 +0200 Subject: [PATCH 14/15] xkeyboard-config: fix broken meson xkb-base options --- ...ard-config-995.01-2.36-fix-xkb-base-path.patch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 packages/x11/data/xkeyboard-config/patches/xkeyboard-config-995.01-2.36-fix-xkb-base-path.patch diff --git a/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-995.01-2.36-fix-xkb-base-path.patch b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-995.01-2.36-fix-xkb-base-path.patch new file mode 100644 index 0000000000..ab2682ae1d --- /dev/null +++ b/packages/x11/data/xkeyboard-config/patches/xkeyboard-config-995.01-2.36-fix-xkb-base-path.patch @@ -0,0 +1,15 @@ +--- /meson.build ++++ /meson.build +@@ -4,7 +4,10 @@ + meson_version: '>= 0.54.0') + + dir_data = join_paths(get_option('prefix'), get_option('datadir')) +-dir_xkb_base = join_paths(dir_data, 'X11', 'xkb') ++dir_xkb_base = get_option('xkb-base') ++if dir_xkb_base == '' ++ dir_xkb_base = join_paths(dir_data, 'X11', 'xkb') ++endif + dir_xkb_rules = join_paths(dir_xkb_base, 'rules') + dir_man7 = join_paths(get_option('prefix'), get_option('mandir'), 'man7') + dir_pkgconfig = join_paths(dir_data, 'pkgconfig') + From 30c41da81f02bc552da4573aca71b3d973681295 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 1 Sep 2022 08:14:02 +0000 Subject: [PATCH 15/15] foot: update to 1.13.1 --- packages/wayland/util/foot/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/wayland/util/foot/package.mk b/packages/wayland/util/foot/package.mk index d796ef583b..fce8f89063 100644 --- a/packages/wayland/util/foot/package.mk +++ b/packages/wayland/util/foot/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="foot" -PKG_VERSION="1.13.0" -PKG_SHA256="9fd10584d40f6aac6b87c11a94e1fdfc4bac43aef9144f4aa84213257672da8c" +PKG_VERSION="1.13.1" +PKG_SHA256="604f777fdaccfc1ee2d20376cc5688a819dcd6b7113725880cc973194fd6c737" PKG_LICENSE="MIT" PKG_SITE="https://codeberg.org/dnkl/foot/" PKG_URL="https://codeberg.org/dnkl/foot/archive/${PKG_VERSION}.tar.gz"