Date: Sunday, October 20, 2019 @ 19:12:52 Author: heftig Revision: 365243
archrelease: copy trunk to extra-x86_64 Added: libxkbcommon/repos/extra-x86_64/0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch (from rev 365242, libxkbcommon/trunk/0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch) libxkbcommon/repos/extra-x86_64/PKGBUILD (from rev 365242, libxkbcommon/trunk/PKGBUILD) Deleted: libxkbcommon/repos/extra-x86_64/PKGBUILD -----------------------------------------------------------------+ 0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch | 41 ++ PKGBUILD | 157 +++++----- 2 files changed, 122 insertions(+), 76 deletions(-) Copied: libxkbcommon/repos/extra-x86_64/0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch (from rev 365242, libxkbcommon/trunk/0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch) =================================================================== --- 0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch (rev 0) +++ 0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch 2019-10-20 19:12:52 UTC (rev 365243) @@ -0,0 +1,41 @@ +From 1cd54b5e37730aee3e3c92262241fcdbab4407ac Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Sun, 20 Oct 2019 19:06:19 +0000 +Subject: [PATCH] context: Don't fail to create the context if HOME isn't + available + +E.g. when Mutter has CAP_SYS_NICE and thus secure_getenv returns NULL. + +Fixes https://bugs.archlinux.org/task/64191 +--- + src/context.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/context.c b/src/context.c +index f43ee0a..6d86dd1 100644 +--- a/src/context.c ++++ b/src/context.c +@@ -81,13 +81,13 @@ xkb_context_include_path_append_default(struct xkb_context *ctx) + int ret = 0; + + home = secure_getenv("HOME"); +- if (!home) +- return ret; +- err = asprintf(&user_path, "%s/.xkb", home); +- if (err <= 0) +- return ret; +- ret |= xkb_context_include_path_append(ctx, user_path); +- free(user_path); ++ if (home != NULL) { ++ err = asprintf(&user_path, "%s/.xkb", home); ++ if (err <= 0) ++ return ret; ++ ret |= xkb_context_include_path_append(ctx, user_path); ++ free(user_path); ++ } + + root = secure_getenv("XKB_CONFIG_ROOT"); + if (root != NULL) +-- +2.23.0 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-10-20 19:12:40 UTC (rev 365242) +++ PKGBUILD 2019-10-20 19:12:52 UTC (rev 365243) @@ -1,76 +0,0 @@ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> -# Contributor: Daniel Micay <danielmi...@gmail.com> -# Contributor: Mladen Pejakovic <pej...@gmail.com> - -pkgbase=libxkbcommon -pkgname=(libxkbcommon libxkbcommon-doc libxkbcommon-x11) -pkgver=0.9.0 -pkgrel=1 -pkgdesc="Keymap handling library for toolkits and window systems" -url="https://xkbcommon.org/" -arch=(x86_64) -license=(custom) -depends=(xkeyboard-config glibc) -makedepends=(libxcb doxygen git graphviz wayland wayland-protocols meson) -checkdepends=(xorg-server-xvfb libgl) -_commit=a88a0710f95c0422f52c54d9bad14b2cc45e3dd0 # tags/xkbcommon-0.9.0^0 -source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit") -md5sums=('SKIP') - -pkgver() { - cd $pkgbase - git describe --tags | sed 's/^xkbcommon-//;s/-/+/g' -} - -prepare() { - cd $pkgbase - - printf '%s\n' >>doc/Doxyfile.in \ - HAVE_DOT=yes DOT_IMAGE_FORMAT=svg INTERACTIVE_SVG=yes -} - -build() { - arch-meson $pkgbase build - ninja -C build -} - -check() { - xvfb-run -a meson test -C build --print-errorlogs -} - -package_libxkbcommon() { - DESTDIR="$pkgdir" meson install -C build - install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE - -### Split libxkbcommon-doc - - mkdir -p "$srcdir"/doc/usr/share - mv "$pkgdir"/usr/share/doc "$srcdir/doc/usr/share" - -### Split libxkbcommon-x11 - - mkdir -p "$srcdir"/x11/usr/{include/xkbcommon,lib/pkgconfig} - mv "$pkgdir"/usr/lib/*x11* "$srcdir/x11/usr/lib" - mv "$pkgdir"/usr/lib/pkgconfig/*x11* "$srcdir/x11/usr/lib/pkgconfig" - mv "$pkgdir"/usr/include/xkbcommon/*x11* "$srcdir/x11/usr/include/xkbcommon" -} - -package_libxkbcommon-doc() { - pkgdesc="API documentation for libxkbcommon" - depends=(libxkbcommon) - - mv doc/* "$pkgdir" - - install -d "$pkgdir/usr/share/licenses" - ln -s libxkbcommon "$pkgdir/usr/share/licenses/$pkgname" -} - -package_libxkbcommon-x11() { - pkgdesc="Keyboard handling library using XKB data for X11 XCB clients" - depends=(libxkbcommon libxcb) - - mv x11/* "$pkgdir" - - install -d "$pkgdir/usr/share/licenses" - ln -s libxkbcommon "$pkgdir/usr/share/licenses/$pkgname" -} Copied: libxkbcommon/repos/extra-x86_64/PKGBUILD (from rev 365242, libxkbcommon/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-10-20 19:12:52 UTC (rev 365243) @@ -0,0 +1,81 @@ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steff...@gmail.com> +# Contributor: Daniel Micay <danielmi...@gmail.com> +# Contributor: Mladen Pejakovic <pej...@gmail.com> + +pkgbase=libxkbcommon +pkgname=(libxkbcommon libxkbcommon-doc libxkbcommon-x11) +pkgver=0.9.0 +pkgrel=2 +pkgdesc="Keymap handling library for toolkits and window systems" +url="https://xkbcommon.org/" +arch=(x86_64) +license=(custom) +depends=(xkeyboard-config glibc) +makedepends=(libxcb doxygen git graphviz wayland wayland-protocols meson) +checkdepends=(xorg-server-xvfb libgl) +_commit=a88a0710f95c0422f52c54d9bad14b2cc45e3dd0 # tags/xkbcommon-0.9.0^0 +source=("git+https://github.com/xkbcommon/libxkbcommon#commit=$_commit" + 0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch) +sha256sums=('SKIP' + '62794414d698648eba9d05723f5c6a9b0bc8c3e1d611548932e3c5eb06e3c00e') + +pkgver() { + cd $pkgbase + git describe --tags | sed 's/^xkbcommon-//;s/-/+/g' +} + +prepare() { + cd $pkgbase + + # https://bugs.archlinux.org/task/64191 + git apply -3 ../0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch + + printf '%s\n' >>doc/Doxyfile.in \ + HAVE_DOT=yes DOT_IMAGE_FORMAT=svg INTERACTIVE_SVG=yes +} + +build() { + arch-meson $pkgbase build + ninja -C build +} + +check() { + xvfb-run -a meson test -C build --print-errorlogs +} + +package_libxkbcommon() { + DESTDIR="$pkgdir" meson install -C build + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 $pkgbase/LICENSE + +### Split libxkbcommon-doc + + mkdir -p "$srcdir"/doc/usr/share + mv "$pkgdir"/usr/share/doc "$srcdir/doc/usr/share" + +### Split libxkbcommon-x11 + + mkdir -p "$srcdir"/x11/usr/{include/xkbcommon,lib/pkgconfig} + mv "$pkgdir"/usr/lib/*x11* "$srcdir/x11/usr/lib" + mv "$pkgdir"/usr/lib/pkgconfig/*x11* "$srcdir/x11/usr/lib/pkgconfig" + mv "$pkgdir"/usr/include/xkbcommon/*x11* "$srcdir/x11/usr/include/xkbcommon" +} + +package_libxkbcommon-doc() { + pkgdesc="API documentation for libxkbcommon" + depends=(libxkbcommon) + + mv doc/* "$pkgdir" + + install -d "$pkgdir/usr/share/licenses" + ln -s libxkbcommon "$pkgdir/usr/share/licenses/$pkgname" +} + +package_libxkbcommon-x11() { + pkgdesc="Keyboard handling library using XKB data for X11 XCB clients" + depends=(libxkbcommon libxcb) + + mv x11/* "$pkgdir" + + install -d "$pkgdir/usr/share/licenses" + ln -s libxkbcommon "$pkgdir/usr/share/licenses/$pkgname" +}