[PR PATCH] xkeyboard-config: fix upstream issue.

[PR PATCH] xkeyboard-config: fix upstream issue.

[motorto]

[-- 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"

Re: [PR PATCH] [Updated] xkeyboard-config: fix upstream issue.

[motorto]

[-- Attachment #1: Type: text/plain, Size: 983 bytes --]

There is an updated 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: 2807 bytes --]

From 6fe4b5dccaf979801dc3069f067f3ce179a53803 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.

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 <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"

Re: [PR PATCH] [Updated] xkeyboard-config: fix upstream issue.

[motorto]

[-- Attachment #1: Type: text/plain, Size: 983 bytes --]

There is an updated 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: 3881 bytes --]

From e3e3ddb068328851edf75adeb5d7997f62121a22 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.

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              | 56 +++++++++++++++++++
 srcpkgs/xkeyboard-config/template             |  2 +-
 2 files changed, 57 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 000000000000..e5776cd83ead
--- /dev/null
+++ b/srcpkgs/xkeyboard-config/patches/fix_backlashes.patch
@@ -0,0 +1,56 @@
+\x02From 8ac41c50ab0aa7cd3a7e94313074115de2a172d2 Mon Sep 17 00:00:00 2001
+From: Benno Schulenberg <bensberg@telfort.nl>
+Date: Fri, 10 Jun 2022 12:05:52 +0200
+Subject: [PATCH] rules: use backslashes instead of slashes for line
+ continuation  :\
+
+This fixes #324.
+
+Reported-by: Adriaan de Groot
+
+Bug existed since commit c3c5d02a7e from six weeks ago.
+
+Signed-off-by: Benno Schulenberg <bensberg@telfort.nl>
+---
+ rules/0002-base.lists.part | 28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/rules/0002-base.lists.part b/rules/0002-base.lists.part
+index 0af6db56..cb661240 100644
+--- a/rules/0002-base.lists.part
++++ b/rules/0002-base.lists.part
+@@ -37,18 +37,18 @@
+               unitekkb1925 yahoo
+ 
+ ! $inetmediakbds = \
+-		a4_rfkb23 a4techKB21 a4techKBS8 acer_ferrari4k acer_laptop /
+-		armada asus_laptop benqx btc5090 btc6301urf btc9019u /
+-		cherrybluea cherryblueb cherrycyboard chicony042 /
+-		compalfl90 compaqik13 compaqik18 creativedw7000 /
+-		cymotionlinux dellm65 dellusbmm dexxa diamond dtk2000 /
+-		emachines ennyah_dkb1008 fscaa1667g genius geniuscomfy /
+-		geniuscomfy2 geniuskb19e hp5xx hpdv5 hpi6 hpxe3gc hpxe3gf /
+-		hpxe4xxx hpxt1000 hpzt11xx inspiron latitude /
+-		logidinovo logidinovoedge logitech_base logitech_g15 /
+-		microsoft4000 microsoft7000 microsoftmult microsoftpro /
+-		microsoftprooem mx1998 mx2500 mx2750 pc105 precision_m /
+-		presario propeller samsung4500 samsung4510 scorpius /
+-		silvercrest sk1300 sk2500 sk7100 sp_inet targa_v811 /
+-		thinkpad thinkpad60 tm2030USB-102 tm2030USB-106 /
++		a4_rfkb23 a4techKB21 a4techKBS8 acer_ferrari4k acer_laptop \
++		armada asus_laptop benqx btc5090 btc6301urf btc9019u \
++		cherrybluea cherryblueb cherrycyboard chicony042 \
++		compalfl90 compaqik13 compaqik18 creativedw7000 \
++		cymotionlinux dellm65 dellusbmm dexxa diamond dtk2000 \
++		emachines ennyah_dkb1008 fscaa1667g genius geniuscomfy \
++		geniuscomfy2 geniuskb19e hp5xx hpdv5 hpi6 hpxe3gc hpxe3gf \
++		hpxe4xxx hpxt1000 hpzt11xx inspiron latitude \
++		logidinovo logidinovoedge logitech_base logitech_g15 \
++		microsoft4000 microsoft7000 microsoftmult microsoftpro \
++		microsoftprooem mx1998 mx2500 mx2750 pc105 precision_m \
++		presario propeller samsung4500 samsung4510 scorpius \
++		silvercrest sk1300 sk2500 sk7100 sp_inet targa_v811 \
++		thinkpad thinkpad60 tm2030USB-102 tm2030USB-106 \
+ 		toshiba_s3000 trust trustda trust_slimline unitekkb1925
+-- 
+GitLab
diff --git a/srcpkgs/xkeyboard-config/template b/srcpkgs/xkeyboard-config/template
index 35fbce369b42..85bfeb5c425a 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"

Re: [PR PATCH] [Merged]: xkeyboard-config: fix upstream issue.

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 679 bytes --]

There's a merged pull request on the void-packages repository

xkeyboard-config: fix upstream issue.
https://github.com/void-linux/void-packages/pull/38998

Description:
use backslashes instead of slashes for line continuation

This fixes 324
(https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/324)

<!-- 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