3 files changed, 93 insertions(+), 92 deletions(-)

M gnu/packages/kde-internet.scm
M gnu/packages/kde.scm
M gnu/packages/rust-apps.scm

@@ 67,6 67,7 @@
   #:use-module (gnu packages web)
   #:use-module (gnu packages xiph)
   #:use-module (gnu packages xml)
+  #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xorg))
 
 (define-public falkon


@@ 163,6 164,97 @@ This package is part of the KDE networking module.")
     (license ;; GPL for programs, LGPL for libraries, FDL for documentation
      (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+))))
 
+(define-public kdeconnect
+  (package
+    (name "kdeconnect")
+    (version "25.08.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/release-service/"
+                           version "/src/kdeconnect-kde-"
+                           version ".tar.xz"))
+       (sha256
+        (base32
+         "07rmkm8gmfx1hs5n5rql2q9f539hdwv1l8wgjcmd2m5793f0nd4a"))))
+    (build-system qt-build-system)
+    (arguments
+     (list #:qtbase qtbase
+           #:configure-flags
+           #~(list (string-append "-DQtWaylandScanner_EXECUTABLE="
+                                  #$(this-package-native-input "qtwayland")
+                                  "/lib/qt6/libexec/qtwaylandscanner")
+                   "-DKDE_INSTALL_LIBEXECDIR=libexec"
+                   ;; So kdeconnect.so isn't installed to lib/plugins
+                   "-DPLUGIN_INSTALL_DIR=lib/qt6/plugins")
+           #:phases #~(modify-phases %standard-phases
+                        (add-after 'unpack 'fix-dbus-autostart
+                          (lambda _
+                            ;; 'dbus-daemon' requires an absolute Exec path.
+                            (substitute* "daemon/org.kde.kdeconnect.service.in"
+                              (("kdeconnectd")
+                               (string-append #$output "/bin/kdeconnectd"))))))
+           #:tests? #f)) ; tests fail hard in our build environment
+    (native-inputs
+     (list extra-cmake-modules
+           kdoctools
+           libxtst
+           pkg-config
+           python-wrapper
+           wayland-protocols
+           qtwayland))
+    (inputs
+     (list dbus
+           kcmutils
+           kconfigwidgets
+           kcrash
+           kdbusaddons
+           kguiaddons
+           ki18n
+           kiconthemes
+           kio
+           kirigami
+           kirigami-addons
+           kitemmodels
+           knotifications
+           kpackage
+           kpeople
+           kstatusnotifieritem
+           kwayland
+           libfakekey
+           openssl
+           plasma-wayland-protocols
+           pulseaudio-qt
+           qca-qt6
+           qqc2-desktop-style
+           qtbase
+           qtconnectivity
+           qtdeclarative
+           qtmultimedia
+           qtwayland
+           qtsvg
+           sonnet
+           wayland
+           modemmanager-qt
+           libxkbcommon))
+    (home-page "https://community.kde.org/KDEConnect")
+    (synopsis "Enable your devices to communicate with each other")
+    (description "KDE Connect is a project that enables all your devices to
+communicate with each other.  Here's a few things KDE Connect can do:
+@enumerate
+@item Receive your phone notifications on your desktop computer and reply to messages
+@item Control music playing on your desktop from your phone
+@item Use your phone as a remote control for your desktop
+@item Run predefined commands on your PC from connected devices
+@item Check your phones battery level from the desktop
+@item Ring your phone to help finding it
+@item Share files and links between devices
+@item Browse your phone from the desktop
+@item Control the desktop's volume from the phone
+@end enumerate")
+    (properties `((upstream-name . "kdeconnect-kde")))
+    (license (list license:gpl2 license:gpl3)))) ; dual licensed
+
 (define-public kio-extras
   (package
     (name "kio-extras")

@@ 1276,97 1276,6 @@ Using a plugin system it is possible to create notifications with many
 different notification systems.")
     (license license:lgpl3)))
 
-(define-public kdeconnect
-  (package
-    (name "kdeconnect")
-    (version "25.08.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://kde/stable/release-service/"
-                           version "/src/kdeconnect-kde-"
-                           version ".tar.xz"))
-       (sha256
-        (base32
-         "07rmkm8gmfx1hs5n5rql2q9f539hdwv1l8wgjcmd2m5793f0nd4a"))))
-    (build-system qt-build-system)
-    (arguments
-     (list #:qtbase qtbase
-           #:configure-flags
-           #~(list (string-append "-DQtWaylandScanner_EXECUTABLE="
-                                  #$(this-package-native-input "qtwayland")
-                                  "/lib/qt6/libexec/qtwaylandscanner")
-                   "-DKDE_INSTALL_LIBEXECDIR=libexec"
-                   ;; So kdeconnect.so isn't installed to lib/plugins
-                   "-DPLUGIN_INSTALL_DIR=lib/qt6/plugins")
-           #:phases #~(modify-phases %standard-phases
-                        (add-after 'unpack 'fix-dbus-autostart
-                          (lambda _
-                            ;; 'dbus-daemon' requires an absolute Exec path.
-                            (substitute* "daemon/org.kde.kdeconnect.service.in"
-                              (("kdeconnectd")
-                               (string-append #$output "/bin/kdeconnectd"))))))
-           #:tests? #f)) ; tests fail hard in our build environment
-    (native-inputs
-     (list extra-cmake-modules
-           kdoctools
-           libxtst
-           pkg-config
-           python-wrapper
-           wayland-protocols
-           qtwayland))
-    (inputs
-     (list dbus
-           kcmutils
-           kconfigwidgets
-           kcrash
-           kdbusaddons
-           kguiaddons
-           ki18n
-           kiconthemes
-           kio
-           kirigami
-           kirigami-addons
-           kitemmodels
-           knotifications
-           kpackage
-           kpeople
-           kstatusnotifieritem
-           kwayland
-           libfakekey
-           openssl
-           plasma-wayland-protocols
-           pulseaudio-qt
-           qca-qt6
-           qqc2-desktop-style
-           qtbase
-           qtconnectivity
-           qtdeclarative
-           qtmultimedia
-           qtwayland
-           qtsvg
-           sonnet
-           wayland
-           modemmanager-qt
-           libxkbcommon))
-    (home-page "https://community.kde.org/KDEConnect")
-    (synopsis "Enable your devices to communicate with each other")
-    (description "KDE Connect is a project that enables all your devices to
-communicate with each other.  Here's a few things KDE Connect can do:
-@enumerate
-@item Receive your phone notifications on your desktop computer and reply to messages
-@item Control music playing on your desktop from your phone
-@item Use your phone as a remote control for your desktop
-@item Run predefined commands on your PC from connected devices
-@item Check your phones battery level from the desktop
-@item Ring your phone to help finding it
-@item Share files and links between devices
-@item Browse your phone from the desktop
-@item Control the desktop's volume from the phone
-@end enumerate")
-    (properties `((upstream-name . "kdeconnect-kde")))
-    (license (list license:gpl2 license:gpl3)))) ; dual licensed
-
 (define-public labplot
   (package
     (name "labplot")

@@ 92,7 92,7 @@
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
   #:use-module (gnu packages jemalloc)
-  #:use-module (gnu packages kde)
+  #:use-module (gnu packages kde-internet)
   #:use-module (gnu packages libusb)
   #:use-module (gnu packages libunwind)
   #:use-module (gnu packages linux)