From 6fe4b5dccaf979801dc3069f067f3ce179a53803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= Date: Wed, 31 Aug 2022 13:44:46 +0100 Subject: [PATCH] xkeyboard-config: fix upstream issue. use backslashes instead of slashes for line continuation This fixes 324 (https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/324) --- .../patches/fix_backlashes.patch | 42 +++++++++++++++++++ srcpkgs/xkeyboard-config/template | 2 +- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/xkeyboard-config/patches/fix_backlashes.patch diff --git a/srcpkgs/xkeyboard-config/patches/fix_backlashes.patch b/srcpkgs/xkeyboard-config/patches/fix_backlashes.patch new file mode 100644 index 0000000000000..fc7e8fb2e0aa1 --- /dev/null +++ b/srcpkgs/xkeyboard-config/patches/fix_backlashes.patch @@ -0,0 +1,42 @@ +From dc1534b4b0cf2153e4b8848310efc8393fb73830 Mon Sep 17 00:00:00 2001 +From: Benno Schulenberg +Date: Sun, 12 Jun 2022 12:05:20 +0200 +Subject: [PATCH] rules: remove two rules that reference two sections that were + deleted + +Commit fe36f31e8c from three months ago removed the need for special +aliases and key assignments for applealu_jis keyboards but forgot to +remove the two rules that reference these sections. + +This fixes issue #325. + +Signed-off-by: Benno Schulenberg +--- + rules/0004-evdev.m_k.part | 1 - + rules/0026-evdev.m_s.part | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/rules/0004-evdev.m_k.part b/rules/0004-evdev.m_k.part +index 1cff7b2f..62c21ffc 100644 +--- a/rules/0004-evdev.m_k.part ++++ b/rules/0004-evdev.m_k.part +@@ -1,5 +1,4 @@ + ! model = keycodes +- applealu_jis = evdev+macintosh(jisevdev) + $jollamodels = evdev+jolla(jolla) + olpc = evdev+olpc(olpc) + olpcm = evdev+olpc(olpcm) +diff --git a/rules/0026-evdev.m_s.part b/rules/0026-evdev.m_s.part +index 2dd72051..80067025 100644 +--- a/rules/0026-evdev.m_s.part ++++ b/rules/0026-evdev.m_s.part +@@ -2,5 +2,4 @@ + $evdevkbds = +inet(evdev)+inet(%m) + chromebook = +inet(evdev)+inet(chromebook) + ppkb = +inet(evdev)+inet(ppkb) +- applealu_jis = +inet(evdev)+macintosh_vndr/jp(alujiskeys) + * = +inet(evdev) +-- +GitLab + + diff --git a/srcpkgs/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template index 35fbce369b428..85bfeb5c425ae 100644 --- a/srcpkgs/xkeyboard-config/template +++ b/srcpkgs/xkeyboard-config/template @@ -1,7 +1,7 @@ # Template file for 'xkeyboard-config' pkgname=xkeyboard-config version=2.36 -revision=1 +revision=2 build_style=meson configure_args="-Dxorg-rules-symlinks=true -Dcompat-rules=true" hostmakedepends="pkg-config libxslt python3 intltool perl"