6 files changed, 49 insertions(+), 21 deletions(-)

M gnu/packages/astronomy.scm
M gnu/packages/engineering.scm
M gnu/packages/geo.scm
M gnu/packages/kde-utils.scm
M gnu/packages/qt.scm
M gnu/packages/radio.scm

@@ 1388,7 1388,7 @@ deconvolution).  Such post-processing is not performed by Stackistry.")
            qtmultimedia-5
            qtpositioning
            qtscript
-           qtserialport
+           qtserialport-5
            qttranslations
            qtwebengine-5
            qxlsx-qt5

@@ 737,9 737,7 @@ multipole-accelerated algorithm.")
      (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")


@@ 4229,7 4227,7 @@ netlists from the drawn schematic, allowing the simulation of the circuit.")
                   "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

@@ 3009,7 3009,7 @@ growing set of geoscientific methods.")
            qtkeychain
            qtlocation
            qtmultimedia-5
-           qtserialport
+           qtserialport-5
            qtsvg-5
            qwt
            ;; saga

@@ 152,7 152,7 @@ well as CD-ROM images.")
                     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.


@@ 729,7 729,7 @@ combinations are distinct enough to be readable and accessible.")
                   "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

@@ 2054,7 2054,7 @@ compositor libraries.")
     (home-page (package-home-page qtbase))
     (license (package-license qtbase))))
 
-(define-public qtserialport
+(define-public qtserialport-5
   (package
     (inherit qtsvg-5)
     (name "qtserialport")


@@ 2085,6 2085,38 @@ compositor libraries.")
     (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.6.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (qt-url name version))
+       (sha256
+        (base32 "0dywalgafvxi2jgdv9dk22hwwd8qsgk5xfybh75n3njmwmwnarg1"))))
+    (build-system cmake-build-system)
+    (arguments
+     (list #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'patch-dlopen-paths
+                 (lambda* (#:key inputs #:allow-other-keys)
+                   (substitute* "src/serialport/qtudev_p.h"
+                     ;; Use the absolute paths for dynamically loaded libs,
+                     ;; otherwise the lib will be searched in LD_LIBRARY_PATH
+                     ;; which typically is not set in guix.
+                     (("setFileNameAndVersion\\(QStringLiteral\\(\"udev\")")
+                      (format #f "setFileNameAndVersion(QStringLiteral(~s))"
+                              (string-append #$(this-package-input "eudev")
+                                             "/lib/libudev")))))))))
+    (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)


@@ 2107,7 2139,7 @@ interacting with serial ports from within Qt.")))
                    (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,


@@ 2258,7 2290,7 @@ Server Protocol (LSP) for Qt.")
             (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,


@@ 3918,8 3950,8 @@ module provides support functions to the automatically generated code.")
        ("qtdeclarative-5" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
        ("qtmultimedia-5" ,qtmultimedia-5)
-       ("qtsensors-5" ,qtsensors-5)
-       ("qtserialport" ,qtserialport)
+       ("qtsensors" ,qtsensors-5)
+       ("qtserialport" ,qtserialport-5)
        ("qtsvg-5" ,qtsvg-5)
        ("qttools-5" ,qttools-5)
        ("qtwebchannel-5" ,qtwebchannel-5)

@@ 1683,7 1683,7 @@ instances over the network, and general QSO and DXpedition logging.")
            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 @@ weak-signal conditions.")
       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 @@ focused on DXing and being shaped by community of DXers.JTDX")
            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 @@ voice formats.")
            qtlocation
            qtmultimedia-5
            qtquickcontrols2-5
-           qtserialport
+           qtserialport-5
            qtspeech-5
            qtwebchannel-5
            qtwebengine-5


@@ 2850,9 2850,7 @@ software-defined radio receivers.")
            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 @@ memory contents between them.")
                    (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")