From patchwork Tue Sep 20 19:23:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 42788 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A4AE427BBEA; Wed, 21 Sep 2022 00:22:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1596627BBE9 for ; Wed, 21 Sep 2022 00:22:34 +0100 (BST) Received: from localhost ([::1]:46430 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oamZV-0003wC-6f for patchwork@mira.cbaines.net; Tue, 20 Sep 2022 19:22:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56046) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaire-0002CF-RN for guix-patches@gnu.org; Tue, 20 Sep 2022 15:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60653) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaire-0006HC-IS for guix-patches@gnu.org; Tue, 20 Sep 2022 15:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaire-0008Ig-4I for guix-patches@gnu.org; Tue, 20 Sep 2022 15:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57960] [PATCH core-updates] gnu: libxkbcommon: Switch to gexp; adjust style. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Sep 2022 19:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57960 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57960@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166370188031872 (code B ref -1); Tue, 20 Sep 2022 19:25:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 Sep 2022 19:24:40 +0000 Received: from localhost ([127.0.0.1]:59731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oairI-0008I0-49 for submit@debbugs.gnu.org; Tue, 20 Sep 2022 15:24:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:46226) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oairE-0008Hr-K2 for submit@debbugs.gnu.org; Tue, 20 Sep 2022 15:24:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oair3-0001VY-Ss for guix-patches@gnu.org; Tue, 20 Sep 2022 15:24:32 -0400 Received: from linode.us-core.com ([2600:3c01::f03c:93ff:fe26:6229]:60684) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaiqv-0006CP-SB for guix-patches@gnu.org; Tue, 20 Sep 2022 15:24:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=C5SSe9VxJlOsmqs JQNjCJGc9qWn/Hbnnp7QnFcU50D0=; h=to:subject:date:from; d=lease-up.com; b=k0afRPn5t63w3KPKM2ksytgaHnUyf2LHP8wxubYbuakUI+HeWF21fS+6qm9w2QB7qQm3 RgNvwBtafmFcvN9o/Xgmjsi/FV57hJyMtDVA8DS/LysBnoI93SXuvEMJ47Ru/z7CmAJ6w7 jQBP0K1VWra1cKHYkz4OKoRneU7IS8BHM= Received: by localhost (OpenSMTPD) with ESMTPSA id 2307f72a (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for ; Tue, 20 Sep 2022 19:24:13 +0000 (UTC) Received: by mail-lj1-f180.google.com with SMTP id s10so4260421ljp.5 for ; Tue, 20 Sep 2022 12:24:13 -0700 (PDT) X-Gm-Message-State: ACrzQf14UwKY2W+6QLrjgbiDZKTthdkBemwomIcj8DrwS0BBpVJMkjwb lGJmuKi2ig3HMaejR6qJeGnHLd7k2PYFcF2GKXc= X-Google-Smtp-Source: AMsMyM4JcKYEeJnja7n6euXWtg1hQ4TV8AMPU5Jl96wztBhkuGShtnZ5CyT3jFgKzZAj9b3FDDqaeZQ1TnWEBoLzVkw= X-Received: by 2002:a2e:bc09:0:b0:26b:fb61:dd22 with SMTP id b9-20020a2ebc09000000b0026bfb61dd22mr7754387ljf.1.1663701851600; Tue, 20 Sep 2022 12:24:11 -0700 (PDT) MIME-Version: 1.0 Date: Tue, 20 Sep 2022 12:23:34 -0700 X-Gmail-Original-Message-ID: Message-ID: Received-SPF: pass client-ip=2600:3c01::f03c:93ff:fe26:6229; envelope-from=felix.lechner@lease-up.com; helo=linode.us-core.com X-Spam_score_int: 16 X-Spam_score: 1.6 X-Spam_bar: + X-Spam_report: (1.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_SBL_CSS=3.335, RCVD_IN_XBL=0.375, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches X-Patchwork-Original-From: Felix Lechner via Guix-patches via From: Felix Lechner X-getmail-retrieved-from-mailbox: Patches Hi, This modernizes the package declaration for libxkbcommon by using G-expressions. Also, input folders are found via their expected relative paths (i.e. the modern way) instead of the input label. The latter was an issue when the official xkeyboard-config was replaced with a customized package holding additional keyboard layouts. Ultimately reaches 3435 packages and thus belongs into core-updates. Kind regards Felix Lechner From 81ffbadce5c31f447fce7970908a51d483753b14 Mon Sep 17 00:00:00 2001 From: Felix Lechner Date: Tue, 20 Sep 2022 09:47:35 -0700 Subject: [PATCH] gnu: libxkbcommon: Switch to gexp; adjust style. * gnu/packages/xdisorg.scm (libxkbcommon): Switch to gexp; adjust style throughout. [arguments]: Avoid hardcoding inputs; locate inputs via relative paths, i.e. the modern way. --- gnu/packages/xdisorg.scm | 47 ++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 02e04ccf88..aeacdf8743 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -488,33 +488,34 @@ (define-public libxkbcommon (name "libxkbcommon") (version "1.3.0") (source (origin - (method url-fetch) - (uri (string-append "https://xkbcommon.org/download/libxkbcommon-" - version ".tar.xz")) - (sha256 - (base32 - "0ysynzzgzd9jdrh1321r4bgw8wd5zljrlyn5y1a31g39xacf02bv")))) + (method url-fetch) + (uri (string-append + "https://xkbcommon.org/download/libxkbcommon-" version + ".tar.xz")) + (sha256 + (base32 + "0ysynzzgzd9jdrh1321r4bgw8wd5zljrlyn5y1a31g39xacf02bv")))) (build-system meson-build-system) - (inputs - (list libx11 - libxcb - libxml2 - wayland - wayland-protocols - xkeyboard-config)) - (native-inputs - (list bison doxygen pkg-config python)) + (inputs (list libx11 + libxcb + libxml2 + wayland + wayland-protocols + xkeyboard-config)) + (native-inputs (list bison doxygen pkg-config python)) (arguments - `(#:configure-flags - (list (string-append "-Dxkb-config-root=" - (assoc-ref %build-inputs "xkeyboard-config") - "/share/X11/xkb") - (string-append "-Dx-locale-root=" - (assoc-ref %build-inputs "libx11") - "/share/X11/locale")))) + (list #:configure-flags #~(list (string-append "-Dxkb-config-root=" + (search-input-directory + %build-inputs + "share/X11/xkb")) + (string-append "-Dx-locale-root=" + (search-input-directory + %build-inputs + "share/X11/locale"))))) (home-page "https://xkbcommon.org/") (synopsis "Library to handle keyboard descriptions") - (description "Xkbcommon is a library to handle keyboard descriptions, + (description + "Xkbcommon is a library to handle keyboard descriptions, including loading them from disk, parsing them and handling their state. It is mainly meant for client toolkits, window systems, and other system applications; currently that includes Wayland, kmscon, GTK+, Qt, base-commit: 28918b4ff8d2c297d1f1fb84eebdca9fc2dc9303 -- 2.37.3