From 5aa78a4dd1705e8b92b9e87116c6e167d7f72653 Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Fri, 21 May 2021 19:02:22 -0500 Subject: [PATCH 23/37] gnu: qtquickcontrols2: Remove variable. * gnu/packages/qt.scm (qtquickcontrols2): Remove variable. * gnu/packages/qt.scm (qtquickcontrols2-5): New variable. --- gnu/packages/display-managers.scm | 2 +- gnu/packages/education.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 | 4 ++-- gnu/packages/music.scm | 2 +- gnu/packages/radio.scm | 2 +- gnu/packages/sync.scm | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index bc6fe529a5..75726fa8a6 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -88,7 +88,7 @@ ;; 'wrap-qt-program'. ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) - ("qtquickcontrols2" ,qtquickcontrols2) + ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtsvg" ,qtsvg-5) ("shadow" ,shadow) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 4efce2834c..6b1bedcf6b 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -714,7 +714,7 @@ language and very flexible regarding to new or unknown keyboard layouts.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) - ("qtquickcontrols2" ,qtquickcontrols2) + ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtx11extras" ,qtx11extras-5) ("qtxmlpatterns" ,qtxmlpatterns-5))) (home-page "https://edu.kde.org/ktouch/") diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 2b695adb7c..c3ba5a31da 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -777,7 +777,7 @@ the Monero command line client and daemon.") ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) - ("qtquickcontrols2",qtquickcontrols2) + ("qtquickcontrols2",qtquickcontrols2-5) ("qtsvg" ,qtsvg-5) ("qtxmlpatterns" ,qtxmlpatterns-5))) (arguments diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 4af9b908b3..b1731911f4 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -608,7 +608,7 @@ decentralized calling using P2P-DHT.") ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) - ("qtquickcontrols2" ,qtquickcontrols2))) + ("qtquickcontrols2" ,qtquickcontrols2-5))) (propagated-inputs `(("libring" ,libring))) ;for dring (home-page "https://jami.net") diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 4e18af65fe..e6f92f1ac7 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -891,7 +891,7 @@ or user activity.") ;;("plasma-frameworks" ,plasma-framework) ;; Tier 3! ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtquickcontrols2" ,qtquickcontrols2) + ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtsvg" ,qtsvg-5) ;; Run-time dependency ("qtgraphicaleffects" ,qtgraphicaleffects))) @@ -1380,7 +1380,7 @@ libpulse.") ("kirigami" ,kirigami) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtquickcontrols2" ,qtquickcontrols2))) + ("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 @@ -3459,7 +3459,7 @@ setUrl, setUserAgent and call.") ("phonon" ,phonon) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtquickcontrols2" ,qtquickcontrols2) + ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras-5) ("solid" ,solid))) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 6e05c527d2..40b32fa5b1 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -174,7 +174,7 @@ This package is part of the KDE multimedia module.") ("qtgraphicaleffects" ,qtgraphicaleffects) ; not listed as dependency ("qtmultimedia" ,qtmultimedia-5) ("qtquickcontrols" ,qtquickcontrols) - ("qtquickcontrols2" ,qtquickcontrols2) + ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras-5) ;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt @@ -472,7 +472,7 @@ autoloading of subtitle files for use while playing video.") ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) - ("qtquickcontrols2" ,qtquickcontrols2) ; not listed as dependency + ("qtquickcontrols2" ,qtquickcontrols2-5) ; not listed as dependency ("qtx11extras" ,qtx11extras-5))) (arguments `(#:tests? #f ; test program gets built, but is not found diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index cbfe007e34..7cfac4efc2 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -260,7 +260,7 @@ browser for easy news reading.") ("kdeclarative" ,kdeclarative) ("qtdeclarative" ,qtdeclarative-5) ("qtquickcontrols" ,qtquickcontrols) - ("qtquickcontrols2" ,qtquickcontrols2) + ("qtquickcontrols2" ,qtquickcontrols2-5) ("kiconthemes" ,kiconthemes) ("breeze" ,breeze) ; make dark them available easily ("breeze-icons" ,breeze-icons) ; recommended icon set @@ -353,7 +353,7 @@ projects.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtquickcontrols" ,qtquickcontrols) ;; not checked as requirement - ("qtquickcontrols2" ,qtquickcontrols2) ;; not checked as requirement + ("qtquickcontrols2" ,qtquickcontrols2-5) ;; not checked as requirement ("qtwebkit" ,qtwebkit) ("threadweaver" ,threadweaver) @@ -753,7 +753,7 @@ different notification systems.") ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtmultimedia" ,qtmultimedia-5) ("qtquickcontrols" ,qtquickcontrols) - ("qtquickcontrols2" ,qtquickcontrols2) + ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtwayland" ,qtwayland-5) ("qtx11extras" ,qtx11extras-5))) (home-page "https://community.kde.org/KDEConnect") diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index e605001526..e7314f46b6 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -864,7 +864,7 @@ and video calls or instant messaging capabilities to an application.") ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) - ("qtquickcontrols2" ,qtquickcontrols2) + ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtsvg" ,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 4bfca01c04..3ad03e28ea 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2333,7 +2333,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtmultimedia" ,qtmultimedia-5) - ("qtquickcontrols2" ,qtquickcontrols2) + ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtsvg" ,qtsvg-5) ("spdlog" ,spdlog) ("tweeny" ,tweeny) @@ -2386,7 +2386,7 @@ There is support for: ("qtdeclarative" ,qtdeclarative-5) ("qtmultimedia" ,qtmultimedia-5) ("qtquickcontrols" ,qtquickcontrols) - ("qtquickcontrols2" ,qtquickcontrols2) + ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtsvg" ,qtsvg-5) ("qttools" ,qttools-5) ("xdg-utils" ,xdg-utils))) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 579044728c..b1e765c049 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4744,7 +4744,7 @@ standalone JACK client and an LV2 plugin is also available.") ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtquickcontrols2" ,qtquickcontrols2) + ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtscript" ,qtscript-5) ("qtsvg" ,qtsvg-5) ("qtxmlpatterns" ,qtxmlpatterns-5))) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index 0113efb159..c6173100a9 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1569,7 +1569,7 @@ receiver.") ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtmultimedia" ,qtmultimedia-5) - ("qtquickcontrols2" ,qtquickcontrols2))) + ("qtquickcontrols2" ,qtquickcontrols2-5))) (arguments `(#:configure-flags '("-DRTLSDR=ON") #:tests? #f)) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index c43561f004..c9454dacf1 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -196,7 +196,7 @@ ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtkeychain" ,qtkeychain) - ("qtquickcontrols2" ,qtquickcontrols2) + ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtsolutions" ,qtsolutions) ("qtsvg" ,qtsvg-5) ("qtwebchannel" ,qtwebchannel-5) -- 2.31.1