From patchwork Thu Oct 13 05:39:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cairn X-Patchwork-Id: 43363 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 408D127BBEA; Thu, 13 Oct 2022 06:44:54 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 C252527BBE9 for ; Thu, 13 Oct 2022 06:44:53 +0100 (BST) Received: from localhost ([::1]:37788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oir1Y-0000Pz-VD for patchwork@mira.cbaines.net; Thu, 13 Oct 2022 01:44:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50132) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiqxr-0007H0-Ku for guix-patches@gnu.org; Thu, 13 Oct 2022 01:41:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oiqxq-0004T9-Bp for guix-patches@gnu.org; Thu, 13 Oct 2022 01:41:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oiqxq-00085r-7r for guix-patches@gnu.org; Thu, 13 Oct 2022 01:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58481] [PATCH 5/9] gnu: qtimageformats: Rename variable to qtimageformats-5. References: <94mAek164ENauq8r9O2XguR2a7BFYVU2ypJqpJr5Z42OJKl96FxC5qetFugtvngiV5uewDij2lo1zuoI7XEDvQ_GIEZRL4fc1DFI0k6U03w=@pm.me> In-Reply-To: <94mAek164ENauq8r9O2XguR2a7BFYVU2ypJqpJr5Z42OJKl96FxC5qetFugtvngiV5uewDij2lo1zuoI7XEDvQ_GIEZRL4fc1DFI0k6U03w=@pm.me> Resent-From: Cairn Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Oct 2022 05:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58481 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "58481@debbugs.gnu.org" <58481@debbugs.gnu.org> Received: via spool by 58481-submit@debbugs.gnu.org id=B58481.166563961531030 (code B ref 58481); Thu, 13 Oct 2022 05:41:02 +0000 Received: (at 58481) by debbugs.gnu.org; 13 Oct 2022 05:40:15 +0000 Received: from localhost ([127.0.0.1]:58994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqx1-00084I-CA for submit@debbugs.gnu.org; Thu, 13 Oct 2022 01:40:15 -0400 Received: from mail-4322.protonmail.ch ([185.70.43.22]:18227) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqwv-00083Q-9t for 58481@debbugs.gnu.org; Thu, 13 Oct 2022 01:40:09 -0400 Date: Thu, 13 Oct 2022 05:39:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1665639598; x=1665898798; bh=FlPFi+KBYkmHPYtxyWx5rFGjNBa/vE4xOu0BDzeQNXE=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=L931OBW9Gau6m5b+u+++NPfWoX0DksTU/qX2NFSLrwzJrVVj5bWrNFLZOolGBc+i9 ZXU9S5d6w6tXAu6tzrBYCe9LnKMBb/vPEm5yXjoQpefVcLsFohNLhumRQ6UlvGbjme UayP5cBdjl39ivCldpKC89FMXua2LrOyDA4nBNw2gfuzUxeJcj8h94r325LTa0hJk2 pVQ0Ru1CtvTNonOOV/B5GkSXf6gIDczvQu8lbR8MwL8qBLMgtudy62IYxmALtAtFfP q6AyDH3+GE8Psn5A0Ueu3GcLOa40bv8S9oB26acniJEafR5veyioUXCLPD9H1l629d MmqFSDrg0zQdA== Message-ID: <06tsV7P2mFf3plajeILmCw1cf9WJKHVkoxyorrpSarxzNb8U50PD8VoUsOTw1PqVmN1X_LwrAkCocjXwSbON1xyaI-JtxBrlBc9UuEFA3HA=@pm.me> Feedback-ID: 6989168:user:proton 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" Reply-to: Cairn X-ACL-Warn: , Cairn via Guix-patches X-Patchwork-Original-From: Cairn via Guix-patches via From: Cairn X-getmail-retrieved-from-mailbox: Patches This is in preparation of updating qtimageformats to version 6. This change was automated via the following command: git grep -l '\bqtimageformats\b' | xargs sed 's/qtimageformats/qtimageformats-5/g' -i --- gnu/packages/geo.scm | 2 +- gnu/packages/image-viewers.scm | 2 +- gnu/packages/qt.scm | 4 ++-- gnu/packages/telegram.scm | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 97f561e362..0ecfbc75c5 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2229,7 +2229,7 @@ (define-public openorienteering-mapper ("gdal" ,gdal) ("proj" ,proj) ("qtbase" ,qtbase-5) - ("qtimageformats" ,qtimageformats) + ("qtimageformats-5" ,qtimageformats-5) ("qtlocation" ,qtlocation) ("qtsensors" ,qtsensors) ("zlib" ,zlib))) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 77979e8b8f..6e41cb5fdb 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -714,7 +714,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 d0d2c906a4..85f9c0716c 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -948,9 +948,9 @@ (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") + (name "qtimageformats-5") (version "5.15.2") (source (origin (method url-fetch) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 82c9227ba8..d64d2eaf1d 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -500,7 +500,7 @@ (define-public telegram-desktop pulseaudio qrcodegen-cpp qtbase-5 - qtimageformats + qtimageformats-5 qtsvg-5 qtwayland-5 range-v3