From patchwork Thu Oct 13 05:38:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cairn X-Patchwork-Id: 43360 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 CB72A27BBEA; Thu, 13 Oct 2022 06:40:30 +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, T_PDS_PRO_TLD,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 F411227BBE9 for ; Thu, 13 Oct 2022 06:40:29 +0100 (BST) Received: from localhost ([::1]:43124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oiqxJ-0006Xt-5c for patchwork@mira.cbaines.net; Thu, 13 Oct 2022 01:40:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiqws-0006VT-RQ for guix-patches@gnu.org; Thu, 13 Oct 2022 01:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59910) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oiqws-00047O-Fd for guix-patches@gnu.org; Thu, 13 Oct 2022 01:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oiqws-00083e-9L for guix-patches@gnu.org; Thu, 13 Oct 2022 01:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58481] [PATCH 3/9] gnu: qtserialport: Rename variable to qtserialport-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:40: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.166563954630892 (code B ref 58481); Thu, 13 Oct 2022 05:40:02 +0000 Received: (at 58481) by debbugs.gnu.org; 13 Oct 2022 05:39:06 +0000 Received: from localhost ([127.0.0.1]:58984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqvx-00082A-D5 for submit@debbugs.gnu.org; Thu, 13 Oct 2022 01:39:05 -0400 Received: from mail-4316.protonmail.ch ([185.70.43.16]:49589) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oiqvu-00081X-Fn for 58481@debbugs.gnu.org; Thu, 13 Oct 2022 01:39:03 -0400 Date: Thu, 13 Oct 2022 05:38:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pm.me; s=protonmail3; t=1665639536; x=1665898736; bh=pIUDI8cAW8f0jkGbd2HlOFZC9EOnNHmgs35TVL3xE6I=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID; b=oV2z0ERyF4ChnyeA4Wx9GHmDFXEc4c2PNTIoDfI/wd8kwgqXNmAu97l5mh4/f1QQl j5YXx0vaZ8CWgZLOFvkAg/G2zrSSI12S6Moa1OBKAwdVR2AwddZZOUIOnRDdFwRRrN FitSSaBuQvNYO3ZNF9Vd+76syjromQWp44pJKVSmrdL6WS46sNRyEay38hcz5VTMYQ 4/N7F/svcYz5V5se1prCQLia5UK/USiX1hirf00rIsJSCNiAg+LoXU0S8cQTB0wB+F 1ZyGPiCPGXFmmZezM0dJfWtnS0NfuljfohoEIasEcZcyDNLlSiUJwuRNUIEpWakHQy jDHybssc6yHjw== Message-ID: 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 qtserialport to version 6. This change was automated via the following command: git grep -l '\bqtserialport\b' | xargs sed 's/qtserialport/qtserialport-5/g' -i --- gnu/packages/astronomy.scm | 4 ++-- gnu/packages/engineering.scm | 4 ++-- gnu/packages/geo.scm | 2 +- gnu/packages/kde.scm | 4 ++-- gnu/packages/qt.scm | 10 +++++----- gnu/packages/radio.scm | 12 ++++++------ 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index aaa9207e0e..8c53611427 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -745,7 +745,7 @@ (define-public stellarium qtlocation qtmultimedia-5 qtscript - qtserialport + qtserialport-5 zlib)) (native-inputs `(("gettext" ,gettext-minimal) ; xgettext is used at compile time @@ -757,7 +757,7 @@ (define-public stellarium #:configure-flags (list "-DENABLE_TESTING=1" (string-append "-DCMAKE_CXX_FLAGS=-isystem " - (assoc-ref %build-inputs "qtserialport") + (assoc-ref %build-inputs "qtserialport-5") "/include/qt5")) #:phases (modify-phases %standard-phases (add-before 'check 'set-offscreen-display diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5c84b9ede0..7ee8691a7f 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -713,7 +713,7 @@ (define-public fritzing "phoenix.pro"))))))) (inputs `(("qtbase" ,qtbase-5) - ("qtserialport" ,qtserialport) + ("qtserialport-5" ,qtserialport-5) ("qtsvg-5" ,qtsvg-5) ("libgit2" ,libgit2) ("boost" ,boost) @@ -3818,7 +3818,7 @@ (define-public candle "08rqhl6a5a8s67a8yl16944zgcsnnb08xfv4klzyqwlvaqgfp783")))) (build-system gnu-build-system) (native-inputs (list qttools-5)) - (inputs (list qtbase-5 qtserialport)) + (inputs (list qtbase-5 qtserialport-5)) (arguments (list #:tests? #f ; no tests. #:phases #~(modify-phases %standard-phases diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 5e484c6e1c..97f561e362 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2622,7 +2622,7 @@ (define-public qgis qtdeclarative-5 qtkeychain qtlocation - qtserialport + qtserialport-5 qtsvg-5 qwt ;; saga diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index e4ec70bc7a..7b47abdc6d 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -833,7 +833,7 @@ (define-public labplot libcerf lz4 netcdf - qtserialport + qtserialport-5 zlib)) (home-page "https://labplot.kde.org/") (synopsis "Interactive graphing and analysis of scientific data") @@ -1048,7 +1048,7 @@ (define-public marble-qt qtbase-5 qtdeclarative-5 qtlocation - qtserialport + qtserialport-5 qtsvg-5 qtwebchannel-5 qtwebengine-5 diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index e213657249..d589f653fb 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1550,9 +1550,9 @@ (define-public qtwayland (home-page (package-home-page qtbase)) (license (package-license qtbase)))) -(define-public qtserialport +(define-public qtserialport-5 (package (inherit qtsvg-5) - (name "qtserialport") + (name "qtserialport-5") (version "5.15.2") (source (origin (method url-fetch) @@ -1604,7 +1604,7 @@ (define-public qtserialbus (format #f "QStringLiteral(~s)" libcansocket.so))) #t))))))) (inputs - (list libsocketcan qtbase-5 qtserialport)) + (list libsocketcan qtbase-5 qtserialport-5)) (synopsis "Qt Serial Bus module") (description "The Qt Serial Bus API provides classes and functions to access the various industrial serial buses and protocols, such as CAN, ModBus, @@ -1731,7 +1731,7 @@ (define-public qtlocation (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs - (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport)) + (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport-5)) (inputs (list icu4c openssl qtbase-5 zlib)) (synopsis "Qt Location and Positioning modules") @@ -3081,7 +3081,7 @@ (define-public python-pyqt ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) ("qtsensors" ,qtsensors) - ("qtserialport" ,qtserialport) + ("qtserialport-5" ,qtserialport-5) ("qtsvg-5" ,qtsvg-5) ("qttools-5" ,qttools-5) ("qtwebchannel-5" ,qtwebchannel-5) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index cba6d25b9f..bebbbda071 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1381,7 +1381,7 @@ (define-public wsjtx ("libusb" ,libusb) ("qtbase" ,qtbase-5) ("qtmultimedia-5" ,qtmultimedia-5) - ("qtserialport" ,qtserialport))) + ("qtserialport-5" ,qtserialport-5))) (arguments `(#:tests? #f)) ; No test suite (synopsis "Weak-signal ham radio communication program") @@ -1420,7 +1420,7 @@ (define-public jtdx qtbase-5 qtwebsockets-5 qtmultimedia-5 - qtserialport)) + qtserialport-5)) (arguments `(#:tests? #f)) ; No test suite (synopsis "Weak-signal ham radio communication program, forked from WSJTX") @@ -1464,7 +1464,7 @@ (define-public js8call ("libusb" ,libusb) ("qtbase" ,qtbase-5) ("qtmultimedia-5" ,qtmultimedia-5) - ("qtserialport" ,qtserialport))) + ("qtserialport-5" ,qtserialport-5))) (arguments `(#:tests? #f ; No test suite #:phases @@ -2262,7 +2262,7 @@ (define-public sdrangel qtlocation qtmultimedia-5 qtquickcontrols2-5 - qtserialport + qtserialport-5 qtspeech qtwebchannel-5 qtwebengine-5 @@ -2394,7 +2394,7 @@ (define-public wfview (base32 "1kpkwxhcacgmprbr8xz840rj9a22513vxrh2q7d3js5i1dva8j2z")))) (build-system qt-build-system) (inputs - (list opus qcustomplot qtbase-5 qtmultimedia-5 qtserialport)) + (list opus qcustomplot qtbase-5 qtmultimedia-5 qtserialport-5)) (arguments `(#:tests? #f ; No test suite. #:phases @@ -2694,7 +2694,7 @@ (define-public qdmr (substitute* "lib/CMakeLists.txt" (("(DESTINATION \")/etc/udev/" _ directive) (string-append directive #$output "/lib/udev/")))))))) - (inputs (list libusb qtbase-5 qtlocation qtserialport yaml-cpp)) + (inputs (list libusb qtbase-5 qtlocation qtserialport-5 yaml-cpp)) (native-inputs (list qttools-5)) (home-page "https://dm3mat.darc.de/qdmr/") (synopsis "GUI application and command line tool to program DMR radios")