guix_mirror_bot pushed a commit to branch master
in repository guix.
commit c6a07f70e6fafc980e6779f29b0729f8eeb184a2
Author: Sughosha <[email protected]>
AuthorDate: Wed Oct 8 11:01:40 2025 +0530
gnu: qcustomplot: Switch to Qt6.
* gnu/packages/qt.scm (qcustomplot)[inputs]: Replace qtbase-5 with qtbase.
(qcustomplot-qt5): New variable.
* gnu/packages/databases.scm (sqlitebrowser)[inputs]: Replace qcustomplot
with
qcustomplot-qt5.
* gnu/packages/radio.scm (wfview)[inputs]: Replace qcustomplot with
qcustomplot-qt5.
Change-Id: I781fb0f94b341c039d4f192c24c797e64e549426
---
gnu/packages/databases.scm | 2 +-
gnu/packages/qt.scm | 9 ++++++++-
gnu/packages/radio.scm | 2 +-
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 0464220994..e4c5d40361 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -5935,7 +5935,7 @@ a Gtk.Grid Widget.")
"-DFORCE_INTERNAL_QHEXEDIT=OFF"
"-DENABLE_TESTING=ON")))
(inputs
- (list qcustomplot
+ (list qcustomplot-qt5
qhexedit
qscintilla
qtbase-5
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ebd58a5eb4..5db5ab452a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -5511,7 +5511,7 @@ color-related widgets.")
(sha256
(base32
"1h5l29q82grz94z5ch95vq6hs5clcymbcb3yngqfsh47gsffmmim"))))))
(inputs
- (list qtbase-5))
+ (list qtbase))
(build-system gnu-build-system)
(arguments
`(#:phases
@@ -5541,6 +5541,13 @@ color-related widgets.")
"QCustomPlot is a Qt C++ widget providing 2D plots, graphs and charts.")
(license license:gpl3+)))
+(define-public qcustomplot-qt5
+ (package/inherit qcustomplot
+ (name "qcustomplot-qt5")
+ (inputs
+ (modify-inputs (package-inputs qcustomplot)
+ (replace "qtbase" qtbase-5)))))
+
;; TODO: Split shiboken2 binding generator into a dedicated output.
;; This executable requires libxml2, libxslt, clang-toolchain at runtime.
;; The libshiboken library only requires Qt and Python at runtime.
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 9f05117042..02b76e2128 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -3185,7 +3185,7 @@ software-defined radio receivers.")
opus
portaudio
pulseaudio
- qcustomplot
+ qcustomplot-qt5
qtgamepad-5
qtbase-5
qtmultimedia-5