andreas pushed a commit to branch qt-team
in repository guix.
commit 8d60183ee30dc636d182923cbe4475e6c0e48171
Author: 宋文武 <iyzs...@member.fsf.org>
AuthorDate: Sat Feb 8 12:26:37 2025 +0800
gnu: qtscript: Rename to qtscript-5.
* gnu/packages/qt.scm (qtscript): Rename to qtscript-5.
(python-pyside-2) [inputs]: Adjust accordingly.
(grantlee) [inputs]: Likewise.
* gnu/packages/astronomy.scm (stellarium) [inputs]: Likewise.
* gnu/packages/games.scm (warzone2100) [inputs]: Likewise.
* gnu/packages/irc.scm (quassel) [inputs]: Likewise.
* gnu/packages/kde-frameworks.scm (ki18n-5) [inputs]: Likewise.
(kio-5) [inputs]: Likewise.
(ktexteditor-5) [inputs]: Likewise.
* gnu/packages/kde-utils.scm (okteta) [inputs]: Likewise.
* gnu/packages/music.scm (musescore) [inputs]: Likewise.
* gnu/packages/tex.scm (texmaker) [inputs]: Likewise.
* gnu/packages/xdisorg.scm (copyq) [inputs]: Likewise.
Change-Id: I63c40a342a14c75cfbe4e0a4c27ec2638212e38a
---
gnu/packages/astronomy.scm | 2 +-
gnu/packages/games.scm | 2 +-
gnu/packages/irc.scm | 3 +--
gnu/packages/kde-frameworks.scm | 6 +++---
gnu/packages/kde-utils.scm | 2 +-
gnu/packages/qt.scm | 6 +++---
gnu/packages/tex.scm | 2 +-
gnu/packages/xdisorg.scm | 2 +-
8 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index dfe1a7d6aa..63a1015bca 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -8203,7 +8203,7 @@ deconvolution). Such post-processing is not performed by
Stackistry.")
qtlocation-5
qtmultimedia-5
qtpositioning
- qtscript ; the last v5 left to rename
+ qtscript-5
qtserialport-5
qttranslations
qtwayland-5
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 59145a46c5..2ff318a0cb 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -6200,7 +6200,7 @@ in-window at 640x480 resolution or fullscreen.")
openal
physfs
qtbase-5
- qtscript
+ qtscript-5
openssl
sdl2
sqlite
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 4404c099e4..fc1007ea34 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -316,7 +316,7 @@ setting @env{LUA_PATH} and @env{LUA_CPATH} in glirc's
run-time environment.")
qca
qtbase-5
qtmultimedia-5
- qtscript
+ qtscript-5
qtsvg-5
snorenotify
sonnet
@@ -1284,4 +1284,3 @@ such as multiple users, numerous
@@url{https://ircv3.net/,IRCv3} extensions,
chat history playback and detached channels. It is well-suited for both small
and large deployments.")
(license license:agpl3)))
-
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index d1ed61aac7..76987e56bd 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1175,7 +1175,7 @@ translation scripting.")
(native-inputs
(list extra-cmake-modules))
(inputs
- (list qtbase-5 qtdeclarative-5 qtscript iso-codes/pinned))))
+ (list qtbase-5 qtdeclarative-5 qtscript-5 iso-codes/pinned))))
(define-public kidletime
(package
@@ -4069,7 +4069,7 @@ KIO enabled infrastructure.")
libxslt
qtbase-5
qtdeclarative-5
- qtscript
+ qtscript-5
qtx11extras
sonnet-5
`(,util-linux "lib") ; libmount
@@ -4727,7 +4727,7 @@ library.")
perl
qtbase-5
qtdeclarative-5
- qtscript
+ qtscript-5
qtxmlpatterns
solid-5
sonnet-5))
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 994597571c..49754018e1 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -1172,7 +1172,7 @@ either be created or generated from a image.")
qca
qtbase-5
qtdeclarative-5
- qtscript))
+ qtscript-5))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index c4ffca2a4b..b7c8daa32a 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -461,7 +461,7 @@ applications on Wayland.")
;; Optional: lcov and cccc, both are for code coverage
(list doxygen))
(inputs
- (list qtbase-5 qtdeclarative-5 qtscript))
+ (list qtbase-5 qtdeclarative-5 qtscript-5))
(build-system cmake-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases
@@ -2581,7 +2581,7 @@ the Qt community.")
;; LICENSES/Qt-GPL-exception-1.0.txt).
(license (list license:gpl3))))
-(define-public qtscript
+(define-public qtscript-5
(package
(inherit qtsvg-5)
(name "qtscript")
@@ -5305,7 +5305,7 @@ color-related widgets.")
qtmultimedia-5
qtquickcontrols-5
qtquickcontrols2-5
- qtscript
+ qtscript-5
qtscxml-5
qtsensors-5
qtspeech-5
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index 04632e8408..3cecea3b66 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -71810,7 +71810,7 @@ PDF documents.")
(string-append "METAINFODIR=" out "/share/metainfo")
"texmaker.pro")))))))
(inputs
- (list poppler-qt5 qtbase-5 qtwayland-5 qtscript zlib))
+ (list poppler-qt5 qtbase-5 qtwayland-5 qtscript-5 zlib))
(native-inputs
(list pkg-config))
(home-page "https://www.xm1math.net/texmaker/";)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 3b87d0e459..da5c92ca3e 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -476,7 +476,7 @@ and preserve leading and trailing whitespace.")
#:tests? #f)) ; Test suite is a rather manual process.
(inputs
(list qtbase-5
- qtscript
+ qtscript-5
qtsvg-5
qtx11extras
qtdeclarative-5
