From bec378d331ae4d1331018ef7f40ccab6fa3d8070 Mon Sep 17 00:00:00 2001
From: Eric Brown <ecbrown@ericcbrown.com>
Date: Fri, 21 May 2021 17:34:04 -0500
Subject: [PATCH 18/37] gnu: qtlocation: Remove variable.

* gnu/packages/qt.scm (qtlocation): Remove variable.
* gnu/packages/qt.scm (qtlocation-5): New variable.
---
 gnu/packages/astronomy.scm | 2 +-
 gnu/packages/geo.scm       | 4 ++--
 gnu/packages/qt.scm        | 8 ++++----
 gnu/packages/radio.scm     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index cb318d6c33..13c6d4fc73 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -413,7 +413,7 @@ deconvolution).  Such post-processing is not performed by Stackistry.")
     (build-system cmake-build-system)
     (inputs
      `(("qtbase" ,qtbase-5)
-       ("qtlocation" ,qtlocation)
+       ("qtlocation" ,qtlocation-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtscript" ,qtscript)
        ("qtserialport" ,qtserialport-5)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 93ce66c54a..91eaf837b5 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1665,7 +1665,7 @@ using the dataset of topographical information collected by
        ("proj" ,proj)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtlocation" ,qtlocation)
+       ("qtlocation" ,qtlocation-5)
        ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebengine" ,qtwebengine)
        ("quazip" ,quazip)
@@ -2285,7 +2285,7 @@ growing set of geoscientific methods.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtkeychain" ,qtkeychain)
-       ("qtlocation" ,qtlocation)
+       ("qtlocation" ,qtlocation-5)
        ("qtserialport" ,qtserialport-5)
        ("qtsvg" ,qtsvg-5)
        ("qtwebkit" ,qtwebkit)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 811291e05e..608f9a8973 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1373,7 +1373,7 @@ OpenGL ES 2.0 and can be used in HTML5 canvas elements")))
 application without necessarily including a full web browser stack by using
 native APIs where it makes sense.")))
 
-(define-public qtlocation
+(define-public qtlocation-5
   (package (inherit qtsvg-5)
     (name "qtlocation")
     (version "5.15.2")
@@ -2219,7 +2219,7 @@ module provides support functions to the automatically generated code.")
        ("qtbase" ,qtbase-5)
        ("qtconnectivity" ,qtconnectivity-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtlocation" ,qtlocation)
+       ("qtlocation" ,qtlocation-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtsensors" ,qtsensors-5)
        ("qtserialport" ,qtserialport-5)
@@ -2800,7 +2800,7 @@ different kinds of sliders, and much more.")
        ("libxrender" ,libxrender)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtlocation" ,qtlocation)
+       ("qtlocation" ,qtlocation-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtsensors" ,qtsensors-5)
        ("qtwebchannel" ,qtwebchannel-5)
@@ -3031,7 +3031,7 @@ color-related widgets.")
        ("clang-toolchain" ,clang-toolchain)
        ("qtbase" ,qtbase-5)
        ("qtdatavis3d" ,qtdatavis3d)
-       ("qtlocation" ,qtlocation)
+       ("qtlocation" ,qtlocation-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtquickcontrols" ,qtquickcontrols)
        ("qtscript" ,qtscript)
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 734ddb66dc..4758a40432 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1801,7 +1801,7 @@ voice formats.")
        ("qtbase" ,qtbase-5)
        ("qtcharts" ,qtcharts)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtlocation" ,qtlocation)
+       ("qtlocation" ,qtlocation-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtserialport" ,qtserialport-5)
        ("qtspeech" ,qtspeech)
-- 
2.31.1