From da0cf7361a97b3b2183de3c652e03106cdd0a265 Mon Sep 17 00:00:00 2001 Message-ID: From: Zac Berkowitz Date: Mon, 18 Mar 2024 12:02:40 -0400 Subject: [PATCH] gnu: qtserialport: Update to 6.5.2 * gnu/packages/qt.scm (qtserialport): Update to 6.5.2 * gnu/packages/qt.scm (qtserialport-5): Rename variable for Qt5 * gnu/packages/engineering.scm (fritzing, candle): Use qtserialport-5 definition * gnu/packages/geo.scm (qgis): Use qtserialport-5 * gnu/packages/kde-utils.scm (atelier, libatcore): Use qtserialport-5 * gnu/packages/qt.scm (qtserialbus, qtlocation, python-pyqt): Use qtserialport-5 * gnu/packages/radio.scm (wsjtx, jtdx, js8call, sdrangel, wfview, qdmr): Use qtserialport-5 Change-Id: I8e0c8d2408ea0bf776b2efe58e23821cb653363c --- gnu/packages/astronomy.scm | 4 ++-- gnu/packages/engineering.scm | 6 ++---- gnu/packages/geo.scm | 2 +- gnu/packages/kde-utils.scm | 4 ++-- gnu/packages/qt.scm | 28 ++++++++++++++++++++++++---- gnu/packages/radio.scm | 14 ++++++-------- 6 files changed, 37 insertions(+), 21 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index d7747f051d..74c9a60bf2 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -1370,7 +1370,7 @@ (define-public stellarium "-DENABLE_QT6=0" "-DENABLE_TESTING=0" (string-append "-DCMAKE_CXX_FLAGS=-isystem " - #$(this-package-input "qtserialport") "/include/qt5")) + #$(this-package-input "qtserialport-5") "/include/qt5")) #:phases #~(modify-phases %standard-phases (add-before 'check 'set-offscreen-display @@ -1390,7 +1390,7 @@ (define-public stellarium qtmultimedia-5 qtpositioning qtscript - qtserialport + qtserialport-5 qttranslations qtwebengine-5 qxlsx-qt5 diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index ae287cf51b..00da7ada69 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -765,9 +765,7 @@ (define-public fritzing (list boost libgit2 qtbase-5 - ;; TODO: Needs to be renamed to qtserialport-5. when version 6 is - ;; packed. - qtserialport + qtserialport-5 qtsvg-5 zlib)) (home-page "https://fritzing.org") @@ -4257,7 +4255,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 687effcace..76d2ce83d5 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2978,7 +2978,7 @@ (define-public qgis qtkeychain qtlocation qtmultimedia-5 - qtserialport + qtserialport-5 qtsvg-5 qwt ;; saga diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 4e665da599..f2ae4200da 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -151,7 +151,7 @@ (define-public atelier qtcharts qtdeclarative-5 qtmultimedia-5 - qtserialport)) + qtserialport-5)) (home-page "https://atelier.kde.org") (synopsis "Desktop interface to control 3D printers powered by AtCore") (description "Atelier provides interface to control and manage your printer. @@ -728,7 +728,7 @@ (define-public libatcore "1830r6ylpn3l7y2frl8cih5cpjgbkfrib9jq7jklf8aszhlsihf2")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) - (inputs (list qtcharts qtdeclarative-5 qtserialport)) + (inputs (list qtcharts qtdeclarative-5 qtserialport-5)) (home-page "https://invent.kde.org/libraries/atcore") (synopsis "Library for connection and management of 3D printers") (description diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 9df49d7fb3..84b22c2e54 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1,3 +1,4 @@ + ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2023 Andreas Enge ;;; Copyright © 2015 Sou Bunnbu @@ -1916,7 +1917,7 @@ (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") @@ -1947,6 +1948,25 @@ (define-public qtserialport (description "The Qt Serial Port module provides the library for interacting with serial ports from within Qt."))) +(define-public qtserialport + (package + (name "qtserialport") + (version "6.5.2") + (source + (origin + (method url-fetch) + (uri (qt-url name version)) + (sha256 + (base32 "17nc5kmha6fy3vzkxfr2gxyzdsahs1x66d5lhcqk0szak8b58g06")))) + (build-system cmake-build-system) + (native-inputs (list pkg-config)) + (inputs (list qtbase eudev)) + (home-page (package-home-page qtbase)) + (synopsis "Qt Serial Port module") + (description "The Qt Serial Port module provides the library for +interacting with serial ports from within Qt.") + (license (package-license qtbase)))) + (define-public qtserialbus (package (inherit qtsvg-5) @@ -1969,7 +1989,7 @@ (define-public qtserialbus (format #f "QStringLiteral(~s)" (search-input-file inputs "lib/libsocketcan.so")))))))))) - (inputs (list libsocketcan qtbase-5 qtserialport)) + (inputs (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, @@ -2120,7 +2140,7 @@ (define-public qtlocation (add-before 'check 'pre-check (lambda _ (setenv "HOME" "/tmp"))))))) - (native-inputs (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport)) + (native-inputs (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport-5)) (inputs (list icu4c openssl qtbase-5 zlib)) (synopsis "Qt Location and Positioning modules") (description "The Qt Location module provides an interface for location, @@ -3685,7 +3705,7 @@ (define-public python-pyqt ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) ("qtsensors" ,qtsensors) - ("qtserialport" ,qtserialport) + ("qtserialport" ,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 9c8225d22b..e3af437c6f 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1683,7 +1683,7 @@ (define-public wsjtx libusb qtbase-5 qtmultimedia-5 - qtserialport + qtserialport-5 wsjtx-hamlib)) (home-page "https://www.physics.princeton.edu/pulsar/k1jt/wsjtx.html") (synopsis "Weak-signal ham radio communication program") @@ -1721,7 +1721,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") @@ -1798,7 +1798,7 @@ (define-public js8call libusb qtbase-5 qtmultimedia-5 - qtserialport + qtserialport-5 wsjtx-hamlib)) (home-page "http://js8call.com/") (synopsis "Weak-signal ham radio communication program") @@ -2670,7 +2670,7 @@ (define-public sdrangel qtlocation qtmultimedia-5 qtquickcontrols2-5 - qtserialport + qtserialport-5 qtspeech qtwebchannel-5 qtwebengine-5 @@ -2850,9 +2850,7 @@ (define-public wfview qtgamepad qtbase-5 qtmultimedia-5 - ;; TODO: Needs to be renamed to qtserialport-5. when version 6 is - ;; packed. - qtserialport + qtserialport-5 rtaudio)) (home-page "https://wfview.org/") (synopsis "Software to control Icom radios") @@ -3221,7 +3219,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") base-commit: c8556379c3f2d3d095a178858915720f2eebc012 -- 2.41.0