From patchwork Sun Sep 18 16:36:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 42721 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 4ED3427BBEA; Sun, 18 Sep 2022 23:03:11 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 C2C1A27BBE9 for ; Sun, 18 Sep 2022 23:03:10 +0100 (BST) Received: from localhost ([::1]:60268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oa2NZ-0000RB-Vp for patchwork@mira.cbaines.net; Sun, 18 Sep 2022 18:03:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oa2NS-0000Qj-Ei for guix-patches@gnu.org; Sun, 18 Sep 2022 18:03:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52384) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oa2NS-0002FH-6i for guix-patches@gnu.org; Sun, 18 Sep 2022 18:03:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oa2NR-0005Vk-Rg for guix-patches@gnu.org; Sun, 18 Sep 2022 18:03:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57872] Furthermore, get sources from Github References: In-Reply-To: Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Sep 2022 22:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57872 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57872@debbugs.gnu.org Received: via spool by 57872-submit@debbugs.gnu.org id=B57872.166353852721122 (code B ref 57872); Sun, 18 Sep 2022 22:03:01 +0000 Received: (at 57872) by debbugs.gnu.org; 18 Sep 2022 22:02:07 +0000 Received: from localhost ([127.0.0.1]:51462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oa2MZ-0005Ub-5H for submit@debbugs.gnu.org; Sun, 18 Sep 2022 18:02:07 -0400 Received: from linode.us-core.com ([23.239.4.72]:59002) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oa2MU-0005UH-EO for 57872@debbugs.gnu.org; Sun, 18 Sep 2022 18:02:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=4IH/4jFD6QiEC9N 8bDBLJ3ddwM98CcxKYMvCLNn7DN0=; h=to:subject:date:from; d=lease-up.com; b=gdrs/I8J9DvaClOzReReugOb6e46J3AvVDv03FybQ6s0XGJLHANbuFKJ0b4UYh1/FRkR U0nYzq3y4AYysYn5OU5p/YJQub6W6YZ4mJ9R8J+SmLOVFTiKIObKD2lsBrF4CX6rYJyYH4 UMwlIyQUXST3LMyn20aDBe//ceKRsLuo8= Received: by localhost (OpenSMTPD) with ESMTPSA id e160fc9b (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <57872@debbugs.gnu.org>; Sun, 18 Sep 2022 22:02:00 +0000 (UTC) Received: by mail-ej1-f46.google.com with SMTP id y17so55507325ejo.6 for <57872@debbugs.gnu.org>; Sun, 18 Sep 2022 15:02:00 -0700 (PDT) X-Gm-Message-State: ACrzQf2yfLzysDiUivAhuTu4a+4J5bjJEdRZ/sYsePu+hx4e59fUdw/E ib5E0LuSaLc4tEW8KUvH9elyHnvg60IZ0UwSwNY= X-Google-Smtp-Source: AMsMyM5dYOodOlXkUem922PcEAwR36Mb0YhfIXrcUeTTB3d/WEZzgmyBC2JyKdJJuQZvYmG8SdDK11ou9MKsR7/9M58= X-Received: by 2002:ac2:4c46:0:b0:49d:c0ff:b172 with SMTP id o6-20020ac24c46000000b0049dc0ffb172mr4623049lfk.19.1663519015668; Sun, 18 Sep 2022 09:36:55 -0700 (PDT) MIME-Version: 1.0 Date: Sun, 18 Sep 2022 09:36:19 -0700 X-Gmail-Original-Message-ID: Message-ID: 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 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! From 1055d3ffac5b26645cedde3984d86e5c50cc3c84 Mon Sep 17 00:00:00 2001 From: Felix Lechner 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