From patchwork Wed Aug 16 12:10:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52896 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 69DD127BBE2; Wed, 16 Aug 2023 13:14:24 +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=ham 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 773E427BBEA for ; Wed, 16 Aug 2023 13:14:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWFPC-0007dL-Hh; Wed, 16 Aug 2023 08:13:42 -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 1qWFOt-00078I-EU 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 1qWFOd-0002Lt-KX 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 1qWFOc-0005S1-Le; Wed, 16 Aug 2023 08:13:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65280] [PATCH v2 08/59] 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: Wed, 16 Aug 2023 12:13:06 +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.169218796720549 (code B ref 65280); Wed, 16 Aug 2023 12:13:06 +0000 Received: (at 65280) by debbugs.gnu.org; 16 Aug 2023 12:12:47 +0000 Received: from localhost ([127.0.0.1]:39038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWFOJ-0005LH-4j for submit@debbugs.gnu.org; Wed, 16 Aug 2023 08:12:47 -0400 Received: from mail-vk1-xa30.google.com ([2607:f8b0:4864:20::a30]:57437) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qWFO9-0005Iv-UE for 65280@debbugs.gnu.org; Wed, 16 Aug 2023 08:12:41 -0400 Received: by mail-vk1-xa30.google.com with SMTP id 71dfb90a1353d-4881ac152b5so621099e0c.2 for <65280@debbugs.gnu.org>; Wed, 16 Aug 2023 05:12:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692187952; x=1692792752; 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=PeawQnrC/oOxoI16mOO8EAUYHV860iiwkUGDRMIgqjs=; b=A4pLsn5eb/iU4Vwar98br8OMsQ3ioTz9NhlPHxOoH2zakDMxG3E9u5NzjIX1zSXTD1 iqtArUOH2zfEGeB3OvnPCqHEvVfxPU2Afmof/KjZ7BXVsIFxvJQLFujBPp9Obsvo3vsq dhWmWdqxDg2KYrv3pOq8mxyzRmnsTKcx4olB0feKuz0PpsakpeBfq8Gly8CL3k5W++pE 0M70qv+W8UQ4oodOgVme1j01U6vIVZtzj1+OrnBhw7AbI8/PMEEUK3X0D6eFCS5XxT+L l1GdP7hl2klTub5PpMAXfj8fg02ptIuIxRQLRVZwqmYhnPggr2HtMdygaHQvhUa5eRNN 8VIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692187952; x=1692792752; 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=PeawQnrC/oOxoI16mOO8EAUYHV860iiwkUGDRMIgqjs=; b=jM3Jxo8nEjeOAUi7QH8XH62ztFLQ6fPTVaIpEG8xuTk8e87VbYhv2X9qV942B1OPuD Wg9HnSiMeRWt4rqhX/L5zkKwRpWSc3FoBo0iQUVNJLIlhDPZxGc6nT8nGtkhIomGPySD 5NTlNPIuUsJ1ZQ4K4J9LeNyHD6qiEmDFE42fHfFQ15U3nRj0osGF2l8ciaZEKfC0ux1j eWzj/iwtAdgOG4h9bp9Fgfia8xznYqodGZkTetEvLgD3uabD690TbIiHcoMBrWFVCEsk /e+LkFRu18RtDo0KvaWC4KCGOwxO/d5sIvLFCD5JOvV2P11FguR8FC3C2uBW2JsM8DPQ QAqA== X-Gm-Message-State: AOJu0Yw/i0tXR3C/AmwIMXUlYebRds1U2bunXqrK4fbS+GUtANl9Dx1k lq8mURM7fETj8Y7wK3N2K8cZ54R3FZI= X-Google-Smtp-Source: AGHT+IFGyxCy/IgVDXW45E++V2Z3oFdahNWI2njrz4nSYde9+hrAOKYnnftV8J3+2Jdp0EwK+6nmZA== X-Received: by 2002:a1f:c189:0:b0:489:a8:b87f with SMTP id r131-20020a1fc189000000b0048900a8b87fmr1690444vkf.3.1692187952177; Wed, 16 Aug 2023 05:12:32 -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.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Aug 2023 05:12:31 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 16 Aug 2023 08:10:24 -0400 Message-ID: <2fb81660c7eca991b931cedf0972c3c5a04dcf43.1692187578.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. --- (no changes since v1) 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 f5f59d1d99..dee2ea068c 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2434,7 +2434,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