From: motorto <motorto@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] xkeyboard-config: fix upstream issue.
Date: Wed, 31 Aug 2022 14:51:29 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38998@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 978 bytes --]
There is a new pull request by motorto against master on the void-packages repository
https://github.com/motorto/void-packages xkeyboard_bug
https://github.com/void-linux/void-packages/pull/38998
xkeyboard-config: fix upstream issue.
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 this issue
(https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/325)
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv6l
A patch file from https://github.com/void-linux/void-packages/pull/38998.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xkeyboard_bug-38998.patch --]
[-- Type: text/x-diff, Size: 2947 bytes --]
From 193b72e9120bd99a117f845bc8bf81904405964a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Cerqueira?= <acerqueira021@gmail.com>
Date: Wed, 31 Aug 2022 13:44:46 +0100
Subject: [PATCH] xkeyboard-config: fix upstream issue.
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 this issue
(https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/325)
---
.../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 <bensberg@telfort.nl>
+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 <bensberg@telfort.nl>
+---
+ 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"
next reply other threads:[~2022-08-31 12:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-31 12:51 motorto [this message]
2022-08-31 14:01 ` [PR PATCH] [Updated] " motorto
2022-08-31 14:02 ` motorto
2022-09-02 19:42 ` [PR PATCH] [Merged]: " classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-38998@inbox.vuxu.org \
--to=motorto@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).