guix_mirror_bot pushed a commit to branch qt-team-old in repository guix. commit 7ce10c9cde18d2d70b50f89920ad5bd33eab004d 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/music.scm | 2 +- gnu/packages/qt.scm | 6 +++--- gnu/packages/tex.scm | 2 +- gnu/packages/xdisorg.scm | 2 +- 9 files changed, 13 insertions(+), 14 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index b1a342692b..8676a72642 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -7495,7 +7495,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 qtwebengine-5 diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 3366184c18..e301f5898f 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6044,7 +6044,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 bb5d887d8f..98fbff4e0c 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -315,7 +315,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 @@ -1265,4 +1265,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 4f241cc2e3..9acac733b0 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 2dae38739c..f4a5af205f 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -1057,7 +1057,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/music.scm b/gnu/packages/music.scm index 672d69b1c2..076a706348 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -5524,7 +5524,7 @@ includes LV2 plugins and a JACK standalone client.") qtnetworkauth-5 qtquickcontrols-5 qtquickcontrols2-5 - qtscript + qtscript-5 qtsvg-5 qtx11extras qtxmlpatterns)) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 0b1c46cb42..0c6581fc65 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -460,7 +460,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 @@ -2575,7 +2575,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") @@ -5118,7 +5118,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 bfc923c8e3..f6b045924e 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -71809,7 +71809,7 @@ PDF documents.") (string-append "METAINFODIR=" out "/share/metainfo") "texmaker.pro"))))))) (inputs - (list poppler-qt5 qtbase-5 qtscript zlib)) + (list poppler-qt5 qtbase-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 8c05247836..c5745de1a3 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -474,7 +474,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