From 4a9aa113cfa55de7591acb4c3be77d1eb15443bc Mon Sep 17 00:00:00 2001
From: Eric Brown <ecbrown@ericcbrown.com>
Date: Fri, 21 May 2021 19:34:06 -0500
Subject: [PATCH 28/37] gnu: qtcharts: Update to 6.1.0.

* gnu/packages/qt.scm (qtcharts): Update to 6.1.0.
* gnu/packages/qt.scm (qtcharts-5): New variable.
---
 gnu/packages/kde.scm   |  2 +-
 gnu/packages/qt.scm    | 28 ++++++++++++++++++++++++++--
 gnu/packages/radio.scm |  4 ++--
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index f741bcafce..57c6d7192b 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -1194,7 +1194,7 @@ or Bonjour by other projects).")
        ))
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtcharts" ,qtcharts)
+       ("qtcharts" ,qtcharts-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)))
     (arguments
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f42c7bc45f..cd8591ccde 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1645,12 +1645,36 @@ also contains functionality to support data models and executable content.")))
 purchasing goods and services.")))
 
 (define-public qtcharts
-  (package (inherit qtsvg-5)
+  (package (inherit qtsvg)
     (name "qtcharts")
-    (version "5.15.2")
+    (version "6.1.0")
     (source (origin
              (method url-fetch)
              (uri (qt5-urls name version))
+             (sha256
+              (base32
+               "1kfzrnaihp674nbhayf4pg8g69ggbhcb8z90ry8yv7pjndadqw4g"))))
+    (arguments
+     (substitute-keyword-arguments (package-arguments qtsvg)
+       ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtdeclarative" ,qtdeclarative)))
+    (synopsis "Qt Charts module")
+    (description "The Qt Charts module provides a set of easy to use chart
+components.  It uses the Qt Graphics View Framework, therefore charts can be
+easily integrated to modern user interfaces.  Qt Charts can be used as QWidgets,
+QGraphicsWidget, or QML types. Users can easily create impressive graphs by
+selecting one of the charts themes.")
+    (license license:gpl3)))
+
+(define-public qtcharts-5
+  (package (inherit qtsvg-5)
+    (name "qtcharts-5")
+    (version "5.15.2")
+    (source (origin
+             (method url-fetch)
+             (uri (qt5-urls "qtcharts" version))
              (sha256
               (base32
                "049x7z8zcp9jixmdv2fjscy2ggpd6za9hkdbb2bqp2mxjm0hwxg0"))))
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 98e0f0e6a6..7823759269 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1565,7 +1565,7 @@ receiver.")
        ("mpg123" ,mpg123)
        ("rtl-sdr" ,rtl-sdr)
        ("qtbase" ,qtbase-5)
-       ("qtcharts" ,qtcharts)
+       ("qtcharts" ,qtcharts-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects-5)
        ("qtmultimedia" ,qtmultimedia-5)
@@ -1799,7 +1799,7 @@ voice formats.")
        ("opus" ,opus)
        ("pulseaudio" ,pulseaudio)
        ("qtbase" ,qtbase-5)
-       ("qtcharts" ,qtcharts)
+       ("qtcharts" ,qtcharts-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation-5)
        ("qtmultimedia" ,qtmultimedia-5)
-- 
2.31.1