From 2f282e2109a1f9d0d5140dd1f66a2d0484194680 Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Sat, 22 May 2021 05:10:23 -0500 Subject: [PATCH 33/37] gnu: qtquickcontrols: Remove variable. * gnu/packages/qt.scm (qtquickcontrols): Remove variable. * gnu/packages/qt.scm (qtquickcontrols2): Update to 6.1.0. * gnu/packages/qt.scm (qtquickcontrols-5): New variable. * gnu/packages/qt.scm (qtquickcontrols2-5): New variable. --- gnu/packages/audio.scm | 2 +- gnu/packages/display-managers.scm | 2 +- gnu/packages/documentation.scm | 2 +- gnu/packages/education.scm | 2 +- gnu/packages/finance.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-multimedia.scm | 4 ++-- gnu/packages/kde.scm | 6 +++--- gnu/packages/linphone.scm | 2 +- gnu/packages/messaging.scm | 2 +- gnu/packages/qt.scm | 8 ++++---- gnu/packages/telephony.scm | 2 +- gnu/packages/terminals.scm | 2 +- gnu/packages/text-editors.scm | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 6b701da93a..67969dcd61 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -5098,7 +5098,7 @@ Rate} 3600x2250 bit/s vocoder used in various radio systems.") ("qttools" ,qttools-5))) (inputs `(("jack" ,jack-1) ;for JACK examples - ("qtquickcontrols" ,qtquickcontrols))) ;for Qt examples + ("qtquickcontrols" ,qtquickcontrols-5))) ;for Qt examples (propagated-inputs ;; This is because include/ableton/platforms/asio/AsioWrapper.hpp ;; contains '#include '. diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 6948491d66..a0c926373a 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -87,7 +87,7 @@ ;; QtQuick & co. here; they end up in QML2_IMPORT_PATH thanks to ;; 'wrap-qt-program'. ("qtgraphicaleffects" ,qtgraphicaleffects-5) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols" ,qtquickcontrols-5) ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtsvg" ,qtsvg-5) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index c2eee7c0ce..ae8246f16e 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -334,7 +334,7 @@ local system.") ("qtdeclarative" ,qtdeclarative-5) ("qtwebchannel" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols" ,qtquickcontrols-5) ("qtx11extras" ,qtx11extras-5) ("xcb-util-keyms" ,xcb-util-keysyms))) (home-page "https://zealdocs.org/") diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 94846ce915..6600078b11 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -194,7 +194,7 @@ of categories with some of the activities available in that category. ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects-5) ("qtmultimedia" ,qtmultimedia-5) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols" ,qtquickcontrols-5) ("qtsensors" ,qtsensors-5) ("qtsvg" ,qtsvg-5) ("qtxmlpatterns" ,qtxmlpatterns-5))) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 0060d335e8..ef7a2c9387 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -776,7 +776,7 @@ the Monero command line client and daemon.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects-5) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols" ,qtquickcontrols-5) ("qtquickcontrols2",qtquickcontrols2-5) ("qtsvg" ,qtsvg-5) ("qtxmlpatterns" ,qtxmlpatterns-5))) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 6a4be92cb7..d8d497f38b 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -607,7 +607,7 @@ decentralized calling using P2P-DHT.") ("qtmultimedia" ,qtmultimedia-5) ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects-5) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols" ,qtquickcontrols-5) ("qtquickcontrols2" ,qtquickcontrols2-5))) (propagated-inputs `(("libring" ,libring))) ;for dring diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index e0c1559a77..af6ddfab26 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -173,7 +173,7 @@ This package is part of the KDE multimedia module.") ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects-5) ; not listed as dependency ("qtmultimedia" ,qtmultimedia-5) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols" ,qtquickcontrols-5) ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras-5) @@ -471,7 +471,7 @@ autoloading of subtitle files for use while playing video.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects-5) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols" ,qtquickcontrols-5) ("qtquickcontrols2" ,qtquickcontrols2-5) ; not listed as dependency ("qtx11extras" ,qtx11extras-5))) (arguments diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 520a9fb0dc..92f83baf43 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -259,7 +259,7 @@ browser for easy news reading.") ("kdoctools" ,kdoctools) ("kdeclarative" ,kdeclarative) ("qtdeclarative" ,qtdeclarative-5) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols" ,qtquickcontrols-5) ("qtquickcontrols2" ,qtquickcontrols2-5) ("kiconthemes" ,kiconthemes) ("breeze" ,breeze) ; make dark them available easily @@ -352,7 +352,7 @@ projects.") ("oxygen-icons" ,oxygen-icons) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtquickcontrols" ,qtquickcontrols) ;; not checked as requirement + ("qtquickcontrols" ,qtquickcontrols-5) ;; not checked as requirement ("qtquickcontrols2" ,qtquickcontrols2-5) ;; not checked as requirement ("qtwebkit" ,qtwebkit) ("threadweaver" ,threadweaver) @@ -752,7 +752,7 @@ different notification systems.") ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects-5) ("qtmultimedia" ,qtmultimedia-5) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols" ,qtquickcontrols-5) ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtwayland" ,qtwayland-5) ("qtx11extras" ,qtx11extras-5))) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index 3e0f50267b..59cf452b24 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -863,7 +863,7 @@ and video calls or instant messaging capabilities to an application.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects-5) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols" ,qtquickcontrols-5) ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtsvg" ,qtsvg-5))) (synopsis "Desktop client for the Linphone SIP softphone") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 360e3735b4..54e3ba5a83 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2385,7 +2385,7 @@ There is support for: ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtmultimedia" ,qtmultimedia-5) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols" ,qtquickcontrols-5) ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtsvg" ,qtsvg-5) ("qttools" ,qttools-5) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 722c614009..85e3f6adf0 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1392,7 +1392,7 @@ native APIs where it makes sense."))) (native-inputs `(("perl" ,perl) ("qtdeclarative" ,qtdeclarative-5) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols" ,qtquickcontrols2-5) ("qtserialport" ,qtserialport-5))) (inputs `(("icu4c" ,icu4c) @@ -1475,7 +1475,7 @@ that helps in Qt development."))) The following guides and references cover aspects of programming with ECMAScript and Qt."))) -(define-public qtquickcontrols-2-5 +(define-public qtquickcontrols-5 (package (inherit qtsvg-5) (name "qtquickcontrols-5") (version "5.15.2") @@ -1502,7 +1502,7 @@ can be used to build complete interfaces in Qt Quick."))) (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt5-urls "qtquickcontrols2" version)) (sha256 (base32 "06c9vrwvbjmzapmfa25y34lgjkzg57xxbm92nr6wkv5qykjnq6v7")))) @@ -3164,7 +3164,7 @@ color-related widgets.") ("qtdatavis3d" ,qtdatavis3d-5) ("qtlocation" ,qtlocation-5) ("qtmultimedia" ,qtmultimedia-5) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols" ,qtquickcontrols-5) ("qtscript" ,qtscript-5) ("qtscxml" ,qtscxml-5) ("qtsensors" ,qtsensors-5) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index eed82071e0..ceb689fb8b 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -707,7 +707,7 @@ Mumble consists of two applications for separate usage: ("libxml2" ,libxml2) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols" ,qtquickcontrols-5) ("readline" ,readline) ("speex" ,speex) ("speexdsp" ,speexdsp) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index dd5b62df76..79c229a896 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -648,7 +648,7 @@ embedded kernel situations.") `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects-5) - ("qtquickcontrols" ,qtquickcontrols))) + ("qtquickcontrols" ,qtquickcontrols-5))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index cfb9c601d7..00e761f055 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -620,7 +620,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtmultimedia" ,qtmultimedia-5) - ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols" ,qtquickcontrols-5) ("qtsvg" ,qtsvg-5) ("qtwebchannel" ,qtwebchannel-5))) (propagated-inputs ; To get native-search-path -- 2.31.1