From 0909c78e1b0763e68c3a8db9d70d56acf862657c Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Fri, 21 May 2021 18:32:53 -0500 Subject: [PATCH 20/37] gnu: qtscript: Remove variable. * gnu/packages/qt.scm (qtscript): Remove variable. * gnu/packages/qt.scm (qtscript-5): New variable. --- gnu/packages/astronomy.scm | 2 +- gnu/packages/engineering.scm | 2 +- gnu/packages/games.scm | 2 +- gnu/packages/irc.scm | 2 +- gnu/packages/kde-frameworks.scm | 8 ++++---- gnu/packages/kde-internet.scm | 2 +- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/kde-systemtools.scm | 2 +- gnu/packages/kde-utils.scm | 4 ++-- gnu/packages/kde.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/qt.scm | 6 +++--- gnu/packages/tex.scm | 2 +- gnu/packages/xdisorg.scm | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 32670ea1b4..d4e3dcecb9 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -415,7 +415,7 @@ deconvolution). Such post-processing is not performed by Stackistry.") `(("qtbase" ,qtbase-5) ("qtlocation" ,qtlocation-5) ("qtmultimedia" ,qtmultimedia-5) - ("qtscript" ,qtscript) + ("qtscript" ,qtscript-5) ("qtserialport" ,qtserialport-5) ("zlib" ,zlib))) (native-inputs diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index a20e5ec9af..f79c122850 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2701,7 +2701,7 @@ export filters.") (build-system cmake-build-system) (inputs `(("qtbase" ,qtbase-5) - ("qtscript" ,qtscript) + ("qtscript" ,qtscript-5) ("qtxmlpatterns" ,qtxmlpatterns-5) ("mesa" ,mesa) ("glu" ,glu) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6c9cfb7281..bb4e21f949 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -5200,7 +5200,7 @@ in-window at 640x480 resolution or fullscreen.") ("openal" ,openal) ("physfs" ,physfs) ("qtbase" ,qtbase-5) - ("qtscript" ,qtscript) + ("qtscript" ,qtscript-5) ("openssl" ,openssl) ("sdl2" ,sdl2) ("utfcpp" ,utfcpp))) diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm index 04be4e32d0..0d93b93e61 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -132,7 +132,7 @@ ("qca" ,qca) ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia-5) - ("qtscript" ,qtscript) + ("qtscript" ,qtscript-5) ("qtsvg" ,qtsvg-5) ("snorenotify" ,snorenotify) ("zlib" ,zlib))) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 01838ade2c..4e18af65fe 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -814,7 +814,7 @@ other special events for a geographical region.") (inputs `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtscript" ,qtscript))) + ("qtscript" ,qtscript-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -2782,7 +2782,7 @@ consumption.") ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("qtbase" ,qtbase-5) - ("qtscript" ,qtscript) + ("qtscript" ,qtscript-5) ("qtx11extras" ,qtx11extras-5) ("sonnet" ,sonnet))) (arguments @@ -3194,7 +3194,7 @@ types or handled by application specific code.") ("perl" ,perl) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtscript" ,qtscript) + ("qtscript" ,qtscript-5) ("qtxmlpatterns" ,qtxmlpatterns-5) ("solid" ,solid) ("sonnet" ,sonnet))) @@ -3904,7 +3904,7 @@ KParts instead.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("qtbase" ,qtbase-5) - ("qtscript" ,qtscript))) + ("qtscript" ,qtscript-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Frameworks 5 solution for application scripting") (description "Kross is a scripting bridge for the KDE Development Platform diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 223e1aab7a..c0fee36988 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -413,7 +413,7 @@ This package is part of the KDE networking module.") ("oxygen-icons" ,oxygen-icons) ; default icon set ("phonon" ,phonon) ("qtbase" ,qtbase-5) - ("qtscript" ,qtscript) + ("qtscript" ,qtscript-5) ("qtwebkit" ,qtwebkit) ("solid" ,solid) ("syndication" ,syndication) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 994312fd1a..f15cf1fe65 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -263,7 +263,7 @@ basic needs and easy to configure for those who want special setups.") ("kservice" ,kservice) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtscript" ,qtscript) + ("qtscript" ,qtscript-5) ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras-5) ("plasma" ,plasma-framework) diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index e951031e18..619323ee91 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -214,7 +214,7 @@ document meta data file.") ("kxmlgui" ,kxmlgui) ("oxygen-icons" ,oxygen-icons) ;; default icon set ("qtbase" ,qtbase-5) - ("qtscript" ,qtscript))) + ("qtscript" ,qtscript-5))) (arguments `(#:tests? #f)) ;; TODO: 2/15 tests fail even with HOME, offscreen, SHELL, debus (home-page "http://www.kde.org/") diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index de907ae713..08f0d930bd 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -69,7 +69,7 @@ ("kxmlgui" ,kxmlgui) ("oxygen-icons" ,oxygen-icons) ;; default icon set ("qtbase" ,qtbase-5) - ("qtscript" ,qtscript))) + ("qtscript" ,qtscript-5))) (arguments `(#:tests? #f ;; 2/7 tests fail #:phases @@ -364,7 +364,7 @@ either be created or generated from a image.") ("oxygen-icons" ,oxygen-icons) ;; default icon set ("qca" ,qca) ("qtbase" ,qtbase-5) - ("qtscript" ,qtscript))) + ("qtscript" ,qtscript-5))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 75d39174de..cbfe007e34 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -244,7 +244,7 @@ browser for easy news reading.") ("rttr" ,rttr) ("mlt" ,mlt) ("qtbase" ,qtbase-5) - ("qtscript" ,qtscript) + ("qtscript" ,qtscript-5) ("qtsvg" ,qtsvg-5) ("qtmultimedia" ,qtmultimedia-5) ("kparts" ,kparts) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 1e99ef5782..579044728c 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4745,7 +4745,7 @@ standalone JACK client and an LV2 plugin is also available.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtquickcontrols2" ,qtquickcontrols2) - ("qtscript" ,qtscript) + ("qtscript" ,qtscript-5) ("qtsvg" ,qtsvg-5) ("qtxmlpatterns" ,qtxmlpatterns-5))) (native-inputs diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 10c20d62e4..f8dbee62a3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -264,7 +264,7 @@ applications on Wayland.") (inputs `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtscript" ,qtscript))) + ("qtscript" ,qtscript-5))) (build-system cmake-build-system) (arguments `(#:phases @@ -1454,7 +1454,7 @@ that helps in Qt development."))) the documentation, translate applications, generate help files and other stuff that helps in Qt development."))) -(define-public qtscript +(define-public qtscript-5 (package (inherit qtsvg-5) (name "qtscript") (version "5.15.2") @@ -3060,7 +3060,7 @@ color-related widgets.") ("qtlocation" ,qtlocation-5) ("qtmultimedia" ,qtmultimedia-5) ("qtquickcontrols" ,qtquickcontrols) - ("qtscript" ,qtscript) + ("qtscript" ,qtscript-5) ("qtscxml" ,qtscxml) ("qtsensors" ,qtsensors-5) ("qtspeech" ,qtspeech) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index 6e7609fafa..6e485e248b 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6501,7 +6501,7 @@ PDF documents.") (inputs `(("poppler-qt5" ,poppler-qt5) ("qtbase" ,qtbase-5) - ("qtscript" ,qtscript) + ("qtscript" ,qtscript-5) ("qtwebkit" ,qtwebkit) ("zlib" ,zlib))) (native-inputs diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 71b833961e..408d826b4a 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -318,7 +318,7 @@ with X11 or Wayland, or in a text terminal with ncurses.") #:tests? #f)) ; Test suite is a rather manual process. (inputs `(("qtbase" ,qtbase-5) - ("qtscript" ,qtscript) + ("qtscript" ,qtscript-5) ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras-5))) (synopsis "Clipboard manager with advanced features") -- 2.31.1