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") -- 2.38.0