diff mbox series

[bug#57872,core-updates] gnu: xkeyboard-config: Update to 2.36.

Message ID CAFHYt57Dmw4AZu042kHW8z18V8k7RgLLjpo6OTwA45DV7RUegg@mail.gmail.com
State Accepted
Headers show
Series [bug#57872,core-updates] gnu: xkeyboard-config: Update to 2.36. | expand

Commit Message

Felix Lechner Sept. 17, 2022, 12:02 a.m. UTC 
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

Comments

Marius Bakke Sept. 18, 2022, 11:03 a.m. UTC | #1 
Felix Lechner via Guix-patches via <guix-patches@gnu.org> skriver:

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

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

Pushed as cbe461f2d497554fd667429cd9db5ee990c7fadb !
Felix Lechner Sept. 18, 2022, 10:31 p.m. UTC | #2 
Hi,

My last comment was superseded by the closure of this related issue. [1]

Kind regards
Felix Lechner

[1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=57916#13
M Sept. 19, 2022, 1:43 p.m. UTC | #3 
On 19-09-2022 00:31, Felix Lechner via Guix-patches via wrote:
> 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.
diff mbox series

Patch

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(-)

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