5 files changed, 35 insertions(+), 30 deletions(-)

M gnu/packages/kde-graphics.scm
M gnu/packages/kde-office.scm
M gnu/packages/kde-pim.scm
M gnu/packages/kde-sdk.scm
M gnu/packages/kde.scm

@@ 20,6 20,7 @@
   #:use-module (guix build-system qt)
   #:use-module (guix download)
   #:use-module (guix gexp)
+  #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
   #:use-module (gnu packages)


@@ 96,3 97,33 @@
      "Gwenview is an image viewer for KDE.  It also provides image editing and
 annotating features.")
     (license license:gpl2+)))
+
+(define-public kdiagram
+  (package
+    (name "kdiagram")
+    (version "3.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/kdiagram/" version
+                           "/kdiagram-" version ".tar.xz"))
+       (sha256
+        (base32 "0vcw339v6nl1haznp58spimanfhw143cindbym1q3ccxrp1b0na6"))
+       (patches (search-patches
+                 "kdiagram-Fix-missing-link-libraries.patch"))))
+    (build-system qt-build-system)
+    (native-inputs
+     (list extra-cmake-modules qttools))
+    (inputs
+     (list qtsvg))
+    (arguments (list #:qtbase qtbase))
+    (home-page "https://invent.kde.org/graphics/kdiagram")
+    (synopsis "Libraries for creating business diagrams")
+    (description "This package provides libraries for integrating business
+diagrams in Qt-based applications.
+
+@code{KCharts} provides an implementation of the ODF Chart specification.  It
+supports stock charts, box charts, and whisker charts.  @code{KGantt} provides
+a module for implementing ODF Gantt charts, which are bar charts that
+illustrate project schedules.")
+    (license license:gpl2+)))

@@ 37,6 37,7 @@
   #:use-module (gnu packages hunspell)
   #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
+  #:use-module (gnu packages kde-graphics)
   #:use-module (gnu packages kde-multimedia)
   #:use-module (gnu packages libreoffice)
   #:use-module (gnu packages maths)

@@ 48,6 48,7 @@
   #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages kde-plasma)
+  #:use-module (gnu packages kde-graphics)
   #:use-module (gnu packages markup)
   #:use-module (gnu packages openldap)
   #:use-module (gnu packages pdf)

@@ 32,6 32,7 @@
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
+  #:use-module (gnu packages kde-graphics)
   #:use-module (gnu packages kde-plasma)
   #:use-module (gnu packages llvm)
   #:use-module (gnu packages perl)

@@ 79,6 79,7 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages image-processing)
   #:use-module (gnu packages kde-frameworks)
+  #:use-module (gnu packages kde-graphics)
   #:use-module (gnu packages kde-pim)
   #:use-module (gnu packages kde-plasma)
   ;; Including this module breaks the build.


@@ 231,36 232,6 @@ of 2D and 3D functions and to calculate easy (and not so easy) calculations,
 such as addition, trigonometric functions or derivatives.")
     (license license:gpl2+)))
 
-(define-public kdiagram
-  (package
-    (name "kdiagram")
-    (version "3.0.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://kde/stable/kdiagram/" version
-                           "/kdiagram-" version ".tar.xz"))
-       (sha256
-        (base32 "0vcw339v6nl1haznp58spimanfhw143cindbym1q3ccxrp1b0na6"))
-       (patches (search-patches
-                 "kdiagram-Fix-missing-link-libraries.patch"))))
-    (build-system qt-build-system)
-    (native-inputs
-     (list extra-cmake-modules qttools))
-    (inputs
-     (list qtsvg))
-    (arguments (list #:qtbase qtbase))
-    (home-page "https://invent.kde.org/graphics/kdiagram")
-    (synopsis "Libraries for creating business diagrams")
-    (description "This package provides libraries for integrating business
-diagrams in Qt-based applications.
-
-@code{KCharts} provides an implementation of the ODF Chart specification.  It
-supports stock charts, box charts, and whisker charts.  @code{KGantt} provides
-a module for implementing ODF Gantt charts, which are bar charts that
-illustrate project schedules.")
-    (license license:gpl2+)))
-
 (define-public kdsoap-ws-discovery-client
   (package
     (name "kdsoap-ws-discovery-client")