z572 pushed a commit to branch kde-team
in repository guix.
commit bc106ace301d9240a5a0beb80424272ec1218cc6
Author: Zheng Junjie <zhengjun...@iscas.ac.cn>
AuthorDate: Wed Jul 10 23:19:07 2024 +0800
gnu: qtlocation: Rename to qtlocation-5.
* gnu/packages/qt.scm (qtlocation): Rename to qtlocation-5.
(python-pyqt,python-pyside-2):
* gnu/packages/astronomy.scm (stellarium):
* gnu/packages/kde-pim.scm (itinerary):
* gnu/packages/kde-utils.scm (kirogi):
* gnu/packages/kde.scm (marble-qt):
* gnu/packages/messaging.scm (kaidan):
* gnu/packages/geo.scm (qmapshack,openorienteering-mapper):
(qgis):
* gnu/packages/gps.scm (gpxsee):
* gnu/packages/radio.scm (sdrangel):
(qdmr): Use new name.
Change-Id: I51664e36bd1ce25f5add09c6d64665bf505cc551
---
gnu/packages/astronomy.scm | 2 +-
gnu/packages/geo.scm | 6 +++---
gnu/packages/gps.scm | 2 +-
gnu/packages/kde-pim.scm | 2 +-
gnu/packages/kde-utils.scm | 2 +-
gnu/packages/kde.scm | 2 +-
gnu/packages/messaging.scm | 2 +-
gnu/packages/qt.scm | 6 +++---
gnu/packages/radio.scm | 4 ++--
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index 2ce0d66894..01ef7304d9 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -1608,7 +1608,7 @@ deconvolution). Such post-processing is not performed by
Stackistry.")
openssl
qtbase-5
qtcharts
- qtlocation
+ qtlocation-5
qtmultimedia-5
qtpositioning
qtscript
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 9923ca9195..954a4ad4a0 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2515,7 +2515,7 @@ data.")
proj
qtbase-5
qtdeclarative-5
- qtlocation
+ qtlocation-5
qtwebchannel-5
qtwebengine-5
quazip
@@ -2751,7 +2751,7 @@ track your position right from your laptop.")
proj
qtbase-5
qtimageformats-5
- qtlocation
+ qtlocation-5
qtsensors-5
zlib))
(native-inputs
@@ -3213,7 +3213,7 @@ SET\\(PYQT5_SIP_DIR
\"\\$\\{Python_SITEARCH\\}/PyQt5/bindings\"\\)")
qtbase-5
qtdeclarative-5
qtkeychain
- qtlocation
+ qtlocation-5
qtmultimedia-5
qtserialport-5
qtsvg-5
diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index 09a419d7e9..ce7e4bfbe3 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -203,7 +203,7 @@ coordinates as well as partial support for adjustments in
global coordinate syst
(string-append "PREFIX="
(assoc-ref outputs "out"))))))))
(inputs
- (list qtbase-5 qtlocation qtsvg-5))
+ (list qtbase-5 qtlocation-5 qtsvg-5))
(native-inputs
(list qttools-5))
(home-page "https://www.gpxsee.org";)
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index f15aaf0a47..4e463030d0 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -418,7 +418,7 @@ Akonadi PIM data server. It uses Xapian for indexing and
querying.")
prison
qtdeclarative-5
qtgraphicaleffects
- qtlocation
+ qtlocation-5
qtmultimedia-5
qtquickcontrols2-5
qqc2-desktop-style
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index cac92b9c92..c7e3a15bcd 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -681,7 +681,7 @@ with support for QR scanning.")
qtgraphicaleffects
qtdeclarative-5
qtgamepad
- qtlocation))
+ qtlocation-5))
(propagated-inputs (list gstreamer))
(home-page "https://apps.kde.org/kirogi/";)
(synopsis "Ground control application for drones")
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 9ab5cbe199..4dbbb4deb7 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -1645,7 +1645,7 @@ Python, PHP, and Perl.")
protobuf
qtbase-5
qtdeclarative-5
- qtlocation
+ qtlocation-5
qtserialport
qtsvg-5
qtwebchannel-5
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 0278653faf..2d398a2cc3 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1501,7 +1501,7 @@ default.")
qtbase-5
qtdeclarative-5
qtgraphicaleffects
- qtlocation
+ qtlocation-5
qtquickcontrols2-5
qtsvg-5
qtmultimedia-5
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 1b15303ca9..9853a7470d 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2289,7 +2289,7 @@ native APIs where it makes sense.")))
Server Protocol (LSP) for Qt.")
(license (package-license qtbase))))
-(define-public qtlocation
+(define-public qtlocation-5
(package
(inherit qtsvg-5)
(name "qtlocation")
@@ -3976,7 +3976,7 @@ module provides support functions to the automatically
generated code.")
("qtbase" ,qtbase-5)
("qtconnectivity" ,qtconnectivity)
("qtdeclarative-5" ,qtdeclarative-5)
- ("qtlocation" ,qtlocation)
+ ("qtlocation" ,qtlocation-5)
("qtmultimedia-5" ,qtmultimedia-5)
("qtsensors" ,qtsensors-5)
("qtserialport" ,qtserialport-5)
@@ -4836,7 +4836,7 @@ color-related widgets.")
(list qtbase-5
qtdatavis3d
qtdeclarative-5
- qtlocation
+ qtlocation-5
qtmultimedia-5
qtquickcontrols-5
qtquickcontrols2-5
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index db8b2c9de6..502b04495a 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -2670,7 +2670,7 @@ voice formats.")
qtcharts
qtdeclarative-5
qtgamepad
- qtlocation
+ qtlocation-5
qtmultimedia-5
qtquickcontrols2-5
qtserialport-5
@@ -3260,7 +3260,7 @@ memory contents between them.")
(substitute* "lib/CMakeLists.txt"
(("(DESTINATION \")/etc/udev/" _ directive)
(string-append directive #$output "/lib/udev/"))))))))
- (inputs (list libusb qtbase-5 qtlocation qtserialport-5 yaml-cpp))
+ (inputs (list libusb qtbase-5 qtlocation-5 qtserialport-5 yaml-cpp))
(native-inputs (list qttools-5))
(home-page "https://dm3mat.darc.de/qdmr/";)
(synopsis "GUI application and command line tool to program DMR radios")
