unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 56771@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#56771] [PATCH 11/33] gnu: qtdeclarative: Rename to qtdeclarative-5.
Date: Mon, 25 Jul 2022 19:07:41 -0400	[thread overview]
Message-ID: <20220725230803.10002-11-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <20220725230803.10002-1-maxim.cournoyer@gmail.com>

Automated via the following commands:

  git grep -l '\bqtdeclarative\b' | xargs sed -E 's/qtdeclarative/\0-5/g' -i
  git checkout NEWS
---
 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/fcitx5.scm           |  2 +-
 gnu/packages/finance.scm          |  2 +-
 gnu/packages/game-development.scm |  4 +-
 gnu/packages/games.scm            | 72 +++++++++++++++----------------
 gnu/packages/geo.scm              |  4 +-
 gnu/packages/image-processing.scm |  4 +-
 gnu/packages/image-viewers.scm    |  4 +-
 gnu/packages/jami.scm             |  2 +-
 gnu/packages/kde-frameworks.scm   | 38 ++++++++--------
 gnu/packages/kde-multimedia.scm   |  6 +--
 gnu/packages/kde-pim.scm          | 10 ++---
 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        |  8 ++--
 gnu/packages/music.scm            |  4 +-
 gnu/packages/qt.scm               | 62 +++++++++++++-------------
 gnu/packages/radio.scm            |  4 +-
 gnu/packages/scribus.scm          |  2 +-
 gnu/packages/security-token.scm   |  2 +-
 gnu/packages/sync.scm             |  2 +-
 gnu/packages/telephony.scm        |  4 +-
 gnu/packages/terminals.scm        |  4 +-
 gnu/packages/text-editors.scm     |  2 +-
 gnu/packages/video.scm            |  2 +-
 gnu/packages/vpn.scm              |  2 +-
 gnu/packages/web.scm              |  2 +-
 33 files changed, 149 insertions(+), 149 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index dbe6870913..b041ade63d 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3232,7 +3232,7 @@ (define-public supercollider
                   boost-sync
                   yaml-cpp
                   qtbase-5
-                  qtdeclarative
+                  qtdeclarative-5
                   qtsvg-5
                   qtwebchannel
                   qtwebsockets))
@@ -5455,7 +5455,7 @@ (define-public ableton-link
            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 @@ (define-public sddm
            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 @@ (define-public zeal
        `(("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 @@ (define-public gcompris-qt
      (list openssl
            python-wrapper
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtgraphicaleffects
            qtmultimedia-5
            qtquickcontrols
@@ -558,7 +558,7 @@ (define-public openboard
              opus
              poppler
              qtbase-5
-             qtdeclarative
+             qtdeclarative-5
              qtmultimedia-5
              qtsvg-5
              qtwebchannel
@@ -672,7 +672,7 @@ (define-public ktouch
            libxcb
            libxkbfile
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtgraphicaleffects
            qtquickcontrols2
            qtx11extras
@@ -997,7 +997,7 @@ (define-public qolibri
            qtbase-5
            qtmultimedia-5
            qtquickcontrols2
-           qtdeclarative
+           qtdeclarative-5
            qtwebchannel
            qtwebengine
            zlib))
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 669d2010b5..c05e4cdf0a 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2490,7 +2490,7 @@ (define-public freecad
            python-shiboken-2
            python-wrapper
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtsvg-5
            qtwebchannel
            qtwebengine
@@ -3422,7 +3422,7 @@ (define-public uranium
            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 @@ (define-public fcitx5-chinese-addons
        ("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 8f3d4842e5..e753de7758 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -803,7 +803,7 @@ (define-public monero-gui
        ("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 @@ (define-public tiled
                 "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 @@ (define-public warsow-qfusion
          ("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 @@ (define-public flightgear
            openscenegraph
            plib
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtsvg-5
            simgear
            speexdsp
@@ -10248,7 +10248,7 @@ (define-public ktuberling
            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 @@ (define-public picmi
            kxmlgui
            libkdegames
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtsvg-5))
     (home-page "https://games.kde.org/")
     (synopsis "Number logic game")
@@ -10332,7 +10332,7 @@ (define-public kolf
            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 @@ (define-public kmahjongg
            libkdegames
            libkmahjongg
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtsvg-5))
     (home-page "https://games.kde.org/")
     (synopsis "Tile laying patience")
@@ -10451,7 +10451,7 @@ (define-public kshisen
            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 @@ (define-public kbreakout
            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 @@ (define-public kmines
            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 @@ (define-public konquest
            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 @@ (define-public kbounce
            kxmlgui
            libkdegames
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtsvg-5))
     (home-page "https://games.kde.org/")
     (synopsis "Jezzball arcade game")
@@ -10699,7 +10699,7 @@ (define-public kblocks
            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 @@ (define-public ksudoku
            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 @@ (define-public klines
            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 @@ (define-public kgoldrunner
            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 @@ (define-public kdiamond
            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 @@ (define-public kfourinline
            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 @@ (define-public kblackbox
            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 @@ (define-public knetwalk
            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 @@ (define-public bomber
            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 @@ (define-public granatier
            kxmlgui
            libkdegames
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtsvg-5))
     (home-page "https://games.kde.org/")
     (synopsis "Bomberman clone")
@@ -11117,7 +11117,7 @@ (define-public ksirk
            phonon
            qca
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtsvg-5
            zlib))
     (home-page "https://games.kde.org/")
@@ -11178,7 +11178,7 @@ (define-public palapeli
            kxmlgui
            libkdegames
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtsvg-5
            shared-mime-info))
     (home-page "https://games.kde.org/")
@@ -11219,7 +11219,7 @@ (define-public kiriki
            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 @@ (define-public kigo
            kxmlgui
            libkdegames
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtsvg-5))
     (home-page "https://games.kde.org/")
     (synopsis "Go board game")
@@ -11303,7 +11303,7 @@ (define-public kubrick
            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 @@ (define-public lskat
            kxmlgui
            libkdegames
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtsvg-5))
     (home-page "https://games.kde.org/")
     (synopsis "Lieutnant Skat card game")
@@ -11381,7 +11381,7 @@ (define-public kapman
            kxmlgui
            libkdegames
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtsvg-5))
     (home-page "https://games.kde.org/")
     (synopsis "Pac-Man clone")
@@ -11420,7 +11420,7 @@ (define-public kspaceduel
            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 @@ (define-public bovo
            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 @@ (define-public killbots
            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 @@ (define-public ksnakeduel
            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 @@ (define-public kollision
            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 @@ (define-public knavalbattle
            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 @@ (define-public kreversi
            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 @@ (define-public ksquares
            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 @@ (define-public kjumpingcube
            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 @@ (define-public qmapshack
            libjpeg-turbo
            proj
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtlocation
            qtwebchannel
            qtwebengine
@@ -2618,7 +2618,7 @@ (define-public qgis
            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 @@ (define-public itk-snap
                    ,(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 @@ (define-public itk-snap
            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 @@ (define-public luminance-hdr
      (list pkg-config qttools))
     (inputs
      (list qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtsvg-5
            boost
            eigen
@@ -532,7 +532,7 @@ (define-public luminance-hdr
            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 @@ (define-public jami
            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 @@ (define-public bluez-qt
     (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 @@ (define-public kholidays
     (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 @@ (define-public ki18n
     (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 @@ (define-public kirigami
            ;; 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 @@ (define-public kitemmodels
     (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 @@ (define-public pulseaudio-qt
     (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 @@ (define-public qqc2-desktop-style
            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 @@ (define-public solid
      (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 @@ (define-public kactivities
            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 @@ (define-public baloo
            kxmlgui
            lmdb
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            solid))
     (arguments
      `(#:phases
@@ -2108,7 +2108,7 @@ (define-public kactivities-stats
     (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 @@ (define-public kcmutils
            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 @@ (define-public kdeclarative
            kxmlgui
            libepoxy
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            solid))
     (arguments
      `(#:phases
@@ -2761,7 +2761,7 @@ (define-public knewstuff
            ktextwidgets
            kwidgetsaddons
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            solid
            sonnet))
     (arguments
@@ -2897,7 +2897,7 @@ (define-public kpeople
            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 @@ (define-public krunner
            kwindowsystem
            kxmlgui
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            solid
            threadweaver))
     (arguments
@@ -3078,7 +3078,7 @@ (define-public ktexteditor
            libgit2
            perl
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtscript
            qtxmlpatterns
            solid
@@ -3337,7 +3337,7 @@ (define-public plasma-framework
        ("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 @@ (define-public purpose
            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 @@ (define-public elisa
            oxygen-icons ; default icon set
            phonon
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtgraphicaleffects ; not listed as dependency
            qtmultimedia-5
            qtquickcontrols
@@ -335,7 +335,7 @@ (define-public kid3
            kxmlgui
            libvorbis
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtmultimedia-5
            readline
            taglib
@@ -529,7 +529,7 @@ (define-public kamoso
            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 @@ (define-public kdepim-runtime
            ;; TODO: libkolab
            qca
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtnetworkauth
            qtspeech
            qtwebchannel
@@ -1070,7 +1070,7 @@ (define-public kmail
            oxygen-icons ; default icon set, required for tests
            qgpgme
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtwebchannel
            qtwebengine
            sonnet))
@@ -1322,7 +1322,7 @@ (define-public kmessagelib
            qca
            qgpgme
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtwebchannel
            qtwebengine
            qtwebkit
@@ -1848,7 +1848,7 @@ (define-public libkgapi
            kwallet
            kwindowsystem
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtwebchannel
            qtwebengine))
     (arguments
@@ -1931,7 +1931,7 @@ (define-public libksieve
            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 @@ (define-public breeze
            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 @@ (define-public kscreenlocker
        ("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 @@ (define-public libksysguard
        ("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 @@ (define-public smb4k
            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 @@ (define-public akregator
            libkleo
            qgpgme
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtwebchannel
            qtwebengine
            syndication))
@@ -285,7 +285,7 @@ (define-public kdenlive
            mlt
            purpose
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtgraphicaleffects
            qtmultimedia-5
            qtnetworkauth
@@ -345,7 +345,7 @@ (define-public kdevelop
        ("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 @@ (define-public krita
            perl
            poppler-qt5
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtmultimedia-5
            qtsvg-5
            qtx11extras
@@ -745,7 +745,7 @@ (define-public kdeconnect
            pulseaudio-qt
            qca
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtgraphicaleffects
            qtmultimedia-5
            qtquickcontrols
@@ -863,7 +863,7 @@ (define-public kqtquickcharts
     (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 @@ (define-public libkdegames
            libsndfile
            openal
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtsvg-5))
     (home-page "https://games.kde.org/")
     (synopsis "Runtime library for kdegames")
@@ -1024,7 +1024,7 @@ (define-public marble-qt
            phonon
            protobuf
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtlocation
            qtserialport
            qtsvg-5
@@ -1094,7 +1094,7 @@ (define-public okular
            phonon
            poppler-qt5
            qca
-           qtdeclarative
+           qtdeclarative-5
            qtsvg-5
            threadweaver
            kcrash
@@ -1225,7 +1225,7 @@ (define-public kuserfeedback
            ;;("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 @@ (define-public linphone-desktop
            mediastreamer2
            ortp
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtgraphicaleffects
            qtquickcontrols
            qtquickcontrols2
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index ef26f0486b..83615fedfe 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1475,7 +1475,7 @@ (define-public kaidan
     (inputs (list kirigami
                   knotifications
                   qtbase-5
-                  qtdeclarative
+                  qtdeclarative-5
                   qtgraphicaleffects
                   qtlocation
                   qtquickcontrols2
@@ -2457,7 +2457,7 @@ (define-public nheko
            mtxclient
            openssl
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtkeychain
            qtgraphicaleffects
            qtmultimedia-5
@@ -2497,7 +2497,7 @@ (define-public quaternion
     (inputs
      (list libqmatrixclient
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtmultimedia-5
            qtquickcontrols
            qtquickcontrols2
@@ -2910,7 +2910,7 @@ (define-public movim-desktop
                   "\"../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 390ee18a43..5c04382209 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2261,7 +2261,7 @@ (define-public mixxx
            portmidi
            protobuf
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtkeychain
            qtscript
            qtsvg-5
@@ -4756,7 +4756,7 @@ (define-public musescore
            portmidi
            pulseaudio
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtgraphicaleffects
            qtquickcontrols2
            qtscript
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 1d7149e737..ac4e125d2b 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -258,7 +258,7 @@ (define-public grantlee
      ;; 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
@@ -1011,14 +1011,14 @@ (define-public qtxmlpatterns
                          (("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")
@@ -1037,7 +1037,7 @@ (define-public qtdeclarative
              (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)))
@@ -1069,7 +1069,7 @@ (define-public qtconnectivity
               (base32
                "185zci61ip1wpjrygcw2m6v55lvninc0b8y2p3jh6qgpf5w35003"))))
     (native-inputs
-     (list perl pkg-config qtdeclarative))
+     (list perl pkg-config qtdeclarative-5))
     (inputs
      (list bluez qtbase-5))
     (synopsis "Qt Connectivity module")
@@ -1090,7 +1090,7 @@ (define-public qtwebsockets
      (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
@@ -1121,7 +1121,7 @@ (define-public qtsensors
                  (("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
@@ -1160,7 +1160,7 @@ (define-public qtmultimedia-5
                          (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
@@ -1299,7 +1299,7 @@ (define-public qtwayland
                (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)
@@ -1388,7 +1388,7 @@ (define-public qtwebchannel
               (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
@@ -1416,7 +1416,7 @@ (define-public qtwebglplugin
                #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
@@ -1438,7 +1438,7 @@ (define-public qtwebview
     (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
@@ -1461,7 +1461,7 @@ (define-public qtlocation
      (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")
@@ -1482,7 +1482,7 @@ (define-public qttools
      (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")
@@ -1524,7 +1524,7 @@ (define-public qtquickcontrols
      (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
@@ -1544,7 +1544,7 @@ (define-public qtquickcontrols2
      (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,
@@ -1565,7 +1565,7 @@ (define-public qtgraphicaleffects
      (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.
@@ -1592,7 +1592,7 @@ (define-public qtgamepad
        ("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
@@ -1619,7 +1619,7 @@ (define-public qtscxml
                    (("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
@@ -1638,7 +1638,7 @@ (define-public qtpurchasing
               (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.")))
@@ -1657,7 +1657,7 @@ (define-public qtcharts
      (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
@@ -1680,7 +1680,7 @@ (define-public qtdatavis3d
      (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
@@ -1741,7 +1741,7 @@ (define-public qtremoteobjects
                    "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
@@ -1765,7 +1765,7 @@ (define-public qtspeech
     (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
@@ -2089,7 +2089,7 @@ (define (delete-unwanted-files child stat flag base level)
            protobuf
            pulseaudio
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtmultimedia-5
            qtwebchannel
            re2
@@ -2327,7 +2327,7 @@ (define-public python-pyqt
      `(("python" ,python-wrapper)
        ("qtbase" ,qtbase-5)
        ("qtconnectivity" ,qtconnectivity)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative-5" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
        ("qtmultimedia-5" ,qtmultimedia-5)
        ("qtsensors" ,qtsensors)
@@ -2437,7 +2437,7 @@ (define-public python-pyqtwebengine
        ("python-pyqt" ,python-pyqt-without-qtwebkit)
        ("qtbase" ,qtbase-5)
        ("qtsvg-5" ,qtsvg-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative-5" ,qtdeclarative-5)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebengine" ,qtwebengine)))
     (arguments
@@ -2908,7 +2908,7 @@ (define-public qtwebkit
        ("fontconfig" ,fontconfig)
        ("libxrender" ,libxrender)
        ("qtbase" ,qtbase-5)
-       ("qtdeclarative" ,qtdeclarative)
+       ("qtdeclarative-5" ,qtdeclarative-5)
        ("qtlocation" ,qtlocation)
        ("qtmultimedia-5" ,qtmultimedia-5)
        ("qtsensors" ,qtsensors)
@@ -2972,7 +2972,7 @@ (define-public dotherside
     (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
@@ -3139,7 +3139,7 @@ (define-public python-pyside-2
            clang-toolchain
            qtbase-5
            qtdatavis3d
-           qtdeclarative
+           qtdeclarative-5
            qtlocation
            qtmultimedia-5
            qtquickcontrols
@@ -3188,7 +3188,7 @@ (define-public python-pyside-2
                                 (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 @@ (define-public welle-io
            rtl-sdr
            qtbase-5
            qtcharts
-           qtdeclarative
+           qtdeclarative-5
            qtgraphicaleffects
            qtmultimedia-5
            qtquickcontrols2
@@ -2159,7 +2159,7 @@ (define-public sdrangel
            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 @@ (define-public scribus
            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 a67f06de3f..a93278e016 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -860,7 +860,7 @@ (define-public ausweisapp2
     (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 @@ (define-public nextcloud-client
            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 @@ (define-public phonesim
     (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 @@ (define-public twinkle
            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 @@ (define-public cool-retro-term
                       (("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 @@ (define-public cool-retro-term
                      (,(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 @@ (define-public ghostwriter
     (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 e519f05ad5..2a9ee09edf 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -4857,7 +4857,7 @@ (define-public shotcut
            mlt
            pulseaudio
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtgraphicaleffects
            qtmultimedia-5
            qtquickcontrols
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 28e7dc18ad..7c06fff070 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -255,7 +255,7 @@ (define-public bitmask
        ("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 29526c8002..8892281f0d 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -8091,7 +8091,7 @@ (define-public kiwix-desktop
            libzim
            pugixml
            qtbase-5
-           qtdeclarative
+           qtdeclarative-5
            qtwebchannel
            qtwebengine
            xapian
-- 
2.36.1





  parent reply	other threads:[~2022-07-25 23:11 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-25 21:17 [bug#56771] [PATCH 00/33] *** Update Jami to 20220725, core Qt packages along the way Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 01/33] gnu: qtbase: Patch /bin/pwd in executable scripts Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 02/33] gnu: qtbase: Honor CMAKE_PREFIX_PATH Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 03/33] gnu: qtbase: Enable test suite Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 04/33] gnu: qtsvg: Rename variable to qtsvg-5 Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 05/33] gnu: qtsvg-5: Fix indentation Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 06/33] gnu: Add qtsvg, version 6.3.1 Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 07/33] gnu: qpwgraph: Migrate to Qt 6 and add libxkbcommon input Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 08/33] gnu: Add qtshadertools Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 09/33] gnu: qtmultimedia: Rename to qtmultimedia-5 Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 10/33] gnu: Add qtmultimedia, version 6.3.1 Maxim Cournoyer
2022-07-25 23:07   ` Maxim Cournoyer [this message]
2022-07-25 23:07   ` [bug#56771] [PATCH 12/33] gnu: Add qtdeclarative, " Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 13/33] gnu: qtquickcontrols: Rename to qtquickcontrols-5 Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 14/33] gnu: qtquickcontrols2: Rename to qtquickcontrols2-5 Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 15/33] gnu: qtquickcontrols2: Define as obsoleted by qtdeclarative Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 16/33] gnu: qtwebsockets: Rename to qtwebsockets-5 Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 17/33] gnu: Add qtwebsockets, version 6.3.1 Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 18/33] gnu: qtwebchannel: Rename to qtwebchannel-5 Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 19/33] gnu: Add qtwebchannel, version 6.3.1 Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 20/33] gnu: qtwebengine: Rename to qtwebengine-5 Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 21/33] gnu: Add qtwebengine, version 6.3.1 Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 22/33] gnu: Add qt5compat Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 23/33] gnu: qttools: Rename to qttools-5 Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 24/33] gnu: Add qttools, version 6.3.1 Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 25/33] gnu: qtnetworkauth: Rename to qtnetworkauth-5 Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 26/33] gnu: Add qtnetworkauth, version 6.3.1 Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 27/33] gnu: Add qtpositioning Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 28/33] build: qt: Add qtbase argument and wrap Qt environment variables exactly Maxim Cournoyer
2022-07-25 23:07   ` [bug#56771] [PATCH 29/33] gnu: jami: Update to 20220725.1128.fd5e6c6 Maxim Cournoyer
2022-07-25 23:08   ` [bug#56771] [PATCH 30/33] gnu: libjami: Enable test agent Maxim Cournoyer
2022-07-25 23:08   ` [bug#56771] [PATCH 31/33] gnu: Remove jami-libclient Maxim Cournoyer
2022-07-25 23:08   ` [bug#56771] [PATCH 32/33] gnu: Deprecate jami-gnome for jami Maxim Cournoyer
2022-07-25 23:08   ` [bug#56771] [PATCH 33/33] gnu: jami: Update to 20220725.1128.fd5e6c6 Maxim Cournoyer
2022-07-26 16:14 ` [bug#56771] [PATCH 00/33] *** Update Jami to 20220725, core Qt packages along the way Jack Hill
2022-07-27  5:28   ` Jack Hill
2022-08-01  4:22     ` bug#56771: " Maxim Cournoyer
2022-08-01  4:39       ` [bug#56771] " Jack Hill
2022-08-01 10:54 ` Maxime Devos
2022-08-01 15:39   ` Maxim Cournoyer
2022-08-01 22:00     ` Maxime Devos
2022-08-05 12:51     ` Maxime Devos
2022-08-06  4:56       ` Maxim Cournoyer
2022-08-06 19:15         ` Maxime Devos

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220725230803.10002-11-maxim.cournoyer@gmail.com \
    --to=maxim.cournoyer@gmail.com \
    --cc=56771@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).