From 662d5075508dab9435a7c027a8580d1d92be6688 Mon Sep 17 00:00:00 2001
From: Eric Brown <ecbrown@ericcbrown.com>
Date: Fri, 21 May 2021 17:04:47 -0500
Subject: [PATCH 09/37] gnu: qtwebsockets: Remove variable.

* gnu/packages/qt.scm (qtwebsockets): Remove variable.
* gnu/packages/qt.scm (qtwebsockets): New variable.
---
 gnu/packages/audio.scm |  2 +-
 gnu/packages/games.scm |  2 +-
 gnu/packages/qt.scm    | 12 ++++++------
 gnu/packages/radio.scm |  2 +-
 gnu/packages/sync.scm  |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 3d88ef9ca0..0413403e75 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2884,7 +2884,7 @@ link REQUIRED)"))
        ("qtdeclarative" ,qtdeclarative-5)
        ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel)
-       ("qtwebsockets" ,qtwebsockets)))
+       ("qtwebsockets" ,qtwebsockets-5)))
     (propagated-inputs                  ;to get native-search-path
      `(("qtwebengine" ,qtwebengine)))
     (home-page "https://github.com/supercollider/supercollider")
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c7d7f09cd2..10b7a0a646 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -931,7 +931,7 @@ want what you have.")
          ("qtmultimedia" ,qtmultimedia)
          ("qtsvg" ,qtsvg-5)
          ("qttools" ,qttools)
-         ("qtwebsockets" ,qtwebsockets)
+         ("qtwebsockets" ,qtwebsockets-5)
          ("xz" ,xz)
          ("zlib" ,zlib)))
       (home-page "https://cockatrice.github.io")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 071afc9200..364cfbaddc 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1030,7 +1030,7 @@ with JavaScript and C++.")))
     (description "The Qt Connectivity modules provides modules for interacting
 with Bluetooth and NFC.")))
 
-(define-public qtwebsockets
+(define-public qtwebsockets-5
   (package (inherit qtsvg-5)
     (name "qtwebsockets")
     (version "5.15.2")
@@ -1054,7 +1054,7 @@ WebSockets module provides C++ and QML interfaces that enable Qt applications
 to act as a server that can process WebSocket requests, or a client that can
 consume data received from the server, or both.")))
 
-(define-public qtsensors
+(define-public qtsensors-5
   (package (inherit qtsvg-5)
     (name "qtsensors")
     (version "5.15.2")
@@ -1260,7 +1260,7 @@ and others.")))
     (native-inputs
      `(("perl" ,perl)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtwebsockets" ,qtwebsockets)))
+       ("qtwebsockets" ,qtwebsockets-5)))
     (inputs `(("qtbase" ,qtbase-5)))
     (synopsis "Web communication library for Qt")
     (description "The Qt WebChannel module enables peer-to-peer communication
@@ -1291,7 +1291,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine.")))
      `(("mesa" ,mesa)
        ("qtbase" ,qtbase-5)
        ("qtdeclarative" ,qtdeclarative-5)
-       ("qtwebsockets" ,qtwebsockets)
+       ("qtwebsockets" ,qtwebsockets-5)
        ("zlib" ,zlib)))
     (synopsis "QPA plugin for running an application via a browser using
 streamed WebGL commands")
@@ -2175,7 +2175,7 @@ module provides support functions to the automatically generated code.")
        ("qttools" ,qttools)
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebkit" ,qtwebkit)
-       ("qtwebsockets" ,qtwebsockets)
+       ("qtwebsockets" ,qtwebsockets-5)
        ("qtx11extras" ,qtx11extras-5)
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (arguments
@@ -2988,7 +2988,7 @@ color-related widgets.")
        ("qtspeech" ,qtspeech)
        ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel)
-       ("qtwebsockets" ,qtwebsockets)
+       ("qtwebsockets" ,qtwebsockets-5)
        ("qtx11extras" ,qtx11extras-5)
        ("qtxmlpatterns" ,qtxmlpatterns-5)))
     (propagated-inputs
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index d29fe459c9..8fa89650ff 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1805,7 +1805,7 @@ voice formats.")
        ("qtmultimedia" ,qtmultimedia)
        ("qtserialport" ,qtserialport)
        ("qtspeech" ,qtspeech)
-       ("qtwebsockets" ,qtwebsockets)
+       ("qtwebsockets" ,qtwebsockets-5)
        ("rtl-sdr" ,rtl-sdr)
        ("serialdv" ,serialdv)
        ("sgp4" ,sgp4)
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 58bb674a8c..0711f02108 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -200,7 +200,7 @@
        ("qtsolutions" ,qtsolutions)
        ("qtsvg" ,qtsvg-5)
        ("qtwebchannel" ,qtwebchannel)
-       ("qtwebsockets" ,qtwebsockets)
+       ("qtwebsockets" ,qtwebsockets-5)
        ("qtwebkit" ,qtwebkit)
        ("sqlite" ,sqlite)
        ("xdg-utils" ,xdg-utils)
-- 
2.31.1