gnu: qscintilla: Rename to qscintilla-qt5.

* gnu/packages/qt.scm (qscintilla): Deprecate in favor of...
(qscintilla-qt5): ...this renamed package.
[name]: Change to "qscintilla-qt5".
(python-qscintilla)[arguments, inputs]: Replace qscintilla with
qscintilla-qt5.
* gnu/packages/databases.scm (sqlitebrowser)[arguments, inputs]: Replace
qscintilla with qscintilla-qt5.
* gnu/packages/engineering.scm (openscad)[inputs]: Likewise.
* gnu/packages/geo.scm (qgis)[inputs]: Likewise.
* gnu/packages/graphics.scm (friction)[inputs]: Likewise.
* gnu/packages/maths.scm (octave)[inputs]: Likewise.
* gnu/packages/physics.scm (mantid)[inputs]: Likewise.

Change-Id: I287afccf0156f88068622dfd722a84f9892d8e25
Signed-off-by: Andreas Enge <andreas@enge.fr>

7 files changed, 16 insertions, 13 deletions

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 410ae0115b9..b3c5a549cb9 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -6213,7 +6213,7 @@ storage that supports JSON and array introspection.")
     (arguments
      (list #:configure-flags
            #~(list (string-append "-DQSCINTILLA_INCLUDE_DIR="
-                                  #$(this-package-input "qscintilla")
+                                  #$(this-package-input "qscintilla-qt5")
                                   "/include/Qsci")
                    "-DFORCE_INTERNAL_QCUSTOMPLOT=OFF"
                    "-DFORCE_INTERNAL_QHEXEDIT=OFF"
@@ -6221,7 +6221,7 @@ storage that supports JSON and array introspection.")
     (inputs
      (list qcustomplot-qt5
            qhexedit
-           qscintilla
+           qscintilla-qt5
            qtbase-5
            qtwayland-5
            sqlite))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index a36996115a6..1f0a67d7564 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3140,7 +3140,7 @@ ontinuous-time and discret-time expressions.")
                     python
                     python-numpy
                     python-pillow
-                    qscintilla
+                    qscintilla-qt5
                     qtbase-5
                     qtgamepad-5
                     qtmultimedia-5
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 57bdcd52486..7b77c604de4 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -4019,7 +4019,7 @@ SET\\(PYQT5_SIP_DIR \"\\$\\{Python_SITEARCH\\}/PyQt5/bindings\"\\)")
            python-six
            python-urllib3
            qca
-           qscintilla
+           qscintilla-qt5
            qt3d-5
            qtbase-5
            qtdeclarative-5
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 1d81a663a05..68e7eb86688 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -476,7 +476,7 @@ objects!")
            libunwind
            libwebp
            python
-           qscintilla
+           qscintilla-qt5
            qtbase-5
            qtdeclarative-5
            qtmultimedia-5
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index a28ce2420ce..966d8f29a0a 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3624,7 +3624,7 @@ script files.")
   (package (inherit octave-cli)
     (name "octave")
     (inputs
-     `(("qscintilla" ,qscintilla)
+     `(("qscintilla-qt5" ,qscintilla-qt5)
        ("qt" ,qtbase-5)
        ("qtwayland" ,qtwayland-5)
        ,@(package-inputs octave-cli)))
diff --git a/gnu/packages/physics.scm b/gnu/packages/physics.scm
index a029164722d..9b12efd53f7 100644
--- a/gnu/packages/physics.scm
+++ b/gnu/packages/physics.scm
@@ -1981,7 +1981,7 @@ import matplotlib.pyplot as plt"))
            python-qtpy
            python-pyqt5-sip
            python-pyqtwebengine
-           qscintilla
+           qscintilla-qt5
            qtbase-5
            qtsvg-5
            qttools-5
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 5845d02d6a0..364bd909d2a 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
+(define-public qscintilla-qt5
   (package
-    (name "qscintilla")
+    (name "qscintilla-qt5")
     (version "2.13.4")
     (source (origin
               (method url-fetch)
@@ -4943,8 +4943,11 @@ and debugging source code.  These include support for syntax styling, error
 indicators, code completion and call tips.")
     (license license:gpl3+)))
 
+;; 2026-07-17
+(define-deprecated-package qscintilla qscintilla-qt5)
+
 (define-public python-qscintilla
-  (package/inherit qscintilla
+  (package/inherit qscintilla-qt5
     (name "python-qscintilla")
     (build-system pyproject-build-system)
     (arguments
@@ -4955,10 +4958,10 @@ indicators, code completion and call tips.")
                  (lambda _
                    (setenv "CFLAGS" (string-append
                                      "--qsci-include-dir"
-                                     #$(this-package-input "qscintilla")
+                                     #$(this-package-input "qscintilla-qt5")
                                      "/include"
                                      " --qsci-library-dir"
-                                     #$(this-package-input "qscintilla")
+                                     #$(this-package-input "qscintilla-qt5")
                                      "/lib"))))
                (add-after 'unpack 'prepare-build
                  (lambda _
@@ -4976,7 +4979,7 @@ indicators, code completion and call tips.")
     (native-inputs
      (list python-pyqt-builder qtbase-5))
     (inputs
-     (list python-pyqt python-sip qscintilla))
+     (list python-pyqt python-sip qscintilla-qt5))
     (description "QScintilla is a port to Qt of Neil Hodgson's Scintilla C++
 editor control.  QScintilla includes features especially useful when editing
 and debugging source code.  These include support for syntax styling, error