From 1a2d152e3dab6a2799d72af236da04d20380ec38 Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Fri, 21 May 2021 16:51:21 -0500 Subject: [PATCH 07/37] gnu: qtdeclarative: Update to 6.1.0 * gnu/packages/qt.scm (qtxmlpatterns): Remove variable. * gnu/packages/qt.scm (qtxmlpatterns-5): New variable. * gnu/packages/qt.scm (qtdeclarative): Update to 6.1.0. * gnu/packages/qt.scm (qtdeclarative-5): New variable. --- gnu/packages/animation.scm | 2 +- gnu/packages/audio.scm | 4 +- gnu/packages/display-managers.scm | 2 +- gnu/packages/documentation.scm | 2 +- gnu/packages/education.scm | 8 +-- gnu/packages/engineering.scm | 4 +- gnu/packages/finance.scm | 4 +- gnu/packages/game-development.scm | 4 +- gnu/packages/games.scm | 72 +++++++++---------- gnu/packages/geo.scm | 4 +- gnu/packages/gstreamer.scm | 2 +- gnu/packages/image-processing.scm | 2 +- gnu/packages/image-viewers.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-frameworks.scm | 40 +++++------ gnu/packages/kde-multimedia.scm | 4 +- gnu/packages/kde-pim.scm | 14 ++-- gnu/packages/kde-plasma.scm | 6 +- gnu/packages/kde-utils.scm | 2 +- gnu/packages/kde.scm | 20 +++--- gnu/packages/linphone.scm | 2 +- gnu/packages/messaging.scm | 6 +- gnu/packages/music.scm | 6 +- gnu/packages/qt.scm | 115 ++++++++++++++++++++---------- gnu/packages/radio.scm | 4 +- gnu/packages/scribus.scm | 2 +- gnu/packages/sync.scm | 2 +- gnu/packages/telephony.scm | 2 +- gnu/packages/terminals.scm | 2 +- gnu/packages/text-editors.scm | 2 +- gnu/packages/web.scm | 2 +- 31 files changed, 194 insertions(+), 151 deletions(-) diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 272becc140..7a77af8d92 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -405,7 +405,7 @@ waveform until they line up with the proper sounds.") (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase-5) - ("qtxmlpatterns" ,qtxmlpatterns) + ("qtxmlpatterns" ,qtxmlpatterns-5) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg-5))) (arguments diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 8045ad0d7b..3d88ef9ca0 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2881,7 +2881,7 @@ link REQUIRED)")) ("boost-sync" ,boost-sync) ("yaml-cpp" ,yaml-cpp) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5) ("qtwebchannel" ,qtwebchannel) ("qtwebsockets" ,qtwebsockets))) @@ -5094,7 +5094,7 @@ Rate} 3600x2250 bit/s vocoder used in various radio systems.") ("python" ,python) ;for running tests ("portaudio" ,portaudio) ;for portaudio examples ("qtbase" ,qtbase-5) ;for Qt examples - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qttools" ,qttools))) (inputs `(("jack" ,jack-1) ;for JACK examples diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 8f9f0da605..7944894fda 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -81,7 +81,7 @@ ("libxkbcommon" ,libxkbcommon) ("linux-pam" ,linux-pam) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ;; Some user-defined themes use QtQuick components internally. Adding ;; QtQuick & co. here; they end up in QML2_IMPORT_PATH thanks to diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index a2f817d728..96b450f3a2 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -331,7 +331,7 @@ local system.") `(("libarchive" ,libarchive) ("sqlite" ,sqlite) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) ("qtquickcontrols" ,qtquickcontrols) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index ae1c68fcb9..432e28b672 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -191,13 +191,13 @@ of categories with some of the activities available in that category. `(("openssl" ,openssl) ("python" ,python-wrapper) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols" ,qtquickcontrols) ("qtsensors" ,qtsensors) ("qtsvg" ,qtsvg-5) - ("qtxmlpatterns" ,qtxmlpatterns))) + ("qtxmlpatterns" ,qtxmlpatterns-5))) (home-page "https://gcompris.net/index-en.html") (synopsis "Educational games for small children") (description @@ -712,11 +712,11 @@ language and very flexible regarding to new or unknown keyboard layouts.") ("libxcb" ,libxcb) ("libxkbfile" ,libxkbfile) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols2" ,qtquickcontrols2) ("qtx11extras" ,qtx11extras-5) - ("qtxmlpatterns" ,qtxmlpatterns))) + ("qtxmlpatterns" ,qtxmlpatterns-5))) (home-page "https://edu.kde.org/ktouch/") (synopsis "Touch typing tutor") (description diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index a3ab2cdb9f..f847f090c2 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2424,7 +2424,7 @@ comments."))) ("qtsvg" ,qtsvg-5) ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras-5) - ("qtxmlpatterns" ,qtxmlpatterns) + ("qtxmlpatterns" ,qtxmlpatterns-5) ("sqlite" ,sqlite) ("tbb" ,tbb) ("vtk" ,vtk-8) @@ -2702,7 +2702,7 @@ export filters.") (inputs `(("qtbase" ,qtbase-5) ("qtscript" ,qtscript) - ("qtxmlpatterns" ,qtxmlpatterns) + ("qtxmlpatterns" ,qtxmlpatterns-5) ("mesa" ,mesa) ("glu" ,glu) ("glew" ,glew) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 461e8e173d..cbe412bd30 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -774,12 +774,12 @@ the Monero command line client and daemon.") ("libgcrypt" ,libgcrypt) ("monero" ,monero) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2",qtquickcontrols2) ("qtsvg" ,qtsvg-5) - ("qtxmlpatterns" ,qtxmlpatterns))) + ("qtxmlpatterns" ,qtxmlpatterns-5))) (arguments `(#:tests? #f ; No tests #:configure-flags diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 05687d2ae3..c0a3c4c60b 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -461,7 +461,7 @@ support.") (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5) ("zlib" ,zlib))) (native-inputs @@ -2430,7 +2430,7 @@ utilities frequently used in roguelikes.") ("openal" ,openal) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("sdl2" ,sdl2) ("uuid.h" ,util-linux "lib") ("zlib" ,zlib))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 4fbdd08455..c7d7f09cd2 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9303,7 +9303,7 @@ and also provides the base for the FlightGear Flight Simulator.") ("openscenegraph" ,openscenegraph-3.4) ("plib" ,plib) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5) ("simgear" ,simgear) ("speexdsp" ,speexdsp) @@ -10251,7 +10251,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.") ("python" ,python-wrapper) ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Stamp drawing toy") @@ -10298,7 +10298,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Number logic game") @@ -10337,7 +10337,7 @@ This package is part of the KDE games module.") ("ktextwidgets" ,ktextwidgets) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("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 @@ -10414,7 +10414,7 @@ other Mah Jongg like games.") ("libkdegames" ,libkdegames) ("libkmahjongg" ,libkmahjongg) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Tile laying patience") @@ -10457,7 +10457,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("libkmahjongg" ,libkmahjongg) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("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 @@ -10545,7 +10545,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,qtdeclarative-5))) (home-page "https://games.kde.org/") (synopsis "Breakout like game") (description "KBreakout is similar to the classics breakout and xboing, @@ -10584,7 +10584,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("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 @@ -10621,7 +10621,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,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" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Jezzball arcade game") @@ -10700,7 +10700,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Single player falling blocks puzzle game") @@ -10744,7 +10744,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("glu" ,glu) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Sudoku puzzle game and solver") @@ -10801,7 +10801,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("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. @@ -10845,7 +10845,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("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 @@ -10889,7 +10889,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("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 @@ -10925,7 +10925,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Place 4 pieces in a row") @@ -10965,7 +10965,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Find atoms in a grid by shooting electrons") @@ -11007,7 +11007,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("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 @@ -11046,7 +11046,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,qtdeclarative-5))) (home-page "https://games.kde.org/") (synopsis "Arcade bombing game") (description "Bomber is a single player arcade game. @@ -11091,7 +11091,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Bomberman clone") @@ -11128,7 +11128,7 @@ This package is part of the KDE games module.") ("phonon" ,phonon) ("qca" ,qca) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5) ("zlib" ,zlib))) (home-page "https://games.kde.org/") @@ -11190,7 +11190,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5) ("shared-mime-info" ,shared-mime-info))) (home-page "https://games.kde.org/") @@ -11232,7 +11232,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("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 @@ -11272,7 +11272,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Go board game") @@ -11318,7 +11318,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Game based on Rubik's Cube") @@ -11359,7 +11359,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Lieutnant Skat card game") @@ -11398,7 +11398,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Pac-Man clone") @@ -11438,7 +11438,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Two player game with shooting spaceships flying around a sun") @@ -11472,7 +11472,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Classic pen and paper game: five in a line") @@ -11512,7 +11512,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("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. @@ -11554,7 +11554,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Snake race played against the computer") @@ -11592,7 +11592,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("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 @@ -11633,7 +11633,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("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. @@ -11673,7 +11673,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Old reversi board game, also known as othello") @@ -11715,7 +11715,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,qtdeclarative-5))) (home-page "https://games.kde.org/") (synopsis "Dots and Boxes game") (description "KSquares is an implementation of the popular paper based @@ -11752,7 +11752,7 @@ This package is part of the KDE games module.") ("kxmlgui" ,kxmlgui) ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,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 6270009651..a03e37515e 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1664,7 +1664,7 @@ using the dataset of topographical information collected by ("libjpeg-turbo" ,libjpeg-turbo) ("proj" ,proj) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) @@ -2283,7 +2283,7 @@ growing set of geoscientific methods.") ("qca" ,qca) ("qscintilla" ,qscintilla) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtkeychain" ,qtkeychain) ("qtlocation" ,qtlocation) ("qtserialport" ,qtserialport) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index cca892c77f..bf7847a327 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -768,7 +768,7 @@ model to base your own plug-in on, here it is.") ("opus" ,opus) ("orc" ,orc) ;("qtbase" ,qtbase-5) - ;("qtdeclarative" ,qtdeclarative) + ;("qtdeclarative" ,qtdeclarative-5) ;("qtx11extras" ,qtx11extras-5) ("soundtouch" ,soundtouch) ;; GStreamer is not yet compatible with srt > 1.4.1. diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 26207362bd..d478d40171 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1031,7 +1031,7 @@ combine the information contained in both.") ("itk" ,insight-toolkit-4.12) ("vtk" ,vtk-6) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("vxl" ,vxl-1) ("zlib" ,zlib))) (native-inputs diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 650f81330a..33e658d6e9 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -359,7 +359,7 @@ It supports JPEG, PNG and GIF formats.") ("qttools" ,qttools))) (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5) ("qtwebkit" ,qtwebkit) ("boost" ,boost) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 204a27f440..e63eaabc19 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -605,7 +605,7 @@ decentralized calling using P2P-DHT.") ("qtwebengine" ,qtwebengine) ("qtwebchannel" ,qtwebchannel) ("qtmultimedia" ,qtmultimedia) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2))) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index d772615d70..2c19377442 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -785,7 +785,7 @@ interfaces in the areas of colors, fonts, text, images, keyboard input.") ("qttools" ,qttools))) (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,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 @@ -813,7 +813,7 @@ other special events for a geographical region.") `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtscript" ,qtscript))) (arguments `(#:phases @@ -890,7 +890,7 @@ or user activity.") ;; introducing a recursive dependency. ;;("plasma-frameworks" ,plasma-framework) ;; Tier 3! ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg" ,qtsvg-5) ;; Run-time dependency @@ -920,7 +920,7 @@ of applications that follow the Kirigami Human Interface Guidelines.") `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,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: @@ -1026,7 +1026,7 @@ pixel units.") ("perl" ,perl) ("qttools" ,qttools) ;; Optional, for compile-time validation of syntax definition files: - ("qtxmlpatterns" ,qtxmlpatterns))) + ("qtxmlpatterns" ,qtxmlpatterns-5))) (inputs `(("qtbase" ,qtbase-5))) (arguments @@ -1342,7 +1342,7 @@ provides uniform access to generation of barcodes with data.") (inputs `(("glib" ,glib) ("pulseaudio" ,pulseaudio) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtbase" ,qtbase-5))) (home-page "https://invent.kde.org/libraries/pulseaudio-qt/") (synopsis "Qt bindings for PulseAudio") @@ -1379,7 +1379,7 @@ libpulse.") ("kiconthemes" ,kiconthemes) ; optional ("kirigami" ,kirigami) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtquickcontrols2" ,qtquickcontrols2))) (home-page "https://community.kde.org/Frameworks") (synopsis "QtQuickControls2 style that integrates with the desktop") @@ -1418,7 +1418,7 @@ feel.") ("qttools" ,qttools))) (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("udev" ,eudev))) ;; TODO: Add runtime-only dependency MediaPlayerInfo (home-page "https://community.kde.org/Frameworks") @@ -1520,7 +1520,7 @@ uses a job-based interface to queue tasks and execute them in an efficient way." ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("solid" ,solid))) (home-page "https://community.kde.org/Frameworks") (synopsis "Core components for the KDE Activity concept") @@ -2124,7 +2124,7 @@ between feed formats.") ("kxmlgui" ,kxmlgui) ("lmdb" ,lmdb) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("solid" ,solid))) (arguments `(#:phases @@ -2183,7 +2183,7 @@ maintaining an index of the contents of your files.") ("kactivities" ,kactivities) ("kconfig" ,kconfig) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,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 @@ -2282,7 +2282,7 @@ using the XBEL format.") ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("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. @@ -2377,7 +2377,7 @@ their settings.") ("kxmlgui" ,kxmlgui) ("libepoxy" ,libepoxy) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("solid" ,solid))) (arguments `(#:phases @@ -2864,7 +2864,7 @@ KIO enabled infrastructure.") ("ktextwidgets" ,ktextwidgets) ("kwidgetsaddons" ,kwidgetsaddons) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("solid" ,solid) ("sonnet" ,sonnet))) (arguments @@ -3003,7 +3003,7 @@ widgets with a user-interface defined in terms of actions.") ("kservice" ,kservice) ("kwidgetsaddons" ,kwidgetsaddons) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,qtdeclarative-5))) (arguments `(#:tests? #f)) ; FIXME: 1/3 tests fail. (home-page "https://community.kde.org/Frameworks") @@ -3054,7 +3054,7 @@ to easily extend the contacts collection.") ("kwindowsystem" ,kwindowsystem) ("kxmlgui" ,kxmlgui) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("solid" ,solid) ("threadweaver" ,threadweaver))) (arguments @@ -3193,9 +3193,9 @@ types or handled by application specific code.") ("libgit2" ,libgit2) ("perl" ,perl) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtscript" ,qtscript) - ("qtxmlpatterns" ,qtxmlpatterns) + ("qtxmlpatterns" ,qtxmlpatterns-5) ("solid" ,solid) ("sonnet" ,sonnet))) (arguments @@ -3458,7 +3458,7 @@ setUrl, setUserAgent and call.") ("kxmlgui" ,kxmlgui) ("phonon" ,phonon) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras-5) @@ -3505,7 +3505,7 @@ script engines.") ("kio" ,kio) ("kirigami" ,kirigami) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("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 d81ba425d1..a4546be8e3 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -170,7 +170,7 @@ This package is part of the KDE multimedia module.") ("oxygen-icons" ,oxygen-icons) ; default icon set ("phonon" ,phonon) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ; not listed as dependency ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols" ,qtquickcontrols) @@ -469,7 +469,7 @@ autoloading of subtitle files for use while playing video.") ("oxygen-icons" ,oxygen-icons) ; default icon set ("purpose" ,purpose) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) ; not listed as dependency diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index f7ccd330f1..c946152dcb 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -633,7 +633,7 @@ functions for accessing calendar data using the kcalcore API.") ("ki18n" ,ki18n) ("kio" ,kio) ("qtbase" ,qtbase-5) - ("qtxmlpatterns" ,qtxmlpatterns))) + ("qtxmlpatterns" ,qtxmlpatterns-5))) (home-page "https://invent.kde.org/frameworks/kdav") (synopsis "DAV protocol implementation with KJobs") (description "This is a DAV protocol implementation with KJobs. Calendars @@ -740,12 +740,12 @@ for KDE PIM.") ;; TODO: libkolab ("qca" ,qca) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtnetworkauth" ,qtnetworkauth) ("qtspeech" ,qtspeech) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) - ("qtxmlpatterns" ,qtxmlpatterns))) + ("qtxmlpatterns" ,qtxmlpatterns-5))) (arguments ;; TODO: 5/45 tests fail for quite different reasons, even with ;; "offscreen" and dbus @@ -1097,7 +1097,7 @@ and retrieving certificates from LDAP servers.") ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests ("qgpgme" ,qgpgme) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) ("sonnet" ,sonnet))) @@ -1356,7 +1356,7 @@ using a Qt/KMime C++ API.") ("qca" ,qca) ("qgpgme" ,qgpgme) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) ("qtwebkit" ,qtwebkit) @@ -1893,7 +1893,7 @@ and allows one to view/extract message formatted text in Rich Text Format.") ("kwallet" ,kwallet) ("kwindowsystem" ,kwindowsystem) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))) (arguments @@ -1979,7 +1979,7 @@ KDE using certificate-based crypto.") ("kwindowsystem" ,kwindowsystem) ("libkdepim" ,libkdepim) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))) (arguments diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 237459e7c0..994312fd1a 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -75,7 +75,7 @@ ("kwayland" ,kwayland) ; optional ("kwindowsystem" ,kwindowsystem) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) ; optional + ("qtdeclarative" ,qtdeclarative-5) ; optional ("qtx11extras" ,qtx11extras-5))) (home-page "https://invent.kde.org/plasma/breeze") (synopsis "Default KDE Plasma theme") @@ -191,7 +191,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" ,qtdeclarative-5) ("qtx11extras" ,qtx11extras-5) ("solid" ,solid) ("wayland" ,wayland) @@ -262,7 +262,7 @@ basic needs and easy to configure for those who want special setups.") ("kwidgetsaddons" ,kwidgetsaddons) ("kservice" ,kservice) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtscript" ,qtscript) ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras-5) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index c586f6f866..452cf0173d 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -469,7 +469,7 @@ remind you to take a break now and then.") ("oxygen-icons" ,oxygen-icons) ;; default icon set ("plasma-framework" ,plasma-framework) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("solid" ,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 3d34429981..023bf20802 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -203,7 +203,7 @@ This package contains GUI widgets for baloo.") ("libkleo" ,libkleo) ("qgpgme" ,qgpgme) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) ("syndication" ,syndication))) @@ -258,7 +258,7 @@ browser for easy news reading.") ("kfilemetadata" ,kfilemetadata) ("kdoctools" ,kdoctools) ("kdeclarative" ,kdeclarative) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) ("kiconthemes" ,kiconthemes) @@ -351,7 +351,7 @@ projects.") ("libkomparediff2" ,libkomparediff2) ("oxygen-icons" ,oxygen-icons) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtquickcontrols" ,qtquickcontrols) ;; not checked as requirement ("qtquickcontrols2" ,qtquickcontrols2) ;; not checked as requirement ("qtwebkit" ,qtwebkit) @@ -533,7 +533,7 @@ illustrate project schedules.") ("perl" ,perl) ("poppler-qt5" ,poppler-qt5) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras-5) @@ -574,7 +574,7 @@ features include brush stabilizers, brush engines and wrap-around mode.") ("ki18n" ,ki18n) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtxmlpatterns" ,qtxmlpatterns))) + ("qtxmlpatterns" ,qtxmlpatterns-5))) (home-page "https://apps.kde.org/en/massif-visualizer") (synopsis "Visualize massif data generated by Valgrind") (description @@ -749,7 +749,7 @@ different notification systems.") ("pulseaudio-qt" ,pulseaudio-qt) ("qca" ,qca) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols" ,qtquickcontrols) @@ -869,7 +869,7 @@ to perform data analysis.") `(("extra-cmake-modules" ,extra-cmake-modules))) (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,qtdeclarative-5))) (home-page "https://phabricator.kde.org/source/kqtquickcharts/") (synopsis "Interactive charts for Qt Quick") (description @@ -992,7 +992,7 @@ Python, PHP, and Perl.") ("libsndfile" ,libsndfile) ("openal" ,openal) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Runtime library for kdegames") @@ -1054,7 +1054,7 @@ Python, PHP, and Perl.") ("phonon" ,phonon) ("poppler-qt5" ,poppler-qt5) ("qca" ,qca) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5) ("threadweaver" ,threadweaver) ("kcrash" ,kcrash) @@ -1195,7 +1195,7 @@ or Bonjour by other projects).") (inputs `(("qtbase" ,qtbase-5) ("qtcharts" ,qtcharts) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5))) (arguments `(#:tests? #f)) ;; 4/17 fail diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 49f0caf7a6..4013463f35 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -861,7 +861,7 @@ and video calls or instant messaging capabilities to an application.") ("mediastreamer2" ,mediastreamer2) ("ortp" ,ortp) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 9507e8a505..b1a1677794 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2330,7 +2330,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") ("mtxclient" ,mtxclient) ("openssl" ,openssl) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols2" ,qtquickcontrols2) @@ -2383,7 +2383,7 @@ There is support for: (inputs `(("libqmatrixclient" ,libqmatrixclient) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) @@ -2723,7 +2723,7 @@ as phones, embedded computers or microcontrollers.") #t))))) (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel))) (propagated-inputs `(("qtwebengine" ,qtwebengine))) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index a2045e3908..18289bccaa 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -757,7 +757,7 @@ settings (aliasing, linear interpolation and cubic interpolation).") ("lrdf" ,lrdf) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) - ("qtxmlpatterns" ,qtxmlpatterns) + ("qtxmlpatterns" ,qtxmlpatterns-5) ("zlib" ,zlib))) (home-page "http://www.hydrogen-music.org") (synopsis "Drum machine") @@ -4743,11 +4743,11 @@ standalone JACK client and an LV2 plugin is also available.") ("portmidi" ,portmidi) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtquickcontrols2" ,qtquickcontrols2) ("qtscript" ,qtscript) ("qtsvg" ,qtsvg-5) - ("qtxmlpatterns" ,qtxmlpatterns))) + ("qtxmlpatterns" ,qtxmlpatterns-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index ce9dca9c09..ccef655854 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -263,7 +263,7 @@ applications on Wayland.") `(("doxygen" ,doxygen))) (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtscript" ,qtscript))) (build-system cmake-build-system) (arguments @@ -897,13 +897,13 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (description "The QtX11Extras module includes the library to access X11 from within Qt 5."))) -(define-public qtxmlpatterns +(define-public qtxmlpatterns-5 (package (inherit qtsvg-5) - (name "qtxmlpatterns") + (name "qtxmlpatterns-5") (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt5-urls "qtxmlpatterns" version)) (sha256 (base32 "1ypj5jpa31rlx8yfw3y9jia212lfnxvnqkvygs6ihjf3lxi23skn")))) @@ -918,7 +918,7 @@ from within Qt 5."))) (("xmlpatterns ") "# xmlpatterns")) #t)))))) (native-inputs `(("perl" ,perl) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,qtdeclarative-5))) (inputs `(("qtbase" ,qtbase-5))) (synopsis "Qt XML patterns module") (description "The QtXmlPatterns module is a XQuery and XPath engine for @@ -926,12 +926,55 @@ XML and custom data models. It contains programs such as xmlpatterns and xmlpatternsvalidator."))) (define-public qtdeclarative - (package (inherit qtsvg-5) + (package (inherit qtsvg) (name "qtdeclarative") - (version "5.15.2") + (version "6.1.0") (source (origin (method url-fetch) (uri (qt5-urls name version)) + (sha256 + (base32 + "1njvnx1z7nxq219asfbz7dyb25skg577p0jj3xa7nkfmp0a47xp6")))) + (arguments + (substitute-keyword-arguments (package-arguments qtsvg) + ((#:tests? _ #f) #f) ;TODO: Enable the tests +;; ((#:phases phases) +;; `(modify-phases ,phases +;; (add-after 'build 'fix-qt5core-install-prefix +;; (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. +;; (substitute* +;; "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake" +;; (("\\$\\{_qt5Core_install_prefix\\}") out))) +;; #t)))) + )) + (native-inputs + `(("libxkbcommon" ,libxkbcommon) + ("perl" ,perl) + ("pkg-config" ,pkg-config) + ("python" ,python) + ("python-wrapper" ,python-wrapper) + ("qtsvg" ,qtsvg) + ("vulkan-headers" ,vulkan-headers))) + (inputs + `(("mesa" ,mesa) + ("qtbase" ,qtbase))) + (synopsis "Qt QML module (Quick 2)") + (description "The Qt QML module provides a framework for developing +applications and libraries with the QML language. It defines and implements the +language and engine infrastructure, and provides an API to enable application +developers to extend the QML language with custom types and integrate QML code +with JavaScript and C++."))) + +(define-public qtdeclarative-5 + (package (inherit qtsvg-5) + (name "qtdeclarative-5") + (version "5.15.2") + (source (origin + (method url-fetch) + (uri (qt5-urls "qtdeclarative" version)) (sha256 (base32 "0lancdn7y0lrlmyn5cbdm0izd5yprvd5n77nhkb7a3wl2sbx0066")))) @@ -979,7 +1022,7 @@ with JavaScript and C++."))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,qtdeclarative-5))) (inputs `(("bluez" ,bluez) ("qtbase" ,qtbase-5))) @@ -1002,7 +1045,7 @@ with Bluetooth and NFC."))) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs `(("perl" ,perl) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,qtdeclarative-5))) (inputs `(("qtbase" ,qtbase-5))) (synopsis "Qt Web Sockets module") (description "WebSocket is a web-based protocol designed to enable two-way @@ -1034,7 +1077,7 @@ consume data received from the server, or both."))) #t)))))) (native-inputs `(("perl" ,perl) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,qtdeclarative-5))) (inputs `(("qtbase" ,qtbase-5))) (synopsis "Qt Sensors module") (description "The Qt Sensors API provides access to sensor hardware via QML @@ -1075,7 +1118,7 @@ recognition API for devices."))) `(("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,qtdeclarative-5))) (inputs `(("alsa-lib" ,alsa-lib) ("mesa" ,mesa) @@ -1123,7 +1166,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) `(("glib" ,glib) ("perl" ,perl) ("pkg-config" ,pkg-config) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,qtdeclarative-5))) (inputs `(("fontconfig" ,fontconfig) ("freetype" ,freetype) @@ -1216,7 +1259,7 @@ and others."))) "1h9y634phvvk557mhmf9z4lmxr41rl8x9mqy2lzp31mk8ffffzqj")))) (native-inputs `(("perl" ,perl) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtwebsockets" ,qtwebsockets))) (inputs `(("qtbase" ,qtbase-5))) (synopsis "Web communication library for Qt") @@ -1247,7 +1290,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) (inputs `(("mesa" ,mesa) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtwebsockets" ,qtwebsockets) ("zlib" ,zlib))) (synopsis "QPA plugin for running an application via a browser using @@ -1272,7 +1315,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) `(("perl" ,perl))) (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,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 @@ -1296,7 +1339,7 @@ native APIs where it makes sense."))) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs `(("perl" ,perl) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtquickcontrols" ,qtquickcontrols) ("qtserialport" ,qtserialport))) (inputs @@ -1323,7 +1366,7 @@ positioning and geolocation plugins."))) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (native-inputs `(("perl" ,perl) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("vulkan-headers" ,vulkan-headers))) (inputs `(("mesa" ,mesa) @@ -1369,7 +1412,7 @@ ECMAScript and Qt."))) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,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 @@ -1390,7 +1433,7 @@ can be used to build complete interfaces in Qt Quick."))) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,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, @@ -1412,7 +1455,7 @@ not available."))) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,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. @@ -1440,7 +1483,7 @@ coloring, and many more."))) ("libxrender" ,libxrender) ("sdl2" ,sdl2) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,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 @@ -1468,7 +1511,7 @@ and mobile applications targeting TV-like form factors."))) #t)))) (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,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 @@ -1488,7 +1531,7 @@ also contains functionality to support data models and executable content."))) "09rjx53519dfk4qj2gbn3vlxyriasyb747wpg1p11y7jkwqhs4l7")))) (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,qtdeclarative-5))) (synopsis "Qt Purchasing module") (description "The Qt Purchasing module provides and in-app API for purchasing goods and services."))) @@ -1508,7 +1551,7 @@ purchasing goods and services."))) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,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 @@ -1532,7 +1575,7 @@ selecting one of the charts themes.") ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,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 @@ -1594,7 +1637,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) #t)))))) (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,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 @@ -1619,9 +1662,9 @@ processes or computers."))) `(("qtbase" ,qtbase-5))) (native-inputs `(("perl" ,perl) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtmultimedia" ,qtmultimedia) - ("qtxmlpatterns" ,qtxmlpatterns))) + ("qtxmlpatterns" ,qtxmlpatterns-5))) (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 @@ -1946,7 +1989,7 @@ using the Enchant spell-checking library.") ("protobuf" ,protobuf) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtmultimedia" ,qtmultimedia) ("qtwebchannel" ,qtwebchannel) ("re2" ,re2) @@ -2123,7 +2166,7 @@ module provides support functions to the automatically generated code.") `(("python" ,python-wrapper) ("qtbase" ,qtbase-5) ("qtconnectivity" ,qtconnectivity) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtmultimedia" ,qtmultimedia) ("qtsensors" ,qtsensors) @@ -2134,7 +2177,7 @@ module provides support functions to the automatically generated code.") ("qtwebkit" ,qtwebkit) ("qtwebsockets" ,qtwebsockets) ("qtx11extras" ,qtx11extras-5) - ("qtxmlpatterns" ,qtxmlpatterns))) + ("qtxmlpatterns" ,qtxmlpatterns-5))) (arguments `(#:modules ((srfi srfi-1) ((guix build python-build-system) #:select (python-version)) @@ -2234,7 +2277,7 @@ contain over 620 classes.") ("python-pyqt" ,python-pyqt) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))) (arguments @@ -2704,7 +2747,7 @@ different kinds of sliders, and much more.") ("fontconfig" ,fontconfig) ("libxrender" ,libxrender) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtmultimedia" ,qtmultimedia) ("qtsensors" ,qtsensors) @@ -2769,7 +2812,7 @@ time Web content can be enhanced with native controls.") `(("qttools" ,qttools))) (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative))) + ("qtdeclarative" ,qtdeclarative-5))) (home-page "https://filcuc.github.io/DOtherSide/index.html") (synopsis "C language library for creating bindings for the Qt QML language") (description @@ -2885,7 +2928,7 @@ color-related widgets.") ("libxslt" ,libxslt) ("python-wrapper" ,python-wrapper) ("qtbase" ,qtbase-5) - ("qtxmlpatterns" ,qtxmlpatterns))) + ("qtxmlpatterns" ,qtxmlpatterns-5))) (arguments `(#:tests? #f ;; FIXME: Building tests fails @@ -2947,7 +2990,7 @@ color-related widgets.") ("qtwebchannel" ,qtwebchannel) ("qtwebsockets" ,qtwebsockets) ("qtx11extras" ,qtx11extras-5) - ("qtxmlpatterns" ,qtxmlpatterns))) + ("qtxmlpatterns" ,qtxmlpatterns-5))) (propagated-inputs `(("python-shiboken-2" ,python-shiboken-2))) (native-inputs diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 43638082f2..d29fe459c9 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1566,7 +1566,7 @@ receiver.") ("rtl-sdr" ,rtl-sdr) ("qtbase" ,qtbase-5) ("qtcharts" ,qtcharts) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols2" ,qtquickcontrols2))) @@ -1800,7 +1800,7 @@ voice formats.") ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) ("qtcharts" ,qtcharts) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtmultimedia" ,qtmultimedia) ("qtserialport" ,qtserialport) diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index a9372735bf..a34da459fb 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -88,7 +88,7 @@ ("poppler" ,poppler) ("python" ,python) ; need Python library ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("zlib" ,zlib))) (native-inputs `(("pkg-config" ,pkg-config) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 66339c5bf1..58bb674a8c 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -193,7 +193,7 @@ ("openssl" ,openssl) ("python-nautilus" ,python-nautilus) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtkeychain" ,qtkeychain) ("qtquickcontrols2" ,qtquickcontrols2) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 34e1b21af6..cbe86efee1 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -706,7 +706,7 @@ Mumble consists of two applications for separate usage: ("libsndfile" ,libsndfile) ("libxml2" ,libxml2) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtquickcontrols" ,qtquickcontrols) ("readline" ,readline) ("speex" ,speex) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 4f800f2a91..ca22c76026 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -646,7 +646,7 @@ embedded kernel situations.") (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols))) (arguments diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 71cf6edacb..dfc45ae857 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -618,7 +618,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. (inputs `(("hunspell" ,hunspell) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols" ,qtquickcontrols) ("qtsvg" ,qtsvg-5) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 0dd0a8dec5..f1056f67a9 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8153,7 +8153,7 @@ It contains the code shared by all Kiwix ports.") ("libzim" ,libzim) ("pugixml" ,pugixml) ("qtbase" ,qtbase-5) - ("qtdeclarative" ,qtdeclarative) + ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) ("xapian" ,xapian) -- 2.31.1