From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id SDxeGCX7OWQ8OgAASxT56A (envelope-from ) for ; Sat, 15 Apr 2023 03:17:25 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id YKU3GCX7OWSMIwAAauVa8A (envelope-from ) for ; Sat, 15 Apr 2023 03:17:25 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id EDC261164D for ; Sat, 15 Apr 2023 03:17:24 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pnUXJ-0002aj-Rj; Fri, 14 Apr 2023 21:17:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pnUXH-0002aN-70 for bug-guix@gnu.org; Fri, 14 Apr 2023 21:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pnUXG-0005Uj-UZ for bug-guix@gnu.org; Fri, 14 Apr 2023 21:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pnUXG-00029o-Bo for bug-guix@gnu.org; Fri, 14 Apr 2023 21:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#62820: [PATCH] gnu: xkeyboard-config: Update to 2.37. (Closes: #62820, #58402) References: <87sfd3a2yb.fsf@psyduck.jhoto.kublai.com> In-Reply-To: <87sfd3a2yb.fsf@psyduck.jhoto.kublai.com> Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sat, 15 Apr 2023 01:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62820 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 62820@debbugs.gnu.org Cc: Felix Lechner , Brian Cully Received: via spool by 62820-submit@debbugs.gnu.org id=B62820.16815213718233 (code B ref 62820); Sat, 15 Apr 2023 01:17:02 +0000 Received: (at 62820) by debbugs.gnu.org; 15 Apr 2023 01:16:11 +0000 Received: from localhost ([127.0.0.1]:47961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnUWQ-00028j-Qh for submit@debbugs.gnu.org; Fri, 14 Apr 2023 21:16:11 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]:55760) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pnUWL-00028W-L8 for 62820@debbugs.gnu.org; Fri, 14 Apr 2023 21:16:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=ZyEk7SFLmU+CAV7 2a38TJGnxbk+gl+Yt2hv1unexo4E=; h=date:subject:cc:to:from; d=lease-up.com; b=n+758KhYuI72QUuQlah8IONsKoHEjIMY2benv3aTg0/WTsAegmRy eNBnoCMhBGIUMCvlyT/M2FOUP/iExAXiyJ0Y/mhdti8KTPp4hnu6pwQB8bO6o6+oZ6Ik4H RcTac3fPQn2fh87xZeIXAol80wzq2b3jewlujJXHn9jEoGvH8= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id 6dcae2aa (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 15 Apr 2023 01:16:03 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id a2db7e4d; Sat, 15 Apr 2023 01:16:03 +0000 (UTC) Date: Fri, 14 Apr 2023 18:15:49 -0700 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Felix Lechner From: Felix Lechner via Bug reports for GNU Guix Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1681521445; a=rsa-sha256; cv=none; b=tjyE+aRiKq3uhgJPO6U7YKSGehZ5XtV8JqaRCjw2PdHnfIaJ8knqlUwoJR1Zswx2k9WpiA dvdojh72b1BDHbBqDKHWbTSjnSbBwMv58fW2jmb5hJD6y/J/ivvL/Hyqk7fCKauZabwjKO d4U4n3X7mkRoDa2dAxTNnYFYCjZqpTpl3qeILMBtT04TPxWtZNkx2G+9iUQY0RRe8/7CS/ 9qqoSyiYEBa5piEIbkIUQMQEnAiwzZ672YT1rNFF7ieJhS2j4znnvV9HMDHN5+oZYLAlXn bJCNlfUsRcw17YDT/F/D+eTen9zsmXOZB1UeVd1mhpx6v+ibo++ALtUMJcjSFg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=n+758KhY; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1681521445; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=TmxeiBNkzkBjyvROEOi0sQVEK9pJYQJ90LfGmBEjoMs=; b=Lf7vJb2CHe5kF4aFYiIYUykYJyWHThrfI4yXvTTWNgwEOUd8p/+paISSe7odUB4ZGcdZtV Qt1IgdfKkTYk2eK4sOCWnvLoLwtDReTwcY6FR9GjBHm6KsDldowyUHgO5uFJMIBtVMG1To SriZmVlig+7VXv1eyWaqVYH7IfZPtASi1j/GpDgeH4aKbqjByOgULFTOR26NjZV8bMXWvB 0Rge5f0C2h14CZUqQsC8Fx+H23DYREv+IuZb3NgyBtphoTf4dQ36toxbQwuwXDcYm3VsMq VSryNH1cSeUKHcaHULyBt5FsSbu8K9jcETGI9wiivvDhRtvbaDNkCT7GrAHZoQ== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -3.22 X-Spam-Score: -3.22 X-Migadu-Queue-Id: EDC261164D Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lease-up.com header.s=2017 header.b=n+758KhY; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org X-TUID: NlWxF4nXW7by For legacy reasons, Guix used to offer several version of Meson, but in a recent core-updates branch all versions prior to 1.1.0 had been retired. [1] By comparison, the most recent version available in the master branch is 0.63.2, which was released just seven months before meson 1.1.0 was cut. [2] Meanwhile, some software may not have been ready for that transition. I have not been able to confirm the suspicion for version 2.36 of xkeyboard-config via online searches or the respective Git log, but updating xkeyboard-config to 2.37 solved what has been reported as the last remaining issue in core-updates [3] for me locally. Here is the same excerpt quoted in Issue#62820 but without the offending forward slashes for multi-line continuations. It was produced after this patch was applied to commit 3bacd3c7 of core-updates: ! $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 \ toshiba_s3000 trust trustda trust_slimline unitekkb1925 The data above was extracted from the file /gnu/store/5j9synbgzbdjjf2gkyfy9mj83d213qkh-xkeyboard-config-2.37/share/X11/xkb/rules/base That path contains an extra component 'xkb' relative to the location identified in Issue#62820 but I believe the path 'share/X11/rules/base' there was misquoted accidentally. For the sake of completeness, I'll also mention that xkeyboard-config was likewise updated in core-updates. The version originally went from 2.34 to 2.36 [4] before being updated to 2.37 herein. [1] https://git.savannah.gnu.org/cgit/guix.git/commit/?id=311255adc0d1c3b3aa0f6bed5af58e718f0607b2 [2] https://github.com/mesonbuild/meson/tags [3] https://lists.gnu.org/archive/html/guix-devel/2023-04/msg00214.html [4] https://issues.guix.gnu.org/57872 * gnu/packages/xorg.scm (xkeyboard-config): Update to 2.37. --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index c510547559..94a59bd205 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3709,7 +3709,7 @@ (define-public xkbutils (define-public xkeyboard-config (package (name "xkeyboard-config") - (version "2.36") + (version "2.37") (source (origin (method url-fetch) (uri (string-append @@ -3717,7 +3717,7 @@ (define-public xkeyboard-config "xkeyboard-config-" version ".tar.xz")) (sha256 (base32 - "158m7r6ga7w12ry35q6d0z6hilbpj9h7ilw56h55478n58lv26qz")))) + "0v4clrxrjygpy5arnb2x3ksvsah5mdprsarhqzbi0qjbmjjq64zb")))) (build-system meson-build-system) (inputs (list libx11 xkbcomp-intermediate)) (native-inputs (list gettext-minimal libxslt perl pkg-config python)) base-commit: 3bacd3c76a58ebe70f98be654f09cbd4166093ab -- 2.39.2