From patchwork Mon Aug 21 18:06:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 53082 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 B7B4C27BBE2; Mon, 21 Aug 2023 19:12:05 +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 8796627BBE9 for ; Mon, 21 Aug 2023 19:12:04 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qY9N6-0005qg-JD; Mon, 21 Aug 2023 14:11:24 -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 1qY9Ls-0005NP-QI for guix-patches@gnu.org; Mon, 21 Aug 2023 14:10:13 -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 1qY9Lo-000500-W8; Mon, 21 Aug 2023 14:10:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qY9Lp-0007Wn-EK; Mon, 21 Aug 2023 14:10:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65230] [PATCH v3 10/10] 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: Mon, 21 Aug 2023 18:10:05 +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.169264136128762 (code B ref 65230); Mon, 21 Aug 2023 18:10:05 +0000 Received: (at 65230) by debbugs.gnu.org; 21 Aug 2023 18:09:21 +0000 Received: from localhost ([127.0.0.1]:57696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qY9L6-0007Tl-Ub for submit@debbugs.gnu.org; Mon, 21 Aug 2023 14:09:21 -0400 Received: from mail-qt1-x82a.google.com ([2607:f8b0:4864:20::82a]:60577) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qY9L2-0007Sq-Ic for 65230@debbugs.gnu.org; Mon, 21 Aug 2023 14:09:16 -0400 Received: by mail-qt1-x82a.google.com with SMTP id d75a77b69052e-4039f7e1d3aso24862641cf.0 for <65230@debbugs.gnu.org>; Mon, 21 Aug 2023 11:09:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692641348; x=1693246148; 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=KWXYeNMQQXuJ4AlJoauOKszS8fSMwi4+qwJkA4epQvM=; b=aRZXM+fQIiOpxbUHfCNcXTknGzjwMDWpZCsRjhQiIslVYElrFwHWPsHrNgZt+Un8is mnnvuF34fpoRO3dF5MqZ9Tzz3MgTEZ6TMzXjLGlulaCjyHwNrO06j32m1R03M4zXFHZ8 5O92izWkY3zA5zCQvy3asUPXut0LFjjFcniP4rp/7ABVEpmctsZgBrweZU27DuczjPa/ n/RK/AVnJc2I85cldyf+GfCJyaTHdrSX3mtxfAzf2G5pn0AtFnhwBbhcG5oFxb2ojf60 cIdmcvGrlNLeF/tKZBmk7lTpwL+6Eg5mD48lpJQ4aLqUxXNT5cTwMdC1mNB7QiGfzqLX 9bug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692641348; x=1693246148; 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=KWXYeNMQQXuJ4AlJoauOKszS8fSMwi4+qwJkA4epQvM=; b=I11JYYrxA/EQQqzxLEgUyN53Fu5OzWxYRKMs2Y1jZC4XgAOweDWjDb0kk80/236Ygw vXZSJEkr2ORHp7ZwBz3eAJvOsGgBV/SVmV/VW9vECcnOHlVaHyTmDvis4JydSNhBV7b4 gQ2bvXtfhbE2kS2SzzVOPo04yUKFbKCwb7Ln3DfXQKr8VhsNfJebP/hPaMBAIAHW2Sj/ sFdK6P7GJUIxiUELx76WJeFKPJxnUOlRIbHhb3Z/F/18FJPBpzldtGbXahb0vXXWPkg/ huJje4eeVKzmCVaipyOeOGhDLYlm/apgTGu/2UWuM9R7n2a9JkGquGQ/UQik+wXEgoDW DZ/g== X-Gm-Message-State: AOJu0YzqNxbO0uxumnOM0jRzaPuYjVVTcd1Ha3zfRjmT7itKF0dBTAjE 6tDu93c78MMe+GPe8Fo13B248jQsF50= X-Google-Smtp-Source: AGHT+IH0E9v85g9SjsXZ0Z/7H2++Q9nTFMMb9ds0aM0XpKH7SfSGYSxSErOTh7XIwVqEh5lelPfhtw== X-Received: by 2002:ac8:5a8f:0:b0:406:cadc:ff35 with SMTP id c15-20020ac85a8f000000b00406cadcff35mr8016812qtc.54.1692641348477; Mon, 21 Aug 2023 11:09:08 -0700 (PDT) Received: from localhost.localdomain (dsl-10-148-105.b2b2c.ca. [72.10.148.105]) by smtp.gmail.com with ESMTPSA id t16-20020a05620a035000b00767303dc070sm2635523qkm.8.2023.08.21.11.09.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 11:09:08 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 21 Aug 2023 14:06:14 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <5465490ad96f27fecbb69f9bd6f1607d29af6c23.1692641173.git.maxim.cournoyer@gmail.com> References: <5465490ad96f27fecbb69f9bd6f1607d29af6c23.1692641173.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. --- Changes in v3: - Move a couple Qt-specific commits to the qt-updates branch Changes in v2: - Also special case release file of Qt Creator guix/gnu-maintenance.scm | 18 +++++++++++++----- tests/gnu-maintenance.scm | 5 ++++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 2574e0f827..04827a9f27 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,21 @@ (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")) + ;; For Qt Creator. + (string-ci=? + name (string-append + project "-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..61ae295b96 100644 --- a/tests/gnu-maintenance.scm +++ b/tests/gnu-maintenance.scm @@ -40,7 +40,10 @@ (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") + ("qt-creator" "qt-creator-opensource-src-11.0.1.tar.xz"))) (every (lambda (project+file) (not (apply release-file? project+file))) '(("guile" "guile-www-1.1.1.tar.gz")