[PATCH core-updates] gnu: xkeyboard-config: Update to 2.36.

  • Done
  • quality assurance status badge
Details
3 participants
  • Felix Lechner
  • Marius Bakke
  • Maxime Devos
Owner
unassigned
Submitted by
Felix Lechner
Severity
normal
F
F
Felix Lechner wrote on 17 Sep 2022 02:02
(address . guix-patches@gnu.org)
CAFHYt57Dmw4AZu042kHW8z18V8k7RgLLjpo6OTwA45DV7RUegg@mail.gmail.com
Hi,

This patch set updates the XKB layout definitions. Now upstream uses
the Meson build system.

Contains two diffs for easier review—one for substance, and another for style.

Belongs into core-updates as 3528 packages will rebuild. Thanks!

Kind regards
Felix Lechner
From caff76c1123deecd13a8e962836319033f39c471 Mon Sep 17 00:00:00 2001
From: Felix Lechner <felix.lechner@lease-up.com>
Date: Fri, 16 Sep 2022 10:36:36 -0700
Subject: [PATCH 1/2] gnu: xkeyboard-config: Update to 2.36.

* gnu/packages/xorg.scm (xkeyboard-config): Update to 2.36.
[source]: Retrieve xz tarball, bz2 is no longer distributed.
[source]: Break long url to satisfy guix lint.
[build-system]: Use meson-build-system.
[native-inputs]: Drop labels.
---
gnu/packages/xorg.scm | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)

Toggle diff (44 lines)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 4cde48aa1b..8b2c8a5733 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3880,25 +3880,25 @@ (define-public xkbutils
(define-public xkeyboard-config
(package
(name "xkeyboard-config")
- (version "2.34")
+ (version "2.36")
(source
(origin
(method url-fetch)
(uri (string-append
- "ftp://ftp.freedesktop.org/pub/xorg//individual/data/xkeyboard-config/xkeyboard-config-"
+ "ftp://ftp.freedesktop.org/pub/xorg/individual/data/"
+ name
+ "/"
+ name
+ "-"
version
- ".tar.bz2"))
+ ".tar.xz"))
(sha256
(base32
- "1kmq2ykwmh10sd6155gml4jhdxmvsll6xdg7zw86czpfhrvd48dk"))))
- (build-system gnu-build-system)
+ "158m7r6ga7w12ry35q6d0z6hilbpj9h7ilw56h55478n58lv26qz"))))
+ (build-system meson-build-system)
(inputs
(list libx11 xkbcomp-intermediate))
- (native-inputs
- `(("gettext" ,gettext-minimal)
- ("perl" ,perl)
- ("pkg-config" ,pkg-config)
- ("python" ,python)))
+ (native-inputs (list gettext-minimal perl pkg-config python))
(home-page "https://www.x.org/wiki/")
(synopsis "Xorg XKB configuration files")
(description

base-commit: 3ba8c2b5076cff874f12e2880632ec5e5507acff
--
2.36.1
From 9e1de2ca8dfb2590b87f80a8d66898c45082cd1c Mon Sep 17 00:00:00 2001
From: Felix Lechner <felix.lechner@lease-up.com>
Date: Fri, 16 Sep 2022 16:33:34 -0700
Subject: [PATCH 2/2] gnu: xkeyboard-config: Apply guix style.

---
gnu/packages/xorg.scm | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)

Toggle diff (44 lines)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 8b2c8a5733..6c5bea8669 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3881,23 +3881,21 @@ (define-public xkeyboard-config
(package
(name "xkeyboard-config")
(version "2.36")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "ftp://ftp.freedesktop.org/pub/xorg/individual/data/"
- name
- "/"
- name
- "-"
- version
- ".tar.xz"))
- (sha256
- (base32
- "158m7r6ga7w12ry35q6d0z6hilbpj9h7ilw56h55478n58lv26qz"))))
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "ftp://ftp.freedesktop.org/pub/xorg/individual/data/"
+ name
+ "/"
+ name
+ "-"
+ version
+ ".tar.xz"))
+ (sha256
+ (base32
+ "158m7r6ga7w12ry35q6d0z6hilbpj9h7ilw56h55478n58lv26qz"))))
(build-system meson-build-system)
- (inputs
- (list libx11 xkbcomp-intermediate))
+ (inputs (list libx11 xkbcomp-intermediate))
(native-inputs (list gettext-minimal perl pkg-config python))
(home-page "https://www.x.org/wiki/")
(synopsis "Xorg XKB configuration files")
--
2.36.1
M
M
Marius Bakke wrote on 18 Sep 2022 13:03
87v8plx7ur.fsf@gnu.org
Felix Lechner via Guix-patches via <guix-patches@gnu.org> skriver:

Toggle quote (7 lines)
> Hi,
>
> This patch set updates the XKB layout definitions. Now upstream uses
> the Meson build system.
>
> Contains two diffs for easier review—one for substance, and another for style.

Thanks! The patch did not apply cleanly on the 'core-updates' branch,
so I decided to 'guix style' the package at the same time to avoid
manually applying both patches.

While at it, I changed the source URI to use mirror://xorg and a more
conventional indentation style.

Toggle quote (2 lines)
> Belongs into core-updates as 3528 packages will rebuild. Thanks!

Pushed as cbe461f2d497554fd667429cd9db5ee990c7fadb !
-----BEGIN PGP SIGNATURE-----

iIUEARYKAC0WIQRNTknu3zbaMQ2ddzTocYulkRQQdwUCYyb6/A8cbWFyaXVzQGdu
dS5vcmcACgkQ6HGLpZEUEHci+wEA/HF9WX6b+Oi0rrxCHcUb7abO+Be4Bvi7cX8Y
Fcfe8ucBALZrx2byKTaxqO4VgPkNhyVP6CRrSBfoAeAPzh4OqxoD
=TCz1
-----END PGP SIGNATURE-----

Closed
F
F
Felix Lechner wrote on 18 Sep 2022 18:36
Furthermore, get sources from Github
(address . 57872@debbugs.gnu.org)
CAFHYt56DQezf9=VO=5nZb7kjMez8VWGjS2H+aqGodOLwJ5J-NA@mail.gmail.com
Let's use this combined commit instead.

Getting the source from Github avoids a pointer from 'guix lint' about
the sources not being archived on Software Heritage, and there is an
automatic updater.

Thanks!
From 1055d3ffac5b26645cedde3984d86e5c50cc3c84 Mon Sep 17 00:00:00 2001
From: Felix Lechner <felix.lechner@lease-up.com>
Date: Fri, 16 Sep 2022 10:36:36 -0700
Subject: [PATCH] gnu: xkeyboard-config: Update to 2.36.

* gnu/packages/xorg.scm (xkeyboard-config): Update to 2.36.
[source]: Switch to Github repo, which is archived on Software
Heritage, plus there is an automatic updater.
[build-system]: Use meson-build-system.
[inputs]: Indent for common style.
[native-inputs]: Drop labels.
---
gnu/packages/xorg.scm | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)

Toggle diff (47 lines)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 4cde48aa1b..3e021483b9 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -3880,25 +3880,19 @@ (define-public xkbutils
(define-public xkeyboard-config
(package
(name "xkeyboard-config")
- (version "2.34")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "ftp://ftp.freedesktop.org/pub/xorg//individual/data/xkeyboard-config/xkeyboard-config-"
- version
- ".tar.bz2"))
- (sha256
- (base32
- "1kmq2ykwmh10sd6155gml4jhdxmvsll6xdg7zw86czpfhrvd48dk"))))
- (build-system gnu-build-system)
- (inputs
- (list libx11 xkbcomp-intermediate))
- (native-inputs
- `(("gettext" ,gettext-minimal)
- ("perl" ,perl)
- ("pkg-config" ,pkg-config)
- ("python" ,python)))
+ (version "2.36")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/freedesktop/xkeyboard-config")
+ (commit (string-append name "-" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0qmfcvcg1jmzfk6xpcdg14gwy83hqw0k16z96p7f5np11xn2jyvy"))))
+ (build-system meson-build-system)
+ (inputs (list libx11 xkbcomp-intermediate))
+ (native-inputs (list gettext-minimal perl pkg-config python))
(home-page "https://www.x.org/wiki/")
(synopsis "Xorg XKB configuration files")
(description

base-commit: ce3b51a4c6bef22e35ca04a945917510627fc3a7
--
2.37.3
F
M
M
Maxime Devos wrote on 19 Sep 2022 15:43
14a6aefe-70b0-1202-7048-e75ac57d90cd@telenet.be
On 19-09-2022 00:31, Felix Lechner via Guix-patches via wrote:
Toggle quote (3 lines)
> Hi,
>
> My last comment was superseded by the closure of this related issue. [1]
As such, closing the issue (note for the future: you can do so yourself,
by sending to NNNNN-done@debbugs.gnu.org).
Greetings,
Maxime.
Attachment: OpenPGP_signature
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 57872@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 57872
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch