guix_mirror_bot pushed a commit to branch master
in repository guix.

commit 17731218dd994a62b591188b27049ed4110cc12f
Author: nomike <[email protected]>
AuthorDate: Thu Jul 2 21:57:22 2026 +0200

    gnu: Add qscintilla-qt6.
    
    * gnu/packages/qt.scm (qscintilla-qt6): New variable, obtained from
    qscintilla-qt5 by changing the name and replacing qtbase-5 in native-inputs
    by qtbase.
    (qscintilla-qt5): Inherit from qscintilla-qt6.
    
    Signed-off-by: Andreas Enge <[email protected]>
---
 gnu/packages/qt.scm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index f51165886f..8e6577cbc9 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -4902,9 +4902,9 @@ bindings (PySide, PySide2, PyQt4 and PyQt5).")
 @end itemize")
     (license license:bsd-3)))
 
-(define-public qscintilla-qt5
+(define-public qscintilla-qt6
   (package
-    (name "qscintilla-qt5")
+    (name "qscintilla-qt6")
     (version "2.14.1")
     (source (origin
               (method url-fetch)
@@ -4934,7 +4934,7 @@ bindings (PySide, PySide2, PyQt4 and PyQt5).")
                  (("\\$\\$\\[QT_HOST_DATA\\]")
                  (string-append out "/lib/qt$${QT_MAJOR_VERSION}")))
                (invoke "qmake")))))))
-    (native-inputs (list qtbase-5))
+    (native-inputs (list qtbase))
     (home-page 
"https://www.riverbankcomputing.co.uk/software/qscintilla/intro";)
     (synopsis "Qt port of the Scintilla C++ editor control")
     (description "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++
@@ -4943,6 +4943,12 @@ and debugging source code.  These include support for 
syntax styling, error
 indicators, code completion and call tips.")
     (license license:gpl3+)))
 
+(define-public qscintilla-qt5
+  (package
+    (inherit qscintilla-qt6)
+    (name "qscintilla-qt5")
+    (native-inputs (list qtbase-5))))
+
 ;; 2026-07-17
 (define-deprecated-package qscintilla qscintilla-qt5)
 

Reply via email to