15/35: gnu: qtquickcontrols2: Rename to qtquickcontrols2-5.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 1130fc59917e4ea0244ea58fdf1b5ef49e30a5d5
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sun Jul 17 23:49:07 2022 -0400

    gnu: qtquickcontrols2: Rename to qtquickcontrols2-5.
    
    Automated via:
    
      git grep -l qtquickcontrols2 | xargs sed 's/\bqtquickcontrols2\b/\0-5/g' 
-i
      git checkout NEWS
---
 gnu/packages/display-managers.scm | 2 +-
 gnu/packages/education.scm        | 4 ++--
 gnu/packages/engineering.scm      | 2 +-
 gnu/packages/finance.scm          | 2 +-
 gnu/packages/jami.scm             | 2 +-
 gnu/packages/kde-frameworks.scm   | 6 +++---
 gnu/packages/kde-multimedia.scm   | 4 ++--
 gnu/packages/kde.scm              | 6 +++---
 gnu/packages/linphone.scm         | 2 +-
 gnu/packages/messaging.scm        | 6 +++---
 gnu/packages/music.scm            | 2 +-
 gnu/packages/qt.scm               | 6 +++---
 gnu/packages/radio.scm            | 4 ++--
 gnu/packages/security-token.scm   | 2 +-
 gnu/packages/sync.scm             | 2 +-
 gnu/packages/terminals.scm        | 4 ++--
 gnu/packages/video.scm            | 2 +-
 gnu/packages/vpn.scm              | 2 +-
 18 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/display-managers.scm 
b/gnu/packages/display-managers.scm
index 7e0218dbb7..32ec5c3141 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -92,7 +92,7 @@
            ;; 'wrap-qt-program'.
            qtgraphicaleffects
            qtquickcontrols-5
-           qtquickcontrols2
+           qtquickcontrols2-5
            qtsvg-5
            shadow
            wayland))
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index cb0d71cc54..6a9de32ffb 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -674,7 +674,7 @@ language and very flexible regarding to new or unknown 
keyboard layouts.")
            qtbase-5
            qtdeclarative-5
            qtgraphicaleffects
-           qtquickcontrols2
+           qtquickcontrols2-5
            qtx11extras
            qtxmlpatterns))
     (home-page "https://edu.kde.org/ktouch/";)
@@ -996,7 +996,7 @@ formats.")
      (list libeb
            qtbase-5
            qtmultimedia-5
-           qtquickcontrols2
+           qtquickcontrols2-5
            qtdeclarative-5
            qtwebchannel
            qtwebengine
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 7ad1873a85..d8d3e481d2 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3425,7 +3425,7 @@ compiled translations.  Prebuilt Firmware files are 
removed.")
            qtdeclarative-5
            qtgraphicaleffects
            qtquickcontrols-5
-           qtquickcontrols2
+           qtquickcontrols2-5
            qtsvg-5))
     (arguments
      `(;; FIXME: tests are disabled, because they cause an infinite loop.
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index ff6efa0a84..b7937a310a 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -806,7 +806,7 @@ the Monero command line client and daemon.")
        ("qtdeclarative-5" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols-5" ,qtquickcontrols-5)
-       ("qtquickcontrols2",qtquickcontrols2)
+       ("qtquickcontrols2-5",qtquickcontrols2-5)
        ("qtsvg-5" ,qtsvg-5)
        ("qtxmlpatterns" ,qtxmlpatterns)))
     (arguments
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 8d8d29c0db..97475063dc 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -611,7 +611,7 @@ decentralized calling using P2P-DHT.")
            qtdeclarative-5
            qtgraphicaleffects
            qtquickcontrols-5
-           qtquickcontrols2))
+           qtquickcontrols2-5))
     (home-page "https://jami.net";)
     (synopsis "Qt Jami client")
     (description "This package provides the Jami Qt client.  Jami is a secure
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 1c10183f29..6fc0b5f10c 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -876,7 +876,7 @@ or user activity.")
            ;;("plasma-frameworks" ,plasma-framework) ;; Tier 3!
            qtbase-5
            qtdeclarative-5
-           qtquickcontrols2
+           qtquickcontrols2-5
            qtsvg-5
            ;; Run-time dependency
            qtgraphicaleffects))
@@ -1342,7 +1342,7 @@ libpulse.")
            kirigami
            qtbase-5
            qtdeclarative-5
-           qtquickcontrols2))
+           qtquickcontrols2-5))
     (home-page "https://community.kde.org/Frameworks";)
     (synopsis "QtQuickControls2 style that integrates with the desktop")
     (description "This is a style for QtQuickControls2 which is using
@@ -3338,7 +3338,7 @@ setUrl, setUserAgent and call.")
        ("phonon" ,phonon)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative-5" ,qtdeclarative-5)
-       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtquickcontrols2-5" ,qtquickcontrols2-5)
        ("qtsvg-5" ,qtsvg-5)
        ("qtx11extras" ,qtx11extras)
        ("solid" ,solid)))
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index 34da2ef3f2..ac86489a95 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -176,7 +176,7 @@ This package is part of the KDE multimedia module.")
            qtgraphicaleffects ; not listed as dependency
            qtmultimedia-5
            qtquickcontrols-5
-           qtquickcontrols2
+           qtquickcontrols2-5
            qtsvg-5
            qtx11extras
            ;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt
@@ -532,7 +532,7 @@ autoloading of subtitle files for use while playing video.")
            qtdeclarative-5
            qtgraphicaleffects
            qtquickcontrols-5
-           qtquickcontrols2 ; not listed as dependency
+           qtquickcontrols2-5 ; not listed as dependency
            qtx11extras))
     (arguments
      (list #:tests? #f ; test program gets built, but is not found
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 143cb3b6a9..f11419afb9 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -290,7 +290,7 @@ browser for easy news reading.")
            qtmultimedia-5
            qtnetworkauth
            qtquickcontrols-5
-           qtquickcontrols2
+           qtquickcontrols2-5
            qtscript
            qtsvg-5
            shared-mime-info))
@@ -347,7 +347,7 @@ projects.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative-5" ,qtdeclarative-5)
        ("qtquickcontrols-5" ,qtquickcontrols-5)  ;; not checked as requirement
-       ("qtquickcontrols2" ,qtquickcontrols2)  ;; not checked as requirement
+       ("qtquickcontrols2-5" ,qtquickcontrols2-5)  ;; not checked as 
requirement
        ("qtwebkit" ,qtwebkit)
        ("threadweaver" ,threadweaver)
 
@@ -749,7 +749,7 @@ different notification systems.")
            qtgraphicaleffects
            qtmultimedia-5
            qtquickcontrols-5
-           qtquickcontrols2
+           qtquickcontrols2-5
            qtx11extras))
     (home-page "https://community.kde.org/KDEConnect";)
     (synopsis "Enable your devices to communicate with each other")
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index a488fc3244..47fb94dc68 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -855,7 +855,7 @@ and video calls or instant messaging capabilities to an 
application.")
            qtdeclarative-5
            qtgraphicaleffects
            qtquickcontrols-5
-           qtquickcontrols2
+           qtquickcontrols2-5
            qtsvg-5))
     (synopsis "Desktop client for the Linphone SIP softphone")
     (description "Linphone is a SIP softphone for voice and video over IP 
calling
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 13246d0fbe..836b503784 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1479,7 +1479,7 @@ default.")
                   qtdeclarative-5
                   qtgraphicaleffects
                   qtlocation
-                  qtquickcontrols2
+                  qtquickcontrols2-5
                   qtsvg-5
                   qtmultimedia-5
                   qtxmlpatterns
@@ -2461,7 +2461,7 @@ for the Matrix protocol.  It is built on to of 
@code{Boost.Asio}.")
            qtkeychain
            qtgraphicaleffects
            qtmultimedia-5
-           qtquickcontrols2
+           qtquickcontrols2-5
            qtsvg-5
            spdlog
            single-application-qt5
@@ -2500,7 +2500,7 @@ notification, emojis, E2E encryption, and voip calls.")
            qtdeclarative-5
            qtmultimedia-5
            qtquickcontrols-5
-           qtquickcontrols2
+           qtquickcontrols2-5
            qtsvg-5
            qttools
            xdg-utils))
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index ed188da94a..1147512980 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -4759,7 +4759,7 @@ includes LV2 plugins and a JACK standalone client.")
            qtbase-5
            qtdeclarative-5
            qtgraphicaleffects
-           qtquickcontrols2
+           qtquickcontrols2-5
            qtscript
            qtsvg-5
            qtxmlpatterns))
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index fb6fb5245c..061c9a5a1e 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1656,7 +1656,7 @@ ECMAScript and Qt.")))
 applications scriptable.  This module provides a set of extra components that
 can be used to build complete interfaces in Qt Quick.")))
 
-(define-public qtquickcontrols2
+(define-public qtquickcontrols2-5
   (package (inherit qtsvg-5)
     (name "qtquickcontrols2")
     (version "5.15.2")
@@ -3269,7 +3269,7 @@ color-related widgets.")
            qtlocation
            qtmultimedia-5
            qtquickcontrols-5
-           qtquickcontrols2
+           qtquickcontrols2-5
            qtscript
            qtscxml
            qtsensors
@@ -3318,7 +3318,7 @@ color-related widgets.")
                                 "qtlocation"
                                 "qtmultimedia-5"
                                 "qtquickcontrols-5"
-                                "qtquickcontrols2"
+                                "qtquickcontrols2-5"
                                 "qtscript"
                                 "qtscxml"
                                 "qtsensors"
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 1438d4fd7d..989d5670f4 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1931,7 +1931,7 @@ receiver.")
            qtdeclarative-5
            qtgraphicaleffects
            qtmultimedia-5
-           qtquickcontrols2
+           qtquickcontrols2-5
            soapysdr))
     (arguments
      `(#:configure-flags '("-DRTLSDR=ON"
@@ -2162,7 +2162,7 @@ voice formats.")
            qtdeclarative-5
            qtlocation
            qtmultimedia-5
-           qtquickcontrols2
+           qtquickcontrols2-5
            qtserialport
            qtspeech
            qtwebsockets
diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm
index 11f9674720..3c8d6d3321 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -860,7 +860,7 @@ devices.")
            qtdeclarative-5
            qtwebsockets
            qtgraphicaleffects
-           qtquickcontrols2
+           qtquickcontrols2-5
            pcsc-lite
            openssl))
     (arguments
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 23294e39f6..f364195341 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -192,7 +192,7 @@
            qtdeclarative-5
            qtgraphicaleffects
            qtkeychain
-           qtquickcontrols2
+           qtquickcontrols2-5
            qtsolutions
            qtsvg-5
            qtwebchannel
diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm
index 2d43cfa493..7e5016f08f 100644
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@ -783,7 +783,7 @@ embedded kernel situations.")
                       (("COMMODORE_PET") "PROGGY_TINY"))))))
       (build-system gnu-build-system)
       (inputs
-       (list qtbase-5 qtdeclarative-5 qtgraphicaleffects qtquickcontrols2 
bash-minimal))
+       (list qtbase-5 qtdeclarative-5 qtgraphicaleffects qtquickcontrols2-5 
bash-minimal))
       (arguments
        `(#:phases
          (modify-phases %standard-phases
@@ -807,7 +807,7 @@ embedded kernel situations.")
                                (string-append (assoc-ref inputs i) qml))
                              '("qtdeclarative-5"
                                "qtgraphicaleffects"
-                               "qtquickcontrols2"))))))))
+                               "qtquickcontrols2-5"))))))))
            (add-after 'install 'add-alternate-name
              (lambda* (#:key outputs #:allow-other-keys)
                (let ((bin (string-append (assoc-ref outputs "out") "/bin")))
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 347e84db6f..29a3e651c9 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -4861,7 +4861,7 @@ transitions, and effects and then export your film to 
many common formats.")
            qtgraphicaleffects
            qtmultimedia-5
            qtquickcontrols-5
-           qtquickcontrols2
+           qtquickcontrols2-5
            qtsvg-5
            qtwebkit
            qtwebsockets
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 71444d6bb6..a884feabf4 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -259,7 +259,7 @@
        ("qtdeclarative-5" ,qtdeclarative-5)
        ("qtgraphicaleffects" ,qtgraphicaleffects)
        ("qtquickcontrols-5" ,qtquickcontrols-5)
-       ("qtquickcontrols2" ,qtquickcontrols2)
+       ("qtquickcontrols2-5" ,qtquickcontrols2-5)
        ("qtsvg-5" ,qtsvg-5)))
     (propagated-inputs
      (list go-0xacab-org-leap-shapeshifter