From patchwork Mon Aug 14 04:29:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52809 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 AA22027BBF0; Mon, 14 Aug 2023 05:35:36 +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 D8D8527BBE2 for ; Mon, 14 Aug 2023 05:35:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qVPId-0006ri-Mo; Mon, 14 Aug 2023 00:35:29 -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 1qVPII-0006nu-Cg for guix-patches@gnu.org; Mon, 14 Aug 2023 00:35:06 -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 1qVPII-000459-3Y for guix-patches@gnu.org; Mon, 14 Aug 2023 00:35:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qVPIF-000314-E9; Mon, 14 Aug 2023 00:35:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65280] [PATCH 08/26] gnu: qtimageformats: Rename variable to qtimageformats-5. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, maxim.cournoyer@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Mon, 14 Aug 2023 04:35:03 +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 , Efraim Flashner , Eric Bavier , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier , Maxim Cournoyer , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 65280-submit@debbugs.gnu.org id=B65280.169198764811258 (code B ref 65280); Mon, 14 Aug 2023 04:35:03 +0000 Received: (at 65280) by debbugs.gnu.org; 14 Aug 2023 04:34:08 +0000 Received: from localhost ([127.0.0.1]:60678 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVPHL-0002vQ-S0 for submit@debbugs.gnu.org; Mon, 14 Aug 2023 00:34:08 -0400 Received: from mail-qk1-x72b.google.com ([2607:f8b0:4864:20::72b]:42061) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qVPHI-0002tp-Qk for 65280@debbugs.gnu.org; Mon, 14 Aug 2023 00:34:05 -0400 Received: by mail-qk1-x72b.google.com with SMTP id af79cd13be357-76cc4d495deso172044885a.0 for <65280@debbugs.gnu.org>; Sun, 13 Aug 2023 21:34:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1691987639; x=1692592439; 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=OthBbnqDmqhHIRKf+sOTFVXa3gNswcYqvLI5k0w95vY=; b=DU2whdw1UOz/QTPGH2/Rjm+63SGH3bvN0QIBgk6ALWurLKDtVZvmeutobkM+3Hdg3D JnszHdW9EsCP90vSuz60+ISZ+j47iSQIgJaZDQvu1hFGUJ5t/UltB+9/MDpF32b9u3dv 7+nbWLTLdkP3LyBTTOjpqhZNG4FKxbvgzHPrrxW3omEUjVuswEem1/Y4pGGflVqNY9wc X4mHu7DwFRy6UJYkMtubqxQhAssapfpQOmtP+NUuqxp0fqpKnEC39hwaVj44aPrPzzpB FtK1eSqQbZB5EewRhSvzeE4H9pXsYsvExutNBApCH3Bv/j6I0RlSQfDaYvx8+adqhHF0 uV2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691987639; x=1692592439; 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=OthBbnqDmqhHIRKf+sOTFVXa3gNswcYqvLI5k0w95vY=; b=lUCou5EPLzEWC1dZQRsB4KPpTFDLfLDn/bONZaZ5LAqdLjV0GlV5b3o2cwvQK4WagM vyc4kLE3Aqc9RuGv0oFqr2KuPouPv0fMqwUhN5mKB90SYDGh1HCHv9B6vo+afAN4BOhS ItIVePKukOfiKXyP5LdRTZtKm7Lm4qnNQUCjcOp3tK/rUU8iLi4c1tHDO7wlBAmzt63s Fmp/kJ5cHcg/uwHmz/d8sfKaaNGyDd/o/zXndFSGjnKvIVX1rTiwhAtBLCHMHFlmNTbd EqPT7AHgJ9cW2bL4WsrvETNzlFJZTbNmZ2GIPmF7iG24A+gLtPlG5YMS7Nq5B2ZVIu0o FoUA== X-Gm-Message-State: AOJu0YwU4Gix/6O0O5lu9g7zO8edehU957WJ1AYRqhuzGdN26iEAXpOX VMFBYyT5ctXoLtblT2mLpb+CdLW8EsoMjQ== X-Google-Smtp-Source: AGHT+IFWLO1m9aHABtW0TLvxsgngquW932fsvcnNn7IBHQAukcBev0gVIWf436CV0391zWHtxc6tIw== X-Received: by 2002:a05:620a:24c3:b0:762:3841:c098 with SMTP id m3-20020a05620a24c300b007623841c098mr14416724qkn.30.1691987638952; Sun, 13 Aug 2023 21:33:58 -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.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Aug 2023 21:33:58 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 14 Aug 2023 00:29:18 -0400 Message-ID: <5ab9d0903e7e2325adbc83142433c7b7f856d5f5.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 * gnu/packages/qt.scm (qtimageformats): Rename to... (qtimageformats-5): ... this. * gnu/packages/telegram.scm (telegram-desktop): Adjust accordingly. * gnu/packages/image-viewers.scm (qview): Likewise. * gnu/packages/geo.scm (openorienteering-mapper): Likewise. --- gnu/packages/geo.scm | 2 +- gnu/packages/image-viewers.scm | 2 +- gnu/packages/qt.scm | 2 +- gnu/packages/telegram.scm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index cce4f2518d..a2f97a35b8 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2432,7 +2432,7 @@ (define-public openorienteering-mapper ("gdal" ,gdal) ("proj" ,proj) ("qtbase" ,qtbase-5) - ("qtimageformats" ,qtimageformats) + ("qtimageformats" ,qtimageformats-5) ("qtlocation" ,qtlocation) ("qtsensors" ,qtsensors) ("zlib" ,zlib))) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 70f3f37768..0ce3a27b01 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -730,7 +730,7 @@ (define-public qview (native-inputs (list qttools-5)) (inputs - (list qtbase-5 qtimageformats qtsvg-5)) + (list qtbase-5 qtimageformats-5 qtsvg-5)) (home-page "https://interversehq.com/qview/") (synopsis "Convenient and minimal image viewer") (description "qView is a Qt image viewer designed with visually diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 1e7815dce2..b6fe7bd14a 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1094,7 +1094,7 @@ (define-public qtsvg (home-page (package-home-page qtbase)) (license (package-license qtbase)))) -(define-public qtimageformats +(define-public qtimageformats-5 (package (inherit qtsvg-5) (name "qtimageformats") (version "5.15.8") diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index aa5c303603..dffc6b8ff4 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -517,7 +517,7 @@ (define-public telegram-desktop qrcodegen-cpp qtbase-5 qtdeclarative-5 - qtimageformats + qtimageformats-5 qtsvg-5 qtwayland-5 range-v3