From patchwork Sat Sep 17 00:02:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 42680 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 7DB7827BBE9; Sat, 17 Sep 2022 01:03:10 +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 7DE1F27BBEA for ; Sat, 17 Sep 2022 01:03:09 +0100 (BST) Received: from localhost ([::1]:38224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oZLIa-0001Vs-MF for patchwork@mira.cbaines.net; Fri, 16 Sep 2022 20:03:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50296) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZLIU-0001Vj-Gv for guix-patches@gnu.org; Fri, 16 Sep 2022 20:03:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:45544) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oZLIU-0005Hn-9B for guix-patches@gnu.org; Fri, 16 Sep 2022 20:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oZLIT-00053M-WB for guix-patches@gnu.org; Fri, 16 Sep 2022 20:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57872] [PATCH core-updates] gnu: xkeyboard-config: Update to 2.36. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Sep 2022 00:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57872 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57872@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166337298019414 (code B ref -1); Sat, 17 Sep 2022 00:03:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Sep 2022 00:03:00 +0000 Received: from localhost ([127.0.0.1]:44622 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZLIR-000534-Kz for submit@debbugs.gnu.org; Fri, 16 Sep 2022 20:03:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:54352) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oZLIN-00052t-4S for submit@debbugs.gnu.org; Fri, 16 Sep 2022 20:02:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52950) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZLIM-0001Uq-Pm for guix-patches@gnu.org; Fri, 16 Sep 2022 20:02:54 -0400 Received: from linode.us-core.com ([2600:3c01::f03c:93ff:fe26:6229]:36386) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oZLIJ-0005Ej-Qx for guix-patches@gnu.org; Fri, 16 Sep 2022 20:02:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=nW1E8p2Hhd2DTRw bgNuCFcP9x8YtN63zl031+X4D5vs=; h=to:subject:date:from; d=lease-up.com; b=PxPodqrhqm7w64HPn4/iebO7V6G4+Y6FCZPxfVm/C7CwUWMIi2znMRcbPkVelEJs+9Eg Ue0KuthbJC+QUEG4qEEX7OGn+qM+MS2/u6GD5LNZf6wmN9zOJWJEM7tviV3PaEsB9lhi7H gUcCTJv62VILXmkmy/iAWimUt0Fa2/bAA= Received: by localhost (OpenSMTPD) with ESMTPSA id e01cdbf8 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for ; Sat, 17 Sep 2022 00:02:50 +0000 (UTC) Received: by mail-lf1-f42.google.com with SMTP id k10so37965017lfm.4 for ; Fri, 16 Sep 2022 17:02:47 -0700 (PDT) X-Gm-Message-State: ACrzQf2yCdCIcyWikUqu7HTctW7ZGzHhWNYX3H3I2pGsNUSiztLT6Hzt /kMue+ZHdwX5oz+LZntdLkZIITPdkzHrAqQGy2Q= X-Google-Smtp-Source: AMsMyM6btBIInu+xm0ujN8FgFHqrBmUDaK2I4Zegbpc9VL87m57sO3FLaBo1IE4A17o0z8iTJmwk8GSp/L8Ij82+Rak= X-Received: by 2002:a05:6512:2241:b0:479:6426:15af with SMTP id i1-20020a056512224100b00479642615afmr2418236lfu.631.1663372966287; Fri, 16 Sep 2022 17:02:46 -0700 (PDT) MIME-Version: 1.0 Date: Fri, 16 Sep 2022 17:02:09 -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 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 From 9e1de2ca8dfb2590b87f80a8d66898c45082cd1c Mon Sep 17 00:00:00 2001 From: Felix Lechner 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