From f8cf02e9cd2cb8ca30115dee760b8d1b4c70c2ce Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Sun, 16 Jun 2019 19:16:15 -0300
Subject: [PATCH] recipes: xorg/data/xkeyboard-config: handle config files at
 /etc/X11/xkb via graft(1)

---
 recipes/xorg/data/xkeyboard-config/recipe | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/recipes/xorg/data/xkeyboard-config/recipe b/recipes/xorg/data/xkeyboard-config/recipe
index 8f399220..01ef4bc7 100644
--- a/recipes/xorg/data/xkeyboard-config/recipe
+++ b/recipes/xorg/data/xkeyboard-config/recipe
@@ -18,7 +18,7 @@
 program=xkeyboard-config
 version=2.27
 arch=noarch
-release=1
+release=2
 
 # Set 'outdir' for a nice and well-organized output directory
 outdir="${outdir}/${arch}/xorg/data"
@@ -54,13 +54,20 @@ build()
 
     ./configure $configure_args \
      --docdir=$docsdir \
-     --enable-compat-rules=yes \
+     --enable-compat-rules \
      --with-xkb-base=/etc/X11/xkb \
      --with-xkb-rules-symlink=xfree86,xorg
 
     make -j${jobs} V=1
     make -j${jobs} DESTDIR="$destdir" install
 
+    # To manage .new files via graft(1)
+    for directory in "${destdir}/etc/X11/xkb"/*
+    do
+        test -d "$directory" || continue
+        ( cd -- "$directory" && touch .graft-config )
+    done
+
     # Copy documentation
     mkdir -p "${destdir}${docsdir}"
     cp -p $docs "${destdir}${docsdir}"
-- 
2.11.4.GIT