From patchwork Fri Aug 11 18:45:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52750 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 02BF527BBEA; Fri, 11 Aug 2023 19:50:41 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS 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 0C37727BBE2 for ; Fri, 11 Aug 2023 19:50:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUXDR-0003hj-TN; Fri, 11 Aug 2023 14:50:31 -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 1qUXD9-0003dK-FF for guix-patches@gnu.org; Fri, 11 Aug 2023 14:50:11 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qUXD8-0000Ai-OD; Fri, 11 Aug 2023 14:50:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qUXD7-0007st-D9; Fri, 11 Aug 2023 14:50:09 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65230] [PATCH 13/13] gnu-maintenance: Consider Qt source tarballs as "release files". Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Fri, 11 Aug 2023 18:50:09 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65230 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65230@debbugs.gnu.org Cc: Maxim Cournoyer , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by 65230-submit@debbugs.gnu.org id=B65230.169177980430191 (code B ref 65230); Fri, 11 Aug 2023 18:50:09 +0000 Received: (at 65230) by debbugs.gnu.org; 11 Aug 2023 18:50:04 +0000 Received: from localhost ([127.0.0.1]:48008 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUXD1-0007qh-A2 for submit@debbugs.gnu.org; Fri, 11 Aug 2023 14:50:04 -0400 Received: from mail-qt1-x832.google.com ([2607:f8b0:4864:20::832]:53515) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUXCu-0007p8-BI for 65230@debbugs.gnu.org; Fri, 11 Aug 2023 14:49:56 -0400 Received: by mail-qt1-x832.google.com with SMTP id d75a77b69052e-40fd6da0325so14734361cf.3 for <65230@debbugs.gnu.org>; Fri, 11 Aug 2023 11:49:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691779791; x=1692384591; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QaohA+dy69QkEjcD4sjHe5rrSSfIqHDitiK9AuY5DhU=; b=NuHQkioXxn9lQwzrmTjVQ8mNmvCmJg9VQxNd1iD4pJD2CfFVRwU/I3pCMttBvHTarv XKmNNanFGXxUGI7bFLXELJngxEYziPefS25fvQRa6gU5pw308kSc5gzO++LqVfGJnC4D aRYugSxv1t3RCuKgrZzrSzMHd2IBo7iuoyo23brv03o+7YBUfGpmjeBdw0KfdXu+k40X 8tn+oJyBIuxhxNq51n6mG5UsoKsVH0zFeY8xy5N53aG47xgpXYfv8/eGsK43i/kSW0D1 Pv+iEE2CAGbwvF+LESVwguUZrlJ9c3rx2tHO38Aix9yE7WcFRd2S1b1RkL5tJdyCom+7 Udvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691779791; x=1692384591; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QaohA+dy69QkEjcD4sjHe5rrSSfIqHDitiK9AuY5DhU=; b=Z5rhf+n2kaZ1a5TwjbFnU2GDzkp/qLvmWN/NBchFYKpKx4aA1lzfxdXKSaFmLkS3Wa PRFWXqKjDcrbZTk+Q6E/2Omf2dB3Urs30bLzzD865N2t2jp961RNjQflB0JHODEY6Lqd Td9K5VxtIOaO1KrKebyZ2Zj/UjZ57GS4+5IhI2Gw8Dww4MAvpggmiZBLxacC0p1Ojyf+ xvOUlG2B3Ek3Q/1hVril1ePby1j5k1YikU42DAcxw0wETxtN+sjJF7oGvClfG1in0EYz K9ZPAzXikA/pd5gAFQ8iqUJR79LcCKJHCfjz3XsZxVOw7bxcNgOLUgo7MA1/GbUgF0yi M4yg== X-Gm-Message-State: AOJu0YxxGk1hTJfzhqBSF7K14ESAIfkb9OFDkUYPAgWwNIvMmS0O3w8P ZHCc6Dkg3xmqGb910aXqVfpLhXhS39DIIQ== X-Google-Smtp-Source: AGHT+IGmAi45fqcOc+T+qUUknHsaVMxBqL/ueUQ4PMndaf6wt4zqBP7aXzwuGjAFRZL1xgmegjpJig== X-Received: by 2002:ac8:5744:0:b0:403:b103:248 with SMTP id 4-20020ac85744000000b00403b1030248mr3784644qtx.4.1691779790785; Fri, 11 Aug 2023 11:49:50 -0700 (PDT) Received: from localhost.localdomain (dsl-205-236-230-92.b2b2c.ca. [205.236.230.92]) by smtp.gmail.com with ESMTPSA id e29-20020ac8011d000000b00405553305casm1366398qtg.86.2023.08.11.11.49.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Aug 2023 11:49:50 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 11 Aug 2023 14:45:00 -0400 Message-ID: <1f62bdda36a196ae2c2be3b848f76cc00905e5a6.1691779500.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <4f0ffa940ca39719ffa9719a9593190620855769.1691779500.git.maxim.cournoyer@gmail.com> References: <4f0ffa940ca39719ffa9719a9593190620855769.1691779500.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/gnu-maintenance.scm (release-file?): Use positive logic in doc. Add a special case for Qt source archives. * tests/gnu-maintenance.scm ("release-file?"): Update test. --- guix/gnu-maintenance.scm | 14 +++++++++----- tests/gnu-maintenance.scm | 4 +++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 2574e0f827..1661ae3bf3 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -258,8 +258,7 @@ (define %alpha-tarball-rx (make-regexp "^.*-.*[0-9](-|~|\\.)?(alpha|beta|rc|RC|cvs|svn|git)-?[0-9\\.]*\\.tar\\.")) (define (release-file? project file) - "Return #f if FILE is not a release tarball of PROJECT, otherwise return -true." + "Return true if FILE is a release tarball of PROJECT." (and (not (member (file-extension file) '("sig" "sign" "asc" "md5sum" "sha1sum" "sha256sum"))) @@ -268,12 +267,17 @@ (define (release-file? project file) ;; Filter out unrelated files, like `guile-www-1.1.1'. ;; Case-insensitive for things like "TeXmacs" vs. "texmacs". ;; The "-src" suffix is for "freefont-src-20120503.tar.gz". + ;; The '-everywhere-src' suffix is for Qt modular components. (and=> (match:substring match 1) (lambda (name) (or (string-ci=? name project) - (string-ci=? name - (string-append project - "-src"))))))) + (string-ci=? name (string-append project "-src")) + (string-ci=? + name (string-append project "-everywhere-src")) + ;; For older Qt releases such as version 5. + (string-ci=? + name (string-append + project "-everywhere-opensource-src"))))))) (not (regexp-exec %alpha-tarball-rx file)) (let ((s (tarball-sans-extension file))) (regexp-exec %package-name-rx s)))) diff --git a/tests/gnu-maintenance.scm b/tests/gnu-maintenance.scm index 196a6f9092..5e9c006ee9 100644 --- a/tests/gnu-maintenance.scm +++ b/tests/gnu-maintenance.scm @@ -40,7 +40,9 @@ (define-module (test-gnu-maintenance) ("exiv2" "exiv2-0.27.3-Source.tar.gz") ("mpg321" "mpg321_0.3.2.orig.tar.gz") ("bvi" "bvi-1.4.1.src.tar.gz") - ("hostscope" "hostscope-V2.1.tgz"))) + ("hostscope" "hostscope-V2.1.tgz") + ("qtbase" "qtbase-everywhere-src-6.5.2.tar.xz") + ("qtbase" "qtbase-everywhere-opensource-src-5.15.10.tar.xz"))) (every (lambda (project+file) (not (apply release-file? project+file))) '(("guile" "guile-www-1.1.1.tar.gz")