[arch-commits] Commit in lib32-libxkbcommon/trunk (2 files)

[Jan Steffens]

    Date: Sunday, October 20, 2019 @ 19:12:41
  Author: heftig
Revision: 517948

0.9.0-2

Added:
  lib32-libxkbcommon/trunk/0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch
Modified:
  lib32-libxkbcommon/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch |   41 ++++++++++
 PKGBUILD                                                        |   13 ++-
 2 files changed, 51 insertions(+), 3 deletions(-)

Added: 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:41 UTC (rev 517948)
@@ -0,0 +1,41 @@
+From 1cd54b5e37730aee3e3c92262241fcdbab4407ac Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-20 19:10:38 UTC (rev 517947)
+++ PKGBUILD	2019-10-20 19:12:41 UTC (rev 517948)
@@ -6,7 +6,7 @@
 pkgbase=lib32-libxkbcommon
 pkgname=('lib32-libxkbcommon' 'lib32-libxkbcommon-x11')
 pkgver=0.9.0
-pkgrel=1
+pkgrel=2
 url='https://xkbcommon.org/'
 arch=('x86_64')
 license=('custom')
@@ -13,11 +13,18 @@
 makedepends=('git' 'lib32-libxcb' 'lib32-wayland' 'meson' 'wayland-protocols'
              'xorg-util-macros')
 checkdepends=('xorg-server-xvfb' 'libgl')
-source=("git+https://github.com/xkbcommon/libxkbcommon#tag=xkbcommon-${pkgver}")
-sha256sums=('SKIP')
+source=("git+https://github.com/xkbcommon/libxkbcommon#tag=xkbcommon-${pkgver}"
+        0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch)
+sha256sums=('SKIP'
+            '62794414d698648eba9d05723f5c6a9b0bc8c3e1d611548932e3c5eb06e3c00e')
 
 prepare() {
   mkdir -p build x11/usr/lib32/pkgconfig
+
+  cd libxkbcommon
+
+  # https://bugs.archlinux.org/task/64191
+  git apply -3 ../0001-context-Don-t-fail-to-create-the-context-if-HOME-isn.patch
 }
 
 build() {