From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 56771@debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#56771] [PATCH 14/33] gnu: qtquickcontrols2: Rename to qtquickcontrols2-5.
Date: Mon, 25 Jul 2022 19:07:44 -0400 [thread overview]
Message-ID: <20220725230803.10002-14-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <20220725230803.10002-1-maxim.cournoyer@gmail.com>
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
next prev parent reply other threads:[~2022-07-25 23:12 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 ` [bug#56771] [PATCH 11/33] gnu: qtdeclarative: Rename to qtdeclarative-5 Maxim Cournoyer
2022-07-25 23:07 ` [bug#56771] [PATCH 12/33] gnu: Add qtdeclarative, version 6.3.1 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 ` Maxim Cournoyer [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220725230803.10002-14-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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.