Package: guix-patches;
Reported by: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Date: Mon, 25 Jul 2022 21:18:01 UTC
Severity: normal
Tags: patch
Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Bug is archived. No further changes may be made.
View this message in rfc822 format
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: 56771 <at> debbugs.gnu.org Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> Subject: [bug#56771] [PATCH 14/33] gnu: qtquickcontrols2: Rename to qtquickcontrols2-5. Date: Mon, 25 Jul 2022 19:07:44 -0400
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 @@ (define-public sddm
;; '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 @@ (define-public ktouch
qtbase-5
qtdeclarative-5
qtgraphicaleffects
- qtquickcontrols2
+ qtquickcontrols2-5
qtx11extras
qtxmlpatterns))
(home-page "https://edu.kde.org/ktouch/")
@@ -996,7 +996,7 @@ (define-public qolibri
(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 f4308cddd9..3b16ceac6b 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3425,7 +3425,7 @@ (define-public uranium
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 fea5fa4e77..f1f568fcb2 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -806,7 +806,7 @@ (define-public monero-gui
("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 @@ (define-public jami
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 @@ (define-public kirigami
;;("plasma-frameworks" ,plasma-framework) ;; Tier 3!
qtbase-5
qtdeclarative-5
- qtquickcontrols2
+ qtquickcontrols2-5
qtsvg-5
;; Run-time dependency
qtgraphicaleffects))
@@ -1342,7 +1342,7 @@ (define-public qqc2-desktop-style
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 @@ (define-public plasma-framework
("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 @@ (define-public elisa
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 @@ (define-public kamoso
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 @@ (define-public kdenlive
qtmultimedia-5
qtnetworkauth
qtquickcontrols-5
- qtquickcontrols2
+ qtquickcontrols2-5
qtscript
qtsvg-5
shared-mime-info))
@@ -347,7 +347,7 @@ (define-public kdevelop
("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 @@ (define-public kdeconnect
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 @@ (define-public linphone-desktop
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 fcfe9c2c50..bd2af2e732 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1478,7 +1478,7 @@ (define-public kaidan
qtdeclarative-5
qtgraphicaleffects
qtlocation
- qtquickcontrols2
+ qtquickcontrols2-5
qtsvg-5
qtmultimedia-5
qtxmlpatterns
@@ -2461,7 +2461,7 @@ (define-public nheko
qtkeychain
qtgraphicaleffects
qtmultimedia-5
- qtquickcontrols2
+ qtquickcontrols2-5
qtsvg-5
spdlog
single-application-qt5
@@ -2500,7 +2500,7 @@ (define-public quaternion
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 5c04382209..f7a2483b65 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -4758,7 +4758,7 @@ (define-public musescore
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 9a86b252b3..6851dd22b6 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1658,7 +1658,7 @@ (define-public qtquickcontrols-5
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")
@@ -3271,7 +3271,7 @@ (define-public python-pyside-2
qtlocation
qtmultimedia-5
qtquickcontrols-5
- qtquickcontrols2
+ qtquickcontrols2-5
qtscript
qtscxml
qtsensors
@@ -3320,7 +3320,7 @@ (define-public python-pyside-2
"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 @@ (define-public welle-io
qtdeclarative-5
qtgraphicaleffects
qtmultimedia-5
- qtquickcontrols2
+ qtquickcontrols2-5
soapysdr))
(arguments
`(#:configure-flags '("-DRTLSDR=ON"
@@ -2162,7 +2162,7 @@ (define-public sdrangel
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 a93278e016..41207318a1 100644
--- a/gnu/packages/security-token.scm
+++ b/gnu/packages/security-token.scm
@@ -863,7 +863,7 @@ (define-public ausweisapp2
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 @@ (define-public nextcloud-client
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 @@ (define-public cool-retro-term
(("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 @@ (define-public cool-retro-term
(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 726ed15e47..ed8ba06779 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -4861,7 +4861,7 @@ (define-public shotcut
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 bde96d6a90..ccba5b9968 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -258,7 +258,7 @@ (define-public bitmask
("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
--
2.36.1
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.