From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id SPCAN6W+3GSYvwAASxT56A (envelope-from ) for ; Wed, 16 Aug 2023 14:18:45 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id OB0pN6W+3GRNUwAAauVa8A (envelope-from ) for ; Wed, 16 Aug 2023 14:18:45 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9602A49918 for ; Wed, 16 Aug 2023 14:18:45 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=G6afjNpk; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692188325; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=p9oJwh7+TzIQGnQKZhGXsxkLAVy1ypB9sG8PKPf8rqQ=; b=oeKyTPZSGhbYhkS6zsf+xhvR9C/wwydgfF6N4t0cugjywBq5+V0gBh5kqxaAzDsiEx+dOC 0OM0Mc5KBb3ddjpi6b86ZGcayzRIL6nr8mqrQ7gr1Nrf6at2n03xL5cYD+Lt7AaauC3aMZ fA3uI7SSAnp9MO7Y3qleUquWrXVN+hJHwA28O5lYODbfiK91eQyPvW2qG1Un1n9jabjQ2t ppYlU7VXVNODzgCs49hEf5xtdo/wLqtLaHhMMjiObw8++gURpqoa2e5ilgU7EkDNyVLEgx PHp7zVS6BGXd1bdWgzbnVPjFwkm9mLmynMGLB4mgEiCRYefVwmZL528sdkM6mg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=G6afjNpk; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692188325; a=rsa-sha256; cv=none; b=py4TGfGMXAwMSRsDBKwdz4lzYyV8aCccbEzVt2EDJzDD/HeAclXeEE+N8AmbC8mBPzhYOw ofxozxpHyG//XGBMVhHg0aFaxJEocSIWlV/EDKl1WyRL8c9A8clM6T9lUa5fKjFaWA0kqj 1v9yLE4ylmKC+v8C8uATnIqRU8F8i/dNaqhalRgOb7fOAXwhCp8pVFrKNk2pcwHDAfel8D oj9WepyV3Z5MRUYY52PBUAvQjNN6EzuXC48w2QvsRfobfhOOBl/UqUzez0sJdIs9mgoDYW WqfA9516C20j2ZTD1k9bVVu1C2UEY4ld+s/THmB1HCYZCGjRnESMPvrIJaiU6w== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWFP2-0007Lw-Gn; Wed, 16 Aug 2023 08:13:32 -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 1qWFOu-00078e-OC for guix-patches@gnu.org; Wed, 16 Aug 2023 08:13:25 -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 1qWFOb-0002Ld-9n for guix-patches@gnu.org; Wed, 16 Aug 2023 08:13:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qWFOa-0005Qw-4z; Wed, 16 Aug 2023 08:13:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65280] [PATCH v2 01/59] 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: Wed, 16 Aug 2023 12:13:04 +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?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Andreas Enge , Maxim Cournoyer , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 65280-submit@debbugs.gnu.org id=B65280.169218795520427 (code B ref 65280); Wed, 16 Aug 2023 12:13:04 +0000 Received: (at 65280) by debbugs.gnu.org; 16 Aug 2023 12:12:35 +0000 Received: from localhost ([127.0.0.1]:39018 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWFO6-0005JA-AX for submit@debbugs.gnu.org; Wed, 16 Aug 2023 08:12:35 -0400 Received: from mail-qk1-x732.google.com ([2607:f8b0:4864:20::732]:60852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWFO0-0005Hk-Mq for 65280@debbugs.gnu.org; Wed, 16 Aug 2023 08:12:31 -0400 Received: by mail-qk1-x732.google.com with SMTP id af79cd13be357-76c8dd2ce79so564252385a.1 for <65280@debbugs.gnu.org>; Wed, 16 Aug 2023 05:12:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692187943; x=1692792743; 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=p9oJwh7+TzIQGnQKZhGXsxkLAVy1ypB9sG8PKPf8rqQ=; b=G6afjNpkGUuego/jUvizceYg1UAFs3S2J4gIbjh41/gf5ZLS3+rNjgJGyGZq4+ZHI9 RJA4DFG3Pshw+1yXvM/EdyWcxqnGzNe0Fkapi71sZCCvNrKXJdmKsEtkI2AD73FrSbhL gcyfI7tFg4hP8f9wALD1jSPxGHy1QyiBPB//8nnNDd1mP4EIua0cmZgbG5GqRchPlFnB RGtjnLxeQA+7VtMBD4o3/uNj2NLZouD7XTBbQ/siOS6BsoLp1M1YQ0FCOWDqhBdfqYzc HTTCi2AMRku3EYE6V89oQyDrXk0Gq0Gq6jQNB4J+eb3qkcPfWh/z6gIW1NvZSboW0KuE 3oRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692187943; x=1692792743; 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=p9oJwh7+TzIQGnQKZhGXsxkLAVy1ypB9sG8PKPf8rqQ=; b=hu8CWcIsfGpKM3mNI02OIKkP+YlzDLSe/8xDnuz66yq4w9cKiuZT0pYqHJn6yY/r4D NjFFvOzhlhiSTfl7Kae9OoVGpoYsWx2FXqgYQMoQvuxsAjSr73eG03EgHRQ0l4s8OVtJ jOCQnII7xWHUfgNXrbMjiaV9RdkhZaW13Ndz1NDDjdXKMiHpr647QSFu+sCD45Jr5UGl AeKpHZOBomfbnQC2hjLwv36+ZPN1kZ0D4qRSTYkEXJdv3x23L3wzTYzudbly9bswRsUM uPeqBOKnVyAQ5f/z/CN/4oJCXOuXE7Ak/yeUH1sjdAVsad2vX0i6czj8H1e0YB3MJx4f JzFA== X-Gm-Message-State: AOJu0YznBYf348rPYOJaF+h9LkTvxP1U6mVhvZm8227H580WKaIJh9k9 xk1Ix8uHAU6cwX0VpwhoP0jLZu8NS8M= X-Google-Smtp-Source: AGHT+IExVS/fNvr+Gerhd+YhY+vFALbyvgVppXby0Q1t+rCJAXc7T2gRFTp+PB2+StLvZ2ZjTv6xiw== X-Received: by 2002:a0c:f24a:0:b0:647:2810:abae with SMTP id z10-20020a0cf24a000000b006472810abaemr1702668qvl.3.1692187942965; Wed, 16 Aug 2023 05:12:22 -0700 (PDT) Received: from localhost.localdomain (dsl-152-182.b2b2c.ca. [66.158.152.182]) by smtp.gmail.com with ESMTPSA id c17-20020a0ce151000000b00641899958efsm4468320qvl.130.2023.08.16.05.12.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Aug 2023 05:12:22 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 16 Aug 2023 08:10:17 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Spam-Score: 7.81 X-Migadu-Queue-Id: 9602A49918 X-Migadu-Scanner: mx0.migadu.com X-Migadu-Spam-Score: 7.81 X-TUID: DEWtDbDzL8h0 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 --- (no changes since v1) 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" -- 2.41.0