diff options
Diffstat (limited to 'gnu/packages')
33 files changed, 149 insertions, 149 deletions
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 87da0a965e..601e6e8734 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3232,7 +3232,7 @@ link REQUIRED)")))))) boost-sync yaml-cpp qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5 qtwebchannel qtwebsockets)) @@ -5455,7 +5455,7 @@ Rate} 3600x2250 bit/s vocoder used in various radio systems.") python ;for running tests portaudio ;for portaudio examples qtbase-5 ;for Qt examples - qtdeclarative + qtdeclarative-5 qttools)) (inputs (list jack-1 ;for JACK examples diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 71d8fae7f1..e19935daa8 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -86,7 +86,7 @@ libxkbcommon linux-pam qtbase-5 - qtdeclarative + qtdeclarative-5 ;; Some user-defined themes use QtQuick components internally. Adding ;; QtQuick & co. here; they end up in QML2_IMPORT_PATH thanks to ;; 'wrap-qt-program'. diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 9f87e67043..74356318a1 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -382,7 +382,7 @@ local system.") `(("libarchive" ,libarchive) ("sqlite" ,sqlite) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) ("qtquickcontrols" ,qtquickcontrols) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 998867918e..690de4d7de 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -180,7 +180,7 @@ of categories with some of the activities available in that category. (list openssl python-wrapper qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 qtquickcontrols @@ -558,7 +558,7 @@ specialized device.") opus poppler qtbase-5 - qtdeclarative + qtdeclarative-5 qtmultimedia-5 qtsvg-5 qtwebchannel @@ -672,7 +672,7 @@ language and very flexible regarding to new or unknown keyboard layouts.") libxcb libxkbfile qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtquickcontrols2 qtx11extras @@ -997,7 +997,7 @@ formats.") qtbase-5 qtmultimedia-5 qtquickcontrols2 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine zlib)) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index bcf024e437..3a757deddf 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2490,7 +2490,7 @@ comments."))) python-shiboken-2 python-wrapper qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5 qtwebchannel qtwebengine @@ -3422,7 +3422,7 @@ compiled translations. Prebuilt Firmware files are removed.") python-trimesh python-zeroconf qtbase - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtquickcontrols qtquickcontrols2 diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index ca2d8f6827..749c170fc7 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -392,7 +392,7 @@ the Anthy input method.") ("opencc" ,opencc) ("qtbase" ,qtbase-5) ("fcitx5-qt" ,fcitx5-qt) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))) (native-inputs diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index f59fb56f7a..3b3cd70257 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -803,7 +803,7 @@ the Monero command line client and daemon.") ("libgcrypt" ,libgcrypt) ("monero" ,monero) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2",qtquickcontrols2) diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index f9e8baffd4..f426532cb1 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -520,7 +520,7 @@ formats such as PNG.") "05gczsywkk45bh0z1vv8l6cmrlncc2qj8agavj5ryxpnxkzy69r1")))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtdeclarative qtsvg-5 zlib)) + (list qtbase-5 qtdeclarative-5 qtsvg-5 zlib)) (native-inputs (list qttools)) (arguments @@ -2623,7 +2623,7 @@ utilities frequently used in roguelikes.") ("openal" ,openal) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("sdl2" ,sdl2) ("uuid.h" ,util-linux "lib") ("zlib" ,zlib))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index ceac1d3390..51dec55bd7 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9270,7 +9270,7 @@ and also provides the base for the FlightGear Flight Simulator.") openscenegraph plib qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5 simgear speexdsp @@ -10248,7 +10248,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.") python-wrapper qtbase-5 qtmultimedia-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Stamp drawing toy") @@ -10294,7 +10294,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Number logic game") @@ -10332,7 +10332,7 @@ This package is part of the KDE games module.") ktextwidgets libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Miniature golf game") (description "Kolf is a miniature golf game for one to ten players. The @@ -10408,7 +10408,7 @@ other Mah Jongg like games.") libkdegames libkmahjongg qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Tile laying patience") @@ -10451,7 +10451,7 @@ This package is part of the KDE games module.") libkdegames libkmahjongg qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Shisen-Sho solitaire game") (description "KShisen is a solitaire-like game played using the standard @@ -10548,7 +10548,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Breakout like game") (description "KBreakout is similar to the classics breakout and xboing, @@ -10586,7 +10586,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Classical mine sweeper game") (description "KMines is a classic Minesweeper game. The idea is to @@ -10622,7 +10622,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Simple turn-based strategy game") @@ -10661,7 +10661,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Jezzball arcade game") @@ -10699,7 +10699,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Single player falling blocks puzzle game") @@ -10742,7 +10742,7 @@ This package is part of the KDE games module.") libkdegames glu qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Sudoku puzzle game and solver") @@ -10798,7 +10798,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Place 5 equal pieces together, but wait, there are 3 new ones") (description "KLines is a simple but highly addictive one player game. @@ -10841,7 +10841,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Action and puzzle solving game") (description "KGoldrunner is an action game where the hero runs through a @@ -10884,7 +10884,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Three-in-a-row game") (description "KDiamond is a three-in-a-row game like Bejeweled. It @@ -10919,7 +10919,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Place 4 pieces in a row") @@ -10958,7 +10958,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Find atoms in a grid by shooting electrons") @@ -10999,7 +10999,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Turn the board pieces to get all computers connected") (description "KNetWalk is a small game where you have to build up a @@ -11037,7 +11037,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Arcade bombing game") (description "Bomber is a single player arcade game. @@ -11081,7 +11081,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Bomberman clone") @@ -11117,7 +11117,7 @@ This package is part of the KDE games module.") phonon qca qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5 zlib)) (home-page "https://games.kde.org/") @@ -11178,7 +11178,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5 shared-mime-info)) (home-page "https://games.kde.org/") @@ -11219,7 +11219,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Yahtzee dice game") (description "Kiriki is an addictive and fun dice game, designed to be @@ -11258,7 +11258,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Go board game") @@ -11303,7 +11303,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Game based on Rubik's Cube") @@ -11343,7 +11343,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Lieutnant Skat card game") @@ -11381,7 +11381,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Pac-Man clone") @@ -11420,7 +11420,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Two player game with shooting spaceships flying around a sun") @@ -11453,7 +11453,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Classic pen and paper game: five in a line") @@ -11492,7 +11492,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Port of the classic BSD console game robots") (description "Killbots is a simple game of evading killer robots. @@ -11533,7 +11533,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Snake race played against the computer") @@ -11570,7 +11570,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Simple ball dodging game") (description "In Kollision you use mouse to control a small blue ball in a @@ -11610,7 +11610,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Battleship board game with built-in game server") (description "KBattleship is a Battle Ship game for KDE. @@ -11649,7 +11649,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Old reversi board game, also known as othello") @@ -11690,7 +11690,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://games.kde.org/") (synopsis "Dots and Boxes game") (description "KSquares is an implementation of the popular paper based @@ -11726,7 +11726,7 @@ This package is part of the KDE games module.") kxmlgui libkdegames qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Simple tactical game for number-crunchers") diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 0c98d57821..0eaa64375d 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1958,7 +1958,7 @@ using the dataset of topographical information collected by libjpeg-turbo proj qtbase-5 - qtdeclarative + qtdeclarative-5 qtlocation qtwebchannel qtwebengine @@ -2618,7 +2618,7 @@ growing set of geoscientific methods.") qca qscintilla qtbase-5 - qtdeclarative + qtdeclarative-5 qtkeychain qtlocation qtserialport diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 98d30d54ed..d4b13cc90e 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1091,7 +1091,7 @@ combine the information contained in both.") ,(map (lambda (label) (string-append (assoc-ref inputs label) "/lib/qt5/plugins")) - '("qtbase" "qtdeclarative")))))))))) + '("qtbase" "qtdeclarative-5")))))))))) (inputs (list curl fftw @@ -1104,7 +1104,7 @@ combine the information contained in both.") insight-toolkit-4.12 vtk-7 qtbase-5 - qtdeclarative + qtdeclarative-5 vxl-1 zlib)) (native-inputs diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 2d3b8aa46f..2a472fb633 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -519,7 +519,7 @@ It supports JPEG, PNG and GIF formats.") (list pkg-config qttools)) (inputs (list qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5 boost eigen @@ -532,7 +532,7 @@ It supports JPEG, PNG and GIF formats.") lcms openexr-2 qtwebengine - qtdeclarative + qtdeclarative-5 qtwebchannel fftwf gsl diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 8f4c56842b..181068cc24 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -608,7 +608,7 @@ decentralized calling using P2P-DHT.") qtwebengine qtwebchannel qtmultimedia-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtquickcontrols qtquickcontrols2)) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 3dffcdf813..1c10183f29 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -304,7 +304,7 @@ http://freedesktop.org/wiki/Specifications/open-collaboration-services/") (native-inputs (list dbus extra-cmake-modules)) (inputs - ;; TODO: qtdeclarative (yields one failing test) + ;; TODO: qtdeclarative-5 (yields one failing test) (list qtbase-5)) (arguments (list #:configure-flags @@ -775,7 +775,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") (native-inputs (list extra-cmake-modules qttools)) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (home-page "https://invent.kde.org/frameworks/kholidays") (synopsis "Library for regional holiday information") (description "This library provides a C++ API that determines holiday and @@ -802,7 +802,7 @@ other special events for a geographical region.") (native-inputs (list extra-cmake-modules)) (inputs - (list qtbase-5 qtdeclarative qtscript)) + (list qtbase-5 qtdeclarative-5 qtscript)) (arguments `(#:phases (modify-phases %standard-phases @@ -875,7 +875,7 @@ or user activity.") ;; introducing a recursive dependency. ;;("plasma-frameworks" ,plasma-framework) ;; Tier 3! qtbase-5 - qtdeclarative + qtdeclarative-5 qtquickcontrols2 qtsvg-5 ;; Run-time dependency @@ -904,7 +904,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") (native-inputs (list extra-cmake-modules)) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Set of item models extending the Qt model-view framework") (description "KItemModels provides the following models: @@ -1306,7 +1306,7 @@ provides uniform access to generation of barcodes with data.") (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list glib pulseaudio qtdeclarative qtbase-5)) + (list glib pulseaudio qtdeclarative-5 qtbase-5)) (home-page "https://invent.kde.org/libraries/pulseaudio-qt/") (synopsis "Qt bindings for PulseAudio") (description @@ -1341,7 +1341,7 @@ libpulse.") kiconthemes ; optional kirigami qtbase-5 - qtdeclarative + qtdeclarative-5 qtquickcontrols2)) (home-page "https://community.kde.org/Frameworks") (synopsis "QtQuickControls2 style that integrates with the desktop") @@ -1376,7 +1376,7 @@ feel.") (list bison dbus extra-cmake-modules flex qttools)) (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("udev" ,eudev))) ;; TODO: Add runtime-only dependency MediaPlayerInfo (home-page "https://community.kde.org/Frameworks") @@ -1476,7 +1476,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." kwindowsystem kxmlgui qtbase-5 - qtdeclarative + qtdeclarative-5 solid)) (home-page "https://community.kde.org/Frameworks") (synopsis "Core components for the KDE Activity concept") @@ -2053,7 +2053,7 @@ between feed formats.") kxmlgui lmdb qtbase-5 - qtdeclarative + qtdeclarative-5 solid)) (arguments `(#:phases @@ -2108,7 +2108,7 @@ maintaining an index of the contents of your files.") (native-inputs (list extra-cmake-modules)) (inputs - (list boost kactivities kconfig qtbase-5 qtdeclarative)) + (list boost kactivities kconfig qtbase-5 qtdeclarative-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Access usage statistics collected by the activity manager") (description "The KActivitiesStats library provides a querying mechanism for @@ -2205,7 +2205,7 @@ using the XBEL format.") kwidgetsaddons kxmlgui qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (home-page "https://community.kde.org/Frameworks") (synopsis "Utilities for KDE System Settings modules") (description "KCMUtils provides various classes to work with KCModules. @@ -2293,7 +2293,7 @@ their settings.") kxmlgui libepoxy qtbase-5 - qtdeclarative + qtdeclarative-5 solid)) (arguments `(#:phases @@ -2761,7 +2761,7 @@ KIO enabled infrastructure.") ktextwidgets kwidgetsaddons qtbase-5 - qtdeclarative + qtdeclarative-5 solid sonnet)) (arguments @@ -2897,7 +2897,7 @@ widgets with a user-interface defined in terms of actions.") kservice kwidgetsaddons qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (arguments `(#:tests? #f)) ; FIXME: 1/3 tests fail. (home-page "https://community.kde.org/Frameworks") @@ -2947,7 +2947,7 @@ to easily extend the contacts collection.") kwindowsystem kxmlgui qtbase-5 - qtdeclarative + qtdeclarative-5 solid threadweaver)) (arguments @@ -3078,7 +3078,7 @@ types or handled by application specific code.") libgit2 perl qtbase-5 - qtdeclarative + qtdeclarative-5 qtscript qtxmlpatterns solid @@ -3337,7 +3337,7 @@ setUrl, setUserAgent and call.") ("kxmlgui" ,kxmlgui) ("phonon" ,phonon) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg-5" ,qtsvg-5) ("qtx11extras" ,qtx11extras) @@ -3384,7 +3384,7 @@ script engines.") kio kirigami qtbase-5 - qtdeclarative)) + qtdeclarative-5)) (arguments `(#:tests? #f ;; seem to require network; don't find QTQuick components #:phases diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index b60b4ee489..1c79cd16bc 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -172,7 +172,7 @@ This package is part of the KDE multimedia module.") oxygen-icons ; default icon set phonon qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects ; not listed as dependency qtmultimedia-5 qtquickcontrols @@ -335,7 +335,7 @@ This package is part of the KDE multimedia module.") kxmlgui libvorbis qtbase-5 - qtdeclarative + qtdeclarative-5 qtmultimedia-5 readline taglib @@ -529,7 +529,7 @@ autoloading of subtitle files for use while playing video.") oxygen-icons ; default icon set purpose qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtquickcontrols qtquickcontrols2 ; not listed as dependency diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index a5acbb0da8..06da6db29a 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -724,7 +724,7 @@ for KDE PIM.") ;; TODO: libkolab qca qtbase-5 - qtdeclarative + qtdeclarative-5 qtnetworkauth qtspeech qtwebchannel @@ -1070,7 +1070,7 @@ and retrieving certificates from LDAP servers.") oxygen-icons ; default icon set, required for tests qgpgme qtbase-5 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine sonnet)) @@ -1322,7 +1322,7 @@ using a Qt/KMime C++ API.") qca qgpgme qtbase-5 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine qtwebkit @@ -1848,7 +1848,7 @@ and allows one to view/extract message formatted text in Rich Text Format.") kwallet kwindowsystem qtbase-5 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine)) (arguments @@ -1931,7 +1931,7 @@ KDE using certificate-based crypto.") kwindowsystem libkdepim qtbase-5 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine)) (arguments diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 2317cbec5a..da6912affe 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -78,7 +78,7 @@ kwayland ; optional kwindowsystem qtbase-5 - qtdeclarative ; optional + qtdeclarative-5 ; optional qtx11extras)) (home-page "https://invent.kde.org/plasma/breeze") (synopsis "Default KDE Plasma theme") @@ -209,7 +209,7 @@ call it if it is not associated to a terminal.") ("linux-pam" ,linux-pam) ("logind" ,elogind) ;optional loginctl support ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtx11extras" ,qtx11extras) ("solid" ,solid) ("wayland" ,wayland) @@ -276,7 +276,7 @@ basic needs and easy to configure for those who want special setups.") ("kwidgetsaddons" ,kwidgetsaddons) ("kservice" ,kservice) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtscript" ,qtscript) ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index ec3470aa0a..512c2acfef 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -531,7 +531,7 @@ remind you to take a break now and then.") oxygen-icons ;; default icon set plasma-framework qtbase-5 - qtdeclarative + qtdeclarative-5 solid)) (home-page "https://kde.org/applications/utilities/org.kde.smb4k") (synopsis "Samba (SMB) share advanced browser") diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index ff02723ab1..a0d73b5252 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -205,7 +205,7 @@ This package contains GUI widgets for baloo.") libkleo qgpgme qtbase-5 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine syndication)) @@ -285,7 +285,7 @@ browser for easy news reading.") mlt purpose qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 qtnetworkauth @@ -345,7 +345,7 @@ projects.") ("libkomparediff2" ,libkomparediff2) ("oxygen-icons" ,oxygen-icons) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtquickcontrols" ,qtquickcontrols) ;; not checked as requirement ("qtquickcontrols2" ,qtquickcontrols2) ;; not checked as requirement ("qtwebkit" ,qtwebkit) @@ -539,7 +539,7 @@ expression library, that is used in Krita.") perl poppler-qt5 qtbase-5 - qtdeclarative + qtdeclarative-5 qtmultimedia-5 qtsvg-5 qtx11extras @@ -745,7 +745,7 @@ different notification systems.") pulseaudio-qt qca qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 qtquickcontrols @@ -863,7 +863,7 @@ to perform data analysis.") (native-inputs (list extra-cmake-modules)) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (home-page "https://phabricator.kde.org/source/kqtquickcharts/") (synopsis "Interactive charts for Qt Quick") (description @@ -977,7 +977,7 @@ Python, PHP, and Perl.") libsndfile openal qtbase-5 - qtdeclarative + qtdeclarative-5 qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Runtime library for kdegames") @@ -1024,7 +1024,7 @@ Python, PHP, and Perl.") phonon protobuf qtbase-5 - qtdeclarative + qtdeclarative-5 qtlocation qtserialport qtsvg-5 @@ -1094,7 +1094,7 @@ creating routes by drag and drop and more.") phonon poppler-qt5 qca - qtdeclarative + qtdeclarative-5 qtsvg-5 threadweaver kcrash @@ -1225,7 +1225,7 @@ or Bonjour by other projects).") ;;("phpunit" ,phpunit) )) (inputs - (list qtbase-5 qtcharts qtdeclarative qtsvg-5)) + (list qtbase-5 qtcharts qtdeclarative-5 qtsvg-5)) (arguments `(#:tests? #f)) ;; 4/17 fail (home-page "https://api.kde.org/frameworks/kuserfeedback/html/") diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 0beac88d32..d30f598c7e 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -852,7 +852,7 @@ and video calls or instant messaging capabilities to an application.") mediastreamer2 ortp qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtquickcontrols qtquickcontrols2 diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 77aba8ee8a..cc2525aa57 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1476,7 +1476,7 @@ default.") (inputs (list kirigami knotifications qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtlocation qtquickcontrols2 @@ -2457,7 +2457,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") mtxclient openssl qtbase-5 - qtdeclarative + qtdeclarative-5 qtkeychain qtgraphicaleffects qtmultimedia-5 @@ -2497,7 +2497,7 @@ notification, emojis, E2E encryption, and voip calls.") (inputs (list libqmatrixclient qtbase-5 - qtdeclarative + qtdeclarative-5 qtmultimedia-5 qtquickcontrols qtquickcontrols2 @@ -2911,7 +2911,7 @@ as phones, embedded computers or microcontrollers.") "\"../build")) #t))))) (inputs - (list qtbase-5 qtdeclarative qtwebchannel)) + (list qtbase-5 qtdeclarative-5 qtwebchannel)) (propagated-inputs (list qtwebengine)) (home-page "https://movim.eu/") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index c413be2bb3..ed188da94a 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2261,7 +2261,7 @@ users to select LV2 plugins and run them with jalv.") portmidi protobuf qtbase-5 - qtdeclarative + qtdeclarative-5 qtkeychain qtscript qtsvg-5 @@ -4757,7 +4757,7 @@ includes LV2 plugins and a JACK standalone client.") portmidi pulseaudio qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtquickcontrols2 qtscript diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index f4e689cf6f..25f65d0a90 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -258,7 +258,7 @@ applications on Wayland.") ;; Optional: lcov and cccc, both are for code coverage (list doxygen)) (inputs - (list qtbase-5 qtdeclarative qtscript)) + (list qtbase-5 qtdeclarative-5 qtscript)) (build-system cmake-build-system) (arguments `(#:phases @@ -1009,14 +1009,14 @@ from within Qt 5."))) (("qxmlquery") "# qxmlquery") (("xmlpatterns ") "# xmlpatterns")) #t)))))) - (native-inputs (list perl qtdeclarative)) + (native-inputs (list perl qtdeclarative-5)) (inputs (list qtbase-5)) (synopsis "Qt XML patterns module") (description "The QtXmlPatterns module is a XQuery and XPath engine for XML and custom data models. It contains programs such as xmlpatterns and xmlpatternsvalidator."))) -(define-public qtdeclarative +(define-public qtdeclarative-5 (package (inherit qtsvg-5) (name "qtdeclarative") (version "5.15.2") @@ -1035,7 +1035,7 @@ xmlpatternsvalidator."))) (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) ;; The Qt5Core install prefix is set to qtbase, but qmlcachegen - ;; is provided by qtdeclarative. + ;; is provided by qtdeclarative-5. (substitute* "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake" (("\\$\\{_qt5Core_install_prefix\\}") out))) @@ -1067,7 +1067,7 @@ with JavaScript and C++."))) (base32 "185zci61ip1wpjrygcw2m6v55lvninc0b8y2p3jh6qgpf5w35003")))) (native-inputs - (list perl pkg-config qtdeclarative)) + (list perl pkg-config qtdeclarative-5)) (inputs (list bluez qtbase-5)) (synopsis "Qt Connectivity module") @@ -1088,7 +1088,7 @@ with Bluetooth and NFC."))) (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs - (list perl qtdeclarative)) + (list perl qtdeclarative-5)) (inputs (list qtbase-5)) (synopsis "Qt Web Sockets module") (description "WebSocket is a web-based protocol designed to enable two-way @@ -1119,7 +1119,7 @@ consume data received from the server, or both."))) (("QTest::newRow(\"twist\") << \"twist\"") "")) ;failing test #t)))))) (native-inputs - (list perl qtdeclarative)) + (list perl qtdeclarative-5)) (inputs (list qtbase-5)) (synopsis "Qt Sensors module") (description "The Qt Sensors API provides access to sensor hardware via QML @@ -1158,7 +1158,7 @@ recognition API for devices."))) (string-append "PREFIX=" out))))))) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs - (list perl pkg-config python qtdeclarative)) + (list perl pkg-config python qtdeclarative-5)) (inputs (list alsa-lib mesa @@ -1297,7 +1297,7 @@ set of plugins for interacting with pulseaudio and GStreamer.") (setenv "DBUS_FATAL_WARNINGS" "0") #t)))))) (native-inputs - (list glib perl pkg-config qtdeclarative)) + (list glib perl pkg-config qtdeclarative-5)) (inputs `(("fontconfig" ,fontconfig) ("freetype" ,freetype) @@ -1386,7 +1386,7 @@ and others."))) (base32 "1h9y634phvvk557mhmf9z4lmxr41rl8x9mqy2lzp31mk8ffffzqj")))) (native-inputs - (list perl qtdeclarative qtwebsockets)) + (list perl qtdeclarative-5 qtwebsockets)) (inputs (list qtbase-5)) (synopsis "Web communication library for Qt") (description "The Qt WebChannel module enables peer-to-peer communication @@ -1414,7 +1414,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) #t)))))) (native-inputs '()) (inputs - (list mesa qtbase-5 qtdeclarative qtwebsockets zlib)) + (list mesa qtbase-5 qtdeclarative-5 qtwebsockets zlib)) (synopsis "QPA plugin for running an application via a browser using streamed WebGL commands") (description "Qt back end that uses WebGL for rendering. It allows Qt @@ -1436,7 +1436,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) (native-inputs (list perl)) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Display web content in a QML application") (description "Qt WebView provides a way to display web content in a QML application without necessarily including a full web browser stack by using @@ -1459,7 +1459,7 @@ native APIs where it makes sense."))) (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs - (list perl qtdeclarative qtquickcontrols qtserialport)) + (list perl qtdeclarative-5 qtquickcontrols qtserialport)) (inputs (list icu4c openssl qtbase-5 zlib)) (synopsis "Qt Location and Positioning modules") @@ -1480,7 +1480,7 @@ positioning and geolocation plugins."))) (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs - (list perl qtdeclarative vulkan-headers)) + (list perl qtdeclarative-5 vulkan-headers)) (inputs (list mesa qtbase-5)) (synopsis "Qt Tools and Designer modules") @@ -1522,7 +1522,7 @@ ECMAScript and Qt."))) (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Quick Controls and other Quick modules") (description "The QtScript module provides classes for making Qt applications scriptable. This module provides a set of extra components that @@ -1542,7 +1542,7 @@ can be used to build complete interfaces in Qt Quick."))) (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Quick Controls 2 and other Quick 2 modules") (description "The Qt Quick Controls 2 module contains the Qt Labs Platform module that provides platform integration: native dialogs, menus and menu bars, @@ -1563,7 +1563,7 @@ not available."))) (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Graphical Effects module") (description "The Qt Graphical Effects module provides a set of QML types for adding visually impressive and configurable effects to user interfaces. @@ -1590,7 +1590,7 @@ coloring, and many more."))) ("libxrender" ,libxrender) ("sdl2" ,sdl2) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative-5" ,qtdeclarative-5))) (synopsis "Qt Gamepad module") (description "The Qt Gamepad module is an add-on library that enables Qt applications to support the use of gamepad hardware and in some cases remote @@ -1617,7 +1617,7 @@ and mobile applications targeting TV-like form factors."))) (("scion") "#")) #t)))) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt SCXML module") (description "The Qt SCXML module provides functionality to create state machines from SCXML files. This includes both dynamically creating state @@ -1636,7 +1636,7 @@ also contains functionality to support data models and executable content."))) (base32 "09rjx53519dfk4qj2gbn3vlxyriasyb747wpg1p11y7jkwqhs4l7")))) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Purchasing module") (description "The Qt Purchasing module provides and in-app API for purchasing goods and services."))) @@ -1655,7 +1655,7 @@ purchasing goods and services."))) (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Charts module") (description "The Qt Charts module provides a set of easy to use chart components. It uses the Qt Graphics View Framework, therefore charts can be @@ -1678,7 +1678,7 @@ selecting one of the charts themes.") (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Data Visualization module") (description "The Qt Data Visualization module provides a way to visualize data in 3D as bar, scatter, and surface graphs. It is especially useful for @@ -1739,7 +1739,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) "integration_multiprocess")) #t)))))) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Qt Remote Objects module") (description "The Qt Remote Objects module is an @dfn{inter-process communication} (IPC) module developed for Qt. The idea is to extend existing @@ -1763,7 +1763,7 @@ processes or computers."))) (inputs (list qtbase-5)) (native-inputs - (list perl qtdeclarative qtmultimedia-5 qtxmlpatterns)) + (list perl qtdeclarative-5 qtmultimedia-5 qtxmlpatterns)) (synopsis "Qt Speech module") (description "The Qt Speech module enables a Qt application to support accessibility features such as text-to-speech, which is useful for end-users @@ -2087,7 +2087,7 @@ using the Enchant spell-checking library.") protobuf pulseaudio qtbase-5 - qtdeclarative + qtdeclarative-5 qtmultimedia-5 qtwebchannel re2 @@ -2325,7 +2325,7 @@ module provides support functions to the automatically generated code.") `(("python" ,python-wrapper) ("qtbase" ,qtbase-5) ("qtconnectivity" ,qtconnectivity) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) ("qtsensors" ,qtsensors) @@ -2435,7 +2435,7 @@ contain over 620 classes.") ("python-pyqt" ,python-pyqt-without-qtwebkit) ("qtbase" ,qtbase-5) ("qtsvg-5" ,qtsvg-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))) (arguments @@ -2906,7 +2906,7 @@ different kinds of sliders, and much more.") ("fontconfig" ,fontconfig) ("libxrender" ,libxrender) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) ("qtsensors" ,qtsensors) @@ -2970,7 +2970,7 @@ time Web content can be enhanced with native controls.") (native-inputs (list qttools)) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (home-page "https://filcuc.github.io/DOtherSide/index.html") (synopsis "C language library for creating bindings for the Qt QML language") (description @@ -3137,7 +3137,7 @@ color-related widgets.") clang-toolchain qtbase-5 qtdatavis3d - qtdeclarative + qtdeclarative-5 qtlocation qtmultimedia-5 qtquickcontrols @@ -3186,7 +3186,7 @@ color-related widgets.") (string-append (assoc-ref inputs name) "/include/qt5")) '("qtdatavis3d" - "qtdeclarative" + "qtdeclarative-5" "qtlocation" "qtmultimedia-5" "qtquickcontrols" diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 8749a2be0e..1438d4fd7d 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1928,7 +1928,7 @@ receiver.") rtl-sdr qtbase-5 qtcharts - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 qtquickcontrols2 @@ -2159,7 +2159,7 @@ voice formats.") pulseaudio qtbase-5 qtcharts - qtdeclarative + qtdeclarative-5 qtlocation qtmultimedia-5 qtquickcontrols2 diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index 8669ed0db5..6f557d2b2b 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -88,7 +88,7 @@ poppler python ;need Python library qtbase-5 - qtdeclarative + qtdeclarative-5 zlib)) (native-inputs (list pkg-config qttools util-linux)) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 930c7431a3..11f9674720 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -857,7 +857,7 @@ devices.") (inputs (list qtbase-5 qtsvg-5 - qtdeclarative + qtdeclarative-5 qtwebsockets qtgraphicaleffects qtquickcontrols2 diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index ff38928846..23294e39f6 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -189,7 +189,7 @@ libzip openssl qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtkeychain qtquickcontrols2 diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 82f2b2717b..5ef93fc3f1 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -120,7 +120,7 @@ (native-inputs (list automake autoconf pkg-config)) (inputs - (list qtbase-5 qtdeclarative)) + (list qtbase-5 qtdeclarative-5)) (synopsis "Phone Simulator for modem testing") (description "Phonesim is a modem emulator that oFono uses for development and @@ -706,7 +706,7 @@ Mumble consists of two applications for separate usage: libsndfile libxml2 qtbase-5 - qtdeclarative + qtdeclarative-5 qtquickcontrols readline speex diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 4dfc51b283..2d43cfa493 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -783,7 +783,7 @@ embedded kernel situations.") (("COMMODORE_PET") "PROGGY_TINY")))))) (build-system gnu-build-system) (inputs - (list qtbase-5 qtdeclarative qtgraphicaleffects qtquickcontrols2 bash-minimal)) + (list qtbase-5 qtdeclarative-5 qtgraphicaleffects qtquickcontrols2 bash-minimal)) (arguments `(#:phases (modify-phases %standard-phases @@ -805,7 +805,7 @@ embedded kernel situations.") (,(string-append out qml) ,@(map (lambda (i) (string-append (assoc-ref inputs i) qml)) - '("qtdeclarative" + '("qtdeclarative-5" "qtgraphicaleffects" "qtquickcontrols2")))))))) (add-after 'install 'add-alternate-name diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 2e569ac17a..7abf5b6328 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -667,7 +667,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. (inputs (list hunspell qtbase-5 - qtdeclarative + qtdeclarative-5 qtmultimedia-5 qtquickcontrols qtsvg-5 diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2ebbe8afcf..30ff377cee 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4857,7 +4857,7 @@ transitions, and effects and then export your film to many common formats.") mlt pulseaudio qtbase-5 - qtdeclarative + qtdeclarative-5 qtgraphicaleffects qtmultimedia-5 qtquickcontrols diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 24f0682e01..6d9dcfb53f 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -256,7 +256,7 @@ ("procps" ,procps) ("python" ,python) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative-5" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 34a2fea062..5492383882 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8091,7 +8091,7 @@ It contains the code shared by all Kiwix ports.") libzim pugixml qtbase-5 - qtdeclarative + qtdeclarative-5 qtwebchannel qtwebengine xapian |