From 0a683fa6b64c80534802a18971e4f3b16eef368b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 8 Feb 2025 12:26:37 +0800 Subject: [PATCH] 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. Change-Id: I63c40a342a14c75cfbe4e0a4c27ec2638212e38a Signed-off-by: Zheng Junjie --- gnu/packages/astronomy.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/irc.scm | 2 +- gnu/packages/kde-frameworks.scm | 6 +++--- gnu/packages/kde-utils.scm | 2 +- gnu/packages/qt.scm | 6 +++--- gnu/packages/tex.scm | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index a2bd1287086bec28dfb49894637e76814f9a6915..d228b554c3cbbf2ebab042a86521bc857f5182e2 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -9104,7 +9104,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 21f01a83ae3cff35967071a73004d5ff630cd176..4eddaf9cc0afa4994592f20b46264125c8182c61 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -6492,7 +6492,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 8f92dd1ccbecf3eba270987efa7c834f24db9db2..1ff8eb1cffbbedc9c4dd10d881c903ff3031360a 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -317,7 +317,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 diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 11d0498b5dc21ff5323fe92b651c0835fcb5c772..8ed91bdcfcb056c43af7afba28e66f410cbc2783 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1191,7 +1191,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 @@ -4039,7 +4039,7 @@ KIO enabled infrastructure.") libxslt qtbase-5 qtdeclarative-5 - qtscript + qtscript-5 qtx11extras sonnet-5 `(,util-linux "lib") ; libmount @@ -4704,7 +4704,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 37a962248e79f489f61d0869621ee4825948a08c..c2fa6a6cdeaed6c9216e6064fb142de45159cebd 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -1130,7 +1130,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 f3bd00369969f55a6c8da0714d0b27ad06b00885..008ef562079ce6f584ffae00d6f1a21e5ca66653 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -464,7 +464,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 @@ -2639,7 +2639,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") @@ -5451,7 +5451,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 2c095f97207f5c1050986cd5ebb11deb84930c8a..b9a3c2222b813a305100996e825dbfdfb880033a 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -77482,7 +77482,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/")