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

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

[Felix Lechner via Guix-patches via]

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

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

[-- Attachment #2: 0001-gnu-xkeyboard-config-Update-to-2.36.patch --]
[-- Type: text/x-patch, Size: 1997 bytes --]

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

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


[-- Attachment #3: 0002-gnu-xkeyboard-config-Apply-guix-style.patch --]
[-- Type: text/x-patch, Size: 1763 bytes --]

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

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

[Marius Bakke]

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

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 !

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]

[bug#57872] Furthermore, get sources from Github

[Felix Lechner via Guix-patches via]

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

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!

[-- Attachment #2: 0001-gnu-xkeyboard-config-Update-to-2.36.patch --]
[-- Type: text/x-patch, Size: 2255 bytes --]

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

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

[bug#57872] Never mind

[Felix Lechner via Guix-patches via]

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

[bug#57872] Never mind

[Maxime Devos]

[-- Attachment #1.1.1: Type: text/plain, Size: 297 bytes --]


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.

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]