From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id kAvBDMqkR2MasAAAbAwnHQ (envelope-from ) for ; Thu, 13 Oct 2022 07:40:26 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id IM7wDMqkR2PIvgAAauVa8A (envelope-from ) for ; Thu, 13 Oct 2022 07:40:26 +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 AA6931CCDB for ; Thu, 13 Oct 2022 07:40:25 +0200 (CEST) Received: from localhost ([::1]:43124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oiqxE-0006Xt-Rf for larch@yhetil.org; Thu, 13 Oct 2022 01:40:24 -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 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg=pgp-sha512; boundary="------8671d54035cd21f58d2e0725d70df719beb8f17d22404d0db3dd47d96ffcc51b"; charset=utf-8 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" Reply-to: Cairn X-ACL-Warn: , Cairn via Guix-patches From: Cairn via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1665639625; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: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=pIUDI8cAW8f0jkGbd2HlOFZC9EOnNHmgs35TVL3xE6I=; b=mAcZNOjyaZaCoJ/spqcFIVnl9foFKBq+3vi9Qkq7+3kXn8UW608S423ofS2irGkkQDG8N9 gnpbQxVBTUIN6XsJjWBwU5KpeayoAHPVw1whj6yC79xlLnFA36O6hPjsJUYCTxEPnotv0A 2ifyFOexHJMQRkCa/Hu7nPgGy4tNb+OqQeUNPS84p+S37LKRp6BhAgJZJ9vJ2CmemJrBR+ vcGxQqt9jJ+fYbLcKiGmyGgKbj985Hs4aHR4/u26GLKAAlY1Ry1lC/tk/25QtNJBAkHlZH lpLPPCqIAWtH0f6GKL3sEBbsuSxCzpDL8vz9B5zUaBbvieNQQRBfoQSATGL+GQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1665639625; a=rsa-sha256; cv=none; b=S93AvnG5AVkZoV/3QNytEoPlnBRziZPP2tyL6q5IUjCndAKHc2FxGMfpOvq2RkW4VgxBvr AmYvrXwdm/ozXaqNP7c4RPfxEg1TZ8qHbKhAl06cjlJnnaVtaWrnqF4OMieW3g6pX/qpNw viDRRynxsv+XfJabyq48sGSp8KBml9Lt6NcPKHDQ4cD6YgdB4r03WtrwTrYcG3uEBwYNge 6MR4qXN43oRjTmwjJhz/dLzU+zgcNu7GdbE8Qd3Z4xnd9NdZZU/NlOXT8PFiXPAC9f+SAz pCB3YuoPu49WbkYcMErhafWfIhp9TLt2AbIHYgpy6weOvoLJEuHSCF2UKlAXRA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=pm.me header.s=protonmail3 header.b=oV2z0ERy; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Spam-Score: -4.00 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=pm.me header.s=protonmail3 header.b=oV2z0ERy; dmarc=pass (policy=none) header.from=gnu.org; 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" X-Migadu-Queue-Id: AA6931CCDB X-Spam-Score: -4.00 X-Migadu-Scanner: scn1.migadu.com X-TUID: KrQnk5CmjbVe This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------8671d54035cd21f58d2e0725d70df719beb8f17d22404d0db3dd47d96ffcc51b Content-Type: multipart/mixed;boundary=---------------------41c83bec3bb5f3d3c407def26d095b73 -----------------------41c83bec3bb5f3d3c407def26d095b73 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain;charset=utf-8 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/qtserialpor= t-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 tim= e @@ -757,7 +757,7 @@ (define-public stellarium #:configure-flags (list "-DENABLE_TESTING=3D1" (string-append "-DCMAKE_CXX_FLAGS=3D-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, Mo= dBus, @@ -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 W= SJTX") @@ -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 radio= s") -- = 2.38.0 -----------------------41c83bec3bb5f3d3c407def26d095b73-- --------8671d54035cd21f58d2e0725d70df719beb8f17d22404d0db3dd47d96ffcc51b Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: ProtonMail wsFzBAEBCgAGBQJjR6RGACEJEPAAT+s3Q4ojFiEErbMphMGhBA17RriI8ABP 6zdDiiP5yA//adohDPtqzG5X4oK1HVH5NLMu/f6mBdVBQple2bvEU+geSwpO xbQR+Jr4TEs86HuNW5s4/zstrJ3gGR//V6T70REB99HRVq38tffuTsVOZk6t S4RUUdF8FzrnlXQ5cXCvuoVyI3nf2jDwbzvt/h9wplJ8/U6B924621JV4YUB UBmKMIK6hmionwFvyEEeIKVXSmghc0HODYWCvb0mfPfj3A0xAvDlh5fgZ2GI XM6MGtyEwk4hPH9svQgDAqyifCiZkwfEoSEIulnBorwkyE9CWfznxHcA9HkH prTocHr9ULdV56Y8qPWhF8m7Ml0l9Y0F9a1pMZpTvn8251cd0sOKJ92FDhlj U14dNScYXJYyT53BMeL3h6zmDovrhJjinmPQbEetUUAFWAfxtoIfgNhP3jEq tJZb396NzMiioWSvP282IxoAQ06LH3kzvOf7/Qd45KY/mI5rloqqqAtOsCM5 5Z/WhwKVznXmwaMYy36bXBiEXGV96o4526LK0EgdBCqD4PtUY2Z6711wBKY3 8jr+rYc9aL0YXV2XHDG3u+grNPIoWv4loEN8GnXsxDXWtgMyr4t9NqOPXT2E WYJzDsXT3ONj3exBqmrSVXL6WPtOMbEdIEzxto2eoId0Ef3Rfu1QAPJOTehu b5mT63I7vW3FeD9ioaMx5uisU1YFztrFm0U= =Thuk -----END PGP SIGNATURE----- --------8671d54035cd21f58d2e0725d70df719beb8f17d22404d0db3dd47d96ffcc51b--