From patchwork Mon Aug 14 04:29:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52805 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 24CB527BBE9; Mon, 14 Aug 2023 05:34:21 +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,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 3E16D27BBE2 for ; Mon, 14 Aug 2023 05:34:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qVPHI-0006Yc-87; Mon, 14 Aug 2023 00:34:04 -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 1qVPHH-0006Y9-6J for guix-patches@gnu.org; Mon, 14 Aug 2023 00:34:03 -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 1qVPHG-0003oL-Rx for guix-patches@gnu.org; Mon, 14 Aug 2023 00:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qVPHG-0002u0-44; Mon, 14 Aug 2023 00:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65280] [PATCH 01/26] gnu: qt: Revert to use individual versions instead of %qt5-version. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, maxim.cournoyer@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Mon, 14 Aug 2023 04:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65280 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65280@debbugs.gnu.org Cc: Maxim Cournoyer , Andreas Enge , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Andreas Enge , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 65280-submit@debbugs.gnu.org id=B65280.169198763311107 (code B ref 65280); Mon, 14 Aug 2023 04:34:02 +0000 Received: (at 65280) by debbugs.gnu.org; 14 Aug 2023 04:33:53 +0000 Received: from localhost ([127.0.0.1]:60648 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVPH6-0002t3-PD for submit@debbugs.gnu.org; Mon, 14 Aug 2023 00:33:53 -0400 Received: from mail-qt1-x832.google.com ([2607:f8b0:4864:20::832]:52429) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVPH3-0002sf-Kk for 65280@debbugs.gnu.org; Mon, 14 Aug 2023 00:33:50 -0400 Received: by mail-qt1-x832.google.com with SMTP id d75a77b69052e-40a9918ec08so23653241cf.0 for <65280@debbugs.gnu.org>; Sun, 13 Aug 2023 21:33:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691987624; x=1692592424; 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=G3E4Wd6GFE0HnJNfW4qNTqrDjY+xFVO5UbYmC4HFnto=; b=UNnIPHi/fiXD4fsnNbE4EiWM/gt8wfLSQCQkuXE826ebf9SKoV2Usz9qNavcd8n0QA yY35sacCGLF0+NmPuRgnsZVoApIWivHFspJfubZ/pzekRwxcAyZHdkgvut4Lak8gC9LI LWqdBGJiChpL5KTgLw/8cGfWODY9XzE3XjApSXPTm/E9Wweoc+21t8qcLRbgbHjpg00D KYtuoTHmc6ULT5ad5+uoujNj286m/w3H7DySMWe/SZZCSnasGq5MABBdxZuUzC9rrsEW NSt7UBFYzjOnPjzsxQs6RboXZMg4yvhK1d4gHcaKRQ/sK23GB9xTaP8UMnt5K/OwjIQm xVZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691987624; x=1692592424; 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=G3E4Wd6GFE0HnJNfW4qNTqrDjY+xFVO5UbYmC4HFnto=; b=VlYQ4KoMlH+OYLObl5Atke8P1TTcccZCnNOTDVzMiBK4ZrNfDkpGOXevAaI5KSsKYc xXHjMVSDHV8Jjo2s/zBLZjufUfw3pYFxENNsy5bTw89XOYPEpDQvnFMDMXmoVvnoUIKG J+ZPxnOts24oZg5PMb4wwmzpUDoJPhBvqxvqQLxQyKfG92xy8w5/qZ3w+V9k87ywM/5N obF7GbTFnZZMB9WbI2eVoFjUBVPbHVEuA77elkj6L35ro5KXglH9K5j7qMTZ51TpB/91 wIHPm7isusJPvGmfpMwwnaqZwV3KqfZf08WIjD9K19S7kbmQuvWUT6Q0QPDwVqHFKJum hejg== X-Gm-Message-State: AOJu0Yx8b77II3OedB+CuwRZmJs1Mw2RR5GkChOkpDMA/iqXAGTcHdcS TV78ZwrSnLMP05Y5nil+CpZen2O0hMGnAA== X-Google-Smtp-Source: AGHT+IEUpCPhbPGEaj9CvMAVOhK7IEtNQ2DnSEKgGOrXirQyZxL2Vcn0GPd8tdExm9nX4buGxtNqfQ== X-Received: by 2002:ac8:5dd4:0:b0:410:2e51:d1e3 with SMTP id e20-20020ac85dd4000000b004102e51d1e3mr11751944qtx.11.1691987623755; Sun, 13 Aug 2023 21:33:43 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-124-111.b2b2c.ca. [205.233.124.111]) by smtp.gmail.com with ESMTPSA id f23-20020ac80157000000b0040541a8bd66sm2844492qtg.60.2023.08.13.21.33.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Aug 2023 21:33:43 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 14 Aug 2023 00:29:11 -0400 Message-ID: <5ccf2d80db7b5ac4d71238b9859a0da8ca5a069f.1691987375.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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 Rationale: using a variable for the version field currently hinders automatic upgrades via 'guix refresh': qtbase: no `version' field in source; skipping Automated with: sed 's/%qt5-version/"5.15.8"/g' -i gnu/packages/qt.scm --- gnu/packages/qt.scm | 66 ++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 34 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 2ca03b77d1..59c079934c 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -127,8 +127,6 @@ (define-module (gnu packages qt) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) -(define %qt-version "5.15.8") - (define-public qite (let ((commit "75fb3b6bbd5c6a5a8fc35e08a6efbfb588ed546a") (revision "74")) @@ -332,7 +330,7 @@ (define (qt-url component version) (define-public qtbase-5 (package (name "qtbase") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -888,7 +886,7 @@ (define-public qt3d-5 (package (inherit qtbase-5) (name "qt3d") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -980,7 +978,7 @@ (define-public qtsvg-5 (package (inherit qtbase-5) (name "qtsvg") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1079,7 +1077,7 @@ (define-public qtsvg (define-public qtimageformats (package (inherit qtsvg-5) (name "qtimageformats") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1106,7 +1104,7 @@ (define-public qtimageformats (define-public qtx11extras (package (inherit qtsvg-5) (name "qtx11extras") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1172,7 +1170,7 @@ (define-public qxlsx-qt5 (define-public qtxmlpatterns (package (inherit qtsvg-5) (name "qtxmlpatterns") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1201,7 +1199,7 @@ (define-public qtdeclarative-5 (package (inherit qtsvg-5) (name "qtdeclarative") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1379,7 +1377,7 @@ (define-public qtconnectivity (package (inherit qtsvg-5) (name "qtconnectivity") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1397,7 +1395,7 @@ (define-public qtconnectivity (define-public qtwebsockets-5 (package (inherit qtsvg-5) (name "qtwebsockets") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1460,7 +1458,7 @@ (define-public qtsensors (package (inherit qtsvg-5) (name "qtsensors") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1489,7 +1487,7 @@ (define-public qtmultimedia-5 (package (inherit qtsvg-5) (name "qtmultimedia") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1628,7 +1626,7 @@ (define-public qtwayland-5 (package (inherit qtsvg-5) (name "qtwayland") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1728,7 +1726,7 @@ (define-public qtserialport (package (inherit qtsvg-5) (name "qtserialport") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1759,7 +1757,7 @@ (define-public qtserialbus (package (inherit qtsvg-5) (name "qtserialbus") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1786,7 +1784,7 @@ (define-public qtserialbus (define-public qtwebchannel-5 (package (inherit qtsvg-5) (name "qtwebchannel") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1842,7 +1840,7 @@ (define-public qtwebglplugin (package (inherit qtsvg-5) (name "qtwebglplugin") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1871,7 +1869,7 @@ (define-public qtwebview (package (inherit qtsvg-5) (name "qtwebview") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1889,7 +1887,7 @@ (define-public qtlocation (package (inherit qtsvg-5) (name "qtlocation") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -1946,7 +1944,7 @@ (define-public qttools-5 (package (inherit qtsvg-5) (name "qttools") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -2028,7 +2026,7 @@ (define-public qtscript (package (inherit qtsvg-5) (name "qtscript") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -2047,7 +2045,7 @@ (define-public qtquickcontrols-5 (package (inherit qtsvg-5) (name "qtquickcontrols") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -2067,7 +2065,7 @@ (define-public qtquickcontrols2-5 (package (inherit qtsvg-5) (name "qtquickcontrols2") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -2094,7 +2092,7 @@ (define-public qtgraphicaleffects (package (inherit qtsvg-5) (name "qtgraphicaleffects") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -2117,7 +2115,7 @@ (define-public qtgamepad (package (inherit qtsvg-5) (name "qtgamepad") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -2143,7 +2141,7 @@ (define-public qtscxml (package (inherit qtsvg-5) (name "qtscxml") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -2201,7 +2199,7 @@ (define-public qtpurchasing (package (inherit qtsvg-5) (name "qtpurchasing") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -2217,7 +2215,7 @@ (define-public qtcharts (package (inherit qtsvg-5) (name "qtcharts") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -2246,7 +2244,7 @@ (define-public qtdatavis3d (package (inherit qtsvg-5) (name "qtdatavis3d") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -2268,7 +2266,7 @@ (define-public qtdatavis3d (define-public qtnetworkauth-5 (package (inherit qtsvg-5) (name "qtnetworkauth") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -2341,7 +2339,7 @@ (define-public qtspeech (package (inherit qtsvg-5) (name "qtspeech") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (qt-url name version)) @@ -2449,7 +2447,7 @@ (define-public qtwebengine-5 (package (inherit qtsvg-5) (name "qtwebengine") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) @@ -3991,7 +3989,7 @@ (define-public qcustomplot (define-public python-shiboken-2 (package (name "python-shiboken-2") - (version %qt-version) + (version "5.15.8") (source (origin (method url-fetch) (uri (string-append "https://download.qt.io/official_releases"