[PATCH] gnu: xkbcomp: update to 1.4.3

DoneSubmitted by Michael Rohleder.
Details
4 participants
  • Leo Famulari
  • Mathieu Othacehe
  • Marius Bakke
  • Michael Rohleder
Owner
unassigned
Severity
normal
M
M
Michael Rohleder wrote on 24 Mar 2020 03:18
Download
(address . guix-patches@gnu.org)
87imiua42o.fsf@rohleder.de
Download
* gnu/packages/xorg.scm (xkbcomp): update to 1.4.3
Download
From 2976e6de897232296d1e16a3a799cd3ab20ea1db Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike@rohleder.de>
Date: Tue, 24 Mar 2020 03:13:33 +0100
Subject: [PATCH] * gnu/packages/xorg.scm (xkbcomp): update to 1.4.3

---
gnu/packages/xorg.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (32 lines)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index f4c7329e06..cde699bb51 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2019 Yoshinori Arai <kumagusu08@gmail.com>
 ;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
 ;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
+;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3825,7 +3826,7 @@ alternative implementations like XRandR or TwinView.")
 (define xkbcomp-intermediate ; used as input for xkeyboard-config
   (package
     (name "xkbcomp-intermediate")
-    (version "1.4.2")
+    (version "1.4.3")
     (source
       (origin
         (method url-fetch)
@@ -3835,7 +3836,7 @@ alternative implementations like XRandR or TwinView.")
                ".tar.bz2"))
         (sha256
          (base32
-          "0944rrkkf0dxp07vhh9yr4prslxhqyw63qmbjirbv1bypswvrn3d"))))
+          "0dflr250nlj6rrnv658f6dm8qx37sj0xfimc3ihay761kwb2q906"))))
     (build-system gnu-build-system)
     (inputs
       `(("xorgproto" ,xorgproto)
-- 
2.26.0
Download
--
GNU Emacs is a LISP operating system disguised as a word processor.
--Doug Mohney, in comp.arch
Download
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEdV4t5dDVhcUueCgwfHr/vv7yyyUFAl55bd8ACgkQfHr/vv7y
yyV/AwgArqASQUdbYuREXYI1IHBGbhCSXRyW0cV7myda5G2/iluXf3dS1dpQBl//
q72a8s4U5GvnA4h4HUoq5lNTy+egwwC9kC30PLCJ31f8JvBZuAasjocCjvdVh/9G
MSmcmrwl0h6fD1SnumnRYytbaId0VZEj9vetA9tCkh/Y7c12qFaz0XI3wpo8BrmP
QXrNXqxk6OO9Ui/+QyIrEhLe4Z2HaFW31Y7VJms9YMksU7/QGIeslVp/A7DUrKRu
2+lsSHvkhPsjzydFAb7yTFKAbl+qNXrcUVLV4kccgbjm6SES3t/ww1ovLdHOVde9
L2HWIpNuV5j44FN5KftDNmfikm9UKw==
=v8b6
-----END PGP SIGNATURE-----

M
M
Mathieu Othacehe wrote on 24 Mar 2020 11:47
Download
(address . guix-patches@gnu.org)(address . 40204@debbugs.gnu.org)
87h7yeni61.fsf@gmail.com
Download
Hello Michael,

While your patch LGTM, running:

Toggle snippet (3 lines)
guix refresh -l xkbcomp

you'll see that it triggers too much rebuilds to be pushed on
master. Could you rebase it on core-updates and see if it works?

Thanks,

Mathieu
L
L
Leo Famulari wrote on 24 Mar 2020 20:43
Download
(name . Mathieu Othacehe)(address . m.othacehe@gmail.com)(address . 40204@debbugs.gnu.org)
20200324194350.GB5689@jasmine.lan
Download
On Tue, Mar 24, 2020 at 11:47:34AM +0100, Mathieu Othacehe wrote:
Toggle quote (3 lines)
> you'll see that it triggers too much rebuilds to be pushed on
> master. Could you rebase it on core-updates and see if it works?

To clarify, the guidelines about how many rebuilds are okay for which
branch are in item 8 of the manual section Submitting Patches [0]:

------
300 dependent packages or less

master branch (non-disruptive changes).
between 300 and 1,200 dependent packages

staging branch (non-disruptive changes). This branch is intended to be merged in master every 3 weeks or so. Topical changes (e.g., an update of the GNOME stack) can instead go to a specific branch (say, gnome-updates).
more than 1,200 dependent packages

core-updates branch (may include major and potentially disruptive changes). This branch is intended to be merged in master every 2.5 months or so.
------

These are rough heuristics that help us manage big changes effectively.

[0]
https://guix.gnu.org/manual/en/html_node/Submitting-Patches.html
M
M
Michael Rohleder wrote on 26 Mar 2020 22:04
Download
(address . 40204@debbugs.gnu.org)
87zhc24yld.fsf@rohleder.de
Download
here is the update against core-updates.

I tested building only some of the dependencies and it seems to work in
a "./pre-inst-env guix environment --pure bash --ad-hoc xkbcomp" on
branch core-updates.
Download
From 11cc3b00ed62608a8a56edab4d1306d3a5e5b477 Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike@rohleder.de>
Date: Thu, 26 Mar 2020 21:23:43 +0100
Subject: [PATCH] * gnu/packages/xorg.scm (xkbcomp): update to 1.4.3

---
gnu/packages/xorg.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (32 lines)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 2ec151fd01..5db27fbff0 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -22,6 +22,7 @@
 ;;; Copyright © 2019 Yoshinori Arai <kumagusu08@gmail.com>
 ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2020 Leo Prikler <leo.prikler@student.tugraz.at>
+;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3746,7 +3747,7 @@ alternative implementations like XRandR or TwinView.")
 (define xkbcomp-intermediate ; used as input for xkeyboard-config
   (package
     (name "xkbcomp-intermediate")
-    (version "1.4.2")
+    (version "1.4.3")
     (source
       (origin
         (method url-fetch)
@@ -3756,7 +3757,7 @@ alternative implementations like XRandR or TwinView.")
                ".tar.bz2"))
         (sha256
          (base32
-          "0944rrkkf0dxp07vhh9yr4prslxhqyw63qmbjirbv1bypswvrn3d"))))
+          "0dflr250nlj6rrnv658f6dm8qx37sj0xfimc3ihay761kwb2q906"))))
     (build-system gnu-build-system)
     (inputs
       `(("xorgproto" ,xorgproto)
-- 
2.26.0
Download
--
win-nt from the people who invented edlin
Download
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEdV4t5dDVhcUueCgwfHr/vv7yyyUFAl59GN8ACgkQfHr/vv7y
yyVEQwf+Kd+zgDfi+CTy3zEZS2uAfS4bEcOW4ScCjEwz9JaKnQ8WJf6Pj9Cp6Sju
4GHwy3uklqB4zhgJ4zzlhrECPxBeFu7qaqeY+y8FlXNKQjOhBB2g9d5RLf2DTXOu
0k0/G3icFcq+cbF+/V64b7olOkiFKl6N9RXu3v+S6waWxmaRb8GEL5dBMnS/dFk/
bNYg6HrbHF+bAgfXHOqIbwmmTMmkkSvaWXMZsCcnZ/T3IzlQaNkHzxz0EW7JC0zZ
ZN/Ux99TdyFZag4u3xbHhWIHGUA8rw+d/7uY5yNgm1PsIiI52kUeLL0qfe8jzhdq
CG+xxl809ygF9VBq/F+gpZajKg1LfA==
=qZ4Q
-----END PGP SIGNATURE-----

M
M
Marius Bakke wrote on 26 Mar 2020 22:40
Download
87ftduztec.fsf@devup.no
Download
Michael Rohleder <mike@rohleder.de> writes:

Toggle quote (2 lines)
> * gnu/packages/xorg.scm (xkbcomp): update to 1.4.3

Thanks! Pushed to the 'core-updates' branch as
b12acffbd03c025b1e849f7a93d5edd47682a8ce.
Download
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl59IWsACgkQoqBt8qM6
VPpCoAgAvx6B2x6Xy3P0oxyX5jn0HMnIaIVHnzt/+tLd5zh5sXZgdWHsNe1gF+pp
yfKu2OQhcI0knMMd0kXgNbqyvy5P488OMJ0kTHmeLDKQbgcVQSvM1EmKd219ZFz1
CFStDgFQDIrXebRp39GGmuxekogmQ9LoEvSui6vV2DScHTUpn5EV3Tfmnk3iLoNh
k/BIg+gmlRxssdKM7fwg0zdYMoC/MlcxMpZPczpd6HdgTzu6+wCVGdGKA6yUgXJx
7rfFM9o8ygkSQ4WNwTiv2bletHc+ezcwpPmcOE14rAlyewn2K4ffR8UqzClVpD9C
by2RxTwfAflxH/Uw8EcY0HK+q+kjyw==
=Stnn
-----END PGP SIGNATURE-----

Closed
?
Your comment

This issue is archived.

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