From 84df7d4a5988609dac7a635d6804e4d48ca297de Mon Sep 17 00:00:00 2001
From: Eric Brown <ecbrown@ericcbrown.com>
Date: Fri, 21 May 2021 20:19:13 -0500
Subject: [PATCH 32/37] gnu: qtspell: Remove variable.

 * gnu/packages/qt.scm (qtspeech): Remove variable.
 * gnu/packages/qt.scm (qtspeech-5): New variable.
---
 gnu/packages/games.scm          | 2 +-
 gnu/packages/kde-frameworks.scm | 4 ++--
 gnu/packages/kde-pim.scm        | 4 ++--
 gnu/packages/kde-utils.scm      | 2 +-
 gnu/packages/kde.scm            | 2 +-
 gnu/packages/qt.scm             | 6 +++---
 gnu/packages/radio.scm          | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index bb4e21f949..53adde135b 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -11916,7 +11916,7 @@ and chess engines.")
     (inputs
      `(("qtbase" ,qtbase-5)
        ("qtmultimedia" ,qtmultimedia-5)
-       ("qtspeech" ,qtspeech)
+       ("qtspeech" ,qtspeech-5)
        ("qtsvg" ,qtsvg-5)
        ("zlib" ,zlib)))
     (arguments
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index b72ccf03fb..9275e0cad8 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1898,7 +1898,7 @@ asynchronous jobs.")
        ("kwindowsystem" ,kwindowsystem)
        ("phonon" ,phonon)
        ("qtbase" ,qtbase-5)
-       ("qtspeech" ,qtspeech)
+       ("qtspeech" ,qtspeech-5)
        ;; TODO: Think about adding dbusmenu-qt5 from
        ;; https://launchpad.net/libdbusmenu-qt
        ("qtx11extras" ,qtx11extras-5)))
@@ -3263,7 +3263,7 @@ library.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kwindowsystem" ,kwindowsystem)
        ("qtbase" ,qtbase-5)
-       ("qtspeech" ,qtspeech)))
+       ("qtspeech" ,qtspeech-5)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Text editing widgets")
     (description "KTextWidgets provides widgets for displaying and editing text.
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index a82f0bd1b0..f0f06da67f 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -742,7 +742,7 @@ for KDE PIM.")
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtnetworkauth" ,qtnetworkauth-5)
-       ("qtspeech" ,qtspeech)
+       ("qtspeech" ,qtspeech-5)
        ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebengine" ,qtwebengine)
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
@@ -1737,7 +1737,7 @@ Virtual Contact File}) files to the KPeople contact management library.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kxmlgui" ,kxmlgui)
        ("qtbase" ,qtbase-5)
-       ("qtspeech" ,qtspeech)
+       ("qtspeech" ,qtspeech-5)
        ("sonnet" ,sonnet)))
     (arguments
      `(#:tests? #f)) ;; TODO - test suite hangs
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 08f0d930bd..628e57f7d2 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -197,7 +197,7 @@ whom pressing buttons hurts.")
        ("kxmlgui" ,kxmlgui)
        ("oxygen-icons" ,oxygen-icons) ;; default icon set
        ("qtbase" ,qtbase-5)
-       ("qtspeech" ,qtspeech)))
+       ("qtspeech" ,qtspeech-5)))
     (home-page "https://kde.org/applications/utilities/org.kde.kmouth")
     (synopsis "Type-and-say frontend for speech synthesizers")
     (description "KMouth is a program which enables persons that cannot speak
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 57c6d7192b..520a9fb0dc 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -1045,7 +1045,7 @@ Python, PHP, and Perl.")
        ("kio" ,kio)
        ("kparts" ,kparts)
        ("kpty" ,kpty)
-       ("qtspeech" ,qtspeech)
+       ("qtspeech" ,qtspeech-5)
        ("kwallet" ,kwallet)
        ("kwindowsystem" ,kwindowsystem)
        ("libkexiv2" ,libkexiv2)
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index ae62c9cfee..722c614009 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1827,9 +1827,9 @@ communication} (IPC) module developed for Qt.  The idea is to extend existing
 Qt's functionalities to enable an easy exchange of information between
 processes or computers.")))
 
-(define-public qtspeech
+(define-public qtspeech-5
   (package (inherit qtsvg-5)
-    (name "qtspeech")
+    (name "qtspeech-5")
     (version "5.15.2")
     (source (origin
              (method url-fetch)
@@ -3168,7 +3168,7 @@ color-related widgets.")
        ("qtscript" ,qtscript-5)
        ("qtscxml" ,qtscxml-5)
        ("qtsensors" ,qtsensors-5)
-       ("qtspeech" ,qtspeech)
+       ("qtspeech" ,qtspeech-5)
        ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel-5)
        ("qtwebsockets" ,qtwebsockets-5)
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 7823759269..0abb4dbace 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1804,7 +1804,7 @@ voice formats.")
        ("qtlocation" ,qtlocation-5)
        ("qtmultimedia" ,qtmultimedia-5)
        ("qtserialport" ,qtserialport-5)
-       ("qtspeech" ,qtspeech)
+       ("qtspeech" ,qtspeech-5)
        ("qtwebsockets" ,qtwebsockets-5)
        ("rtl-sdr" ,rtl-sdr)
        ("serialdv" ,serialdv)
-- 
2.31.1