From 1edb3fb6ea3ea4665bb6a1c594d3ed89e7e2155e Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Fri, 21 May 2021 17:29:26 -0500 Subject: [PATCH 15/37] gnu: qtwebchannel: Remove variable. * gnu/packages/qt.scm (qtwebchannel): Remove variable. * gnu/packages/qt.scm (qtwebchannel-5): New variable. --- gnu/packages/audio.scm | 2 +- gnu/packages/documentation.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-pim.scm | 10 +++++----- gnu/packages/kde.scm | 2 +- gnu/packages/messaging.scm | 2 +- gnu/packages/qt.scm | 12 ++++++------ gnu/packages/sync.scm | 2 +- gnu/packages/text-editors.scm | 2 +- gnu/packages/web.scm | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 0413403e75..79f526e469 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2883,7 +2883,7 @@ link REQUIRED)")) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtsvg" ,qtsvg-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel" ,qtwebchannel-5) ("qtwebsockets" ,qtwebsockets-5))) (propagated-inputs ;to get native-search-path `(("qtwebengine" ,qtwebengine))) diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 96b450f3a2..c2eee7c0ce 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -332,7 +332,7 @@ local system.") ("sqlite" ,sqlite) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine) ("qtquickcontrols" ,qtquickcontrols) ("qtx11extras" ,qtx11extras-5) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 15ea116a46..93ce66c54a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1666,7 +1666,7 @@ using the dataset of topographical information collected by ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtlocation" ,qtlocation) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine) ("quazip" ,quazip) ("routino" ,routino) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 0b6e7acd10..d386287ebb 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -603,7 +603,7 @@ decentralized calling using P2P-DHT.") ("qrencode" ,qrencode) ("qtsvg" ,qtsvg-5) ("qtwebengine" ,qtwebengine) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel" ,qtwebchannel-5) ("qtmultimedia" ,qtmultimedia-5) ("qtdeclarative" ,qtdeclarative-5) ("qtgraphicaleffects" ,qtgraphicaleffects) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index c946152dcb..5592775850 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -743,7 +743,7 @@ for KDE PIM.") ("qtdeclarative" ,qtdeclarative-5) ("qtnetworkauth" ,qtnetworkauth) ("qtspeech" ,qtspeech) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine) ("qtxmlpatterns" ,qtxmlpatterns-5))) (arguments @@ -1098,7 +1098,7 @@ and retrieving certificates from LDAP servers.") ("qgpgme" ,qgpgme) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine) ("sonnet" ,sonnet))) (arguments @@ -1357,7 +1357,7 @@ using a Qt/KMime C++ API.") ("qgpgme" ,qgpgme) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine) ("qtwebkit" ,qtwebkit) ("sonnet" ,sonnet))) @@ -1894,7 +1894,7 @@ and allows one to view/extract message formatted text in Rich Text Format.") ("kwindowsystem" ,kwindowsystem) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine))) (arguments `(#:tests? #f)) ;; TODO 6/48 tests fail @@ -1980,7 +1980,7 @@ KDE using certificate-based crypto.") ("libkdepim" ,libkdepim) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine))) (arguments `(#:phases diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index aee8648eb2..bd255b0c36 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -204,7 +204,7 @@ This package contains GUI widgets for baloo.") ("qgpgme" ,qgpgme) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine) ("syndication" ,syndication))) (home-page "https://apps.kde.org/en/akregator") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 4b8754dbfb..a12f09e010 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2724,7 +2724,7 @@ as phones, embedded computers or microcontrollers.") (inputs `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtwebchannel" ,qtwebchannel))) + ("qtwebchannel" ,qtwebchannel-5))) (propagated-inputs `(("qtwebengine" ,qtwebengine))) (home-page "https://movim.eu/") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 0d145e672b..17774992fa 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1299,7 +1299,7 @@ interacting with serial ports from within Qt."))) access the various industrial serial buses and protocols, such as CAN, ModBus, and others."))) -(define-public qtwebchannel +(define-public qtwebchannel-5 (package (inherit qtsvg-5) (name "qtwebchannel") (version "5.15.2") @@ -2043,7 +2043,7 @@ using the Enchant spell-checking library.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) ("qtmultimedia" ,qtmultimedia-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel" ,qtwebchannel-5) ("re2" ,re2) ("snappy" ,snappy) ("udev" ,eudev) @@ -2225,7 +2225,7 @@ module provides support functions to the automatically generated code.") ("qtserialport" ,qtserialport-5) ("qtsvg" ,qtsvg-5) ("qttools" ,qttools) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel" ,qtwebchannel-5) ("qtwebkit" ,qtwebkit) ("qtwebsockets" ,qtwebsockets-5) ("qtx11extras" ,qtx11extras-5) @@ -2330,7 +2330,7 @@ contain over 620 classes.") ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine))) (arguments `(#:modules ((srfi srfi-1) @@ -2803,7 +2803,7 @@ different kinds of sliders, and much more.") ("qtlocation" ,qtlocation) ("qtmultimedia" ,qtmultimedia-5) ("qtsensors" ,qtsensors-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel" ,qtwebchannel-5) ("libxml2" ,libxml2) ("libxslt" ,libxslt) ("libx11" ,libx11) @@ -3039,7 +3039,7 @@ color-related widgets.") ("qtsensors" ,qtsensors-5) ("qtspeech" ,qtspeech) ("qtsvg" ,qtsvg-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel" ,qtwebchannel-5) ("qtwebsockets" ,qtwebsockets-5) ("qtx11extras" ,qtx11extras-5) ("qtxmlpatterns" ,qtxmlpatterns-5))) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 0711f02108..939a911d0c 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -199,7 +199,7 @@ ("qtquickcontrols2" ,qtquickcontrols2) ("qtsolutions" ,qtsolutions) ("qtsvg" ,qtsvg-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel" ,qtwebchannel-5) ("qtwebsockets" ,qtwebsockets-5) ("qtwebkit" ,qtwebkit) ("sqlite" ,sqlite) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 430e66a42e..259ce51856 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -622,7 +622,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. ("qtmultimedia" ,qtmultimedia-5) ("qtquickcontrols" ,qtquickcontrols) ("qtsvg" ,qtsvg-5) - ("qtwebchannel" ,qtwebchannel))) + ("qtwebchannel" ,qtwebchannel-5))) (propagated-inputs ; To get native-search-path `(("qtwebengine" ,qtwebengine))) (arguments diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index f1056f67a9..d3572999c7 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -8154,7 +8154,7 @@ It contains the code shared by all Kiwix ports.") ("pugixml" ,pugixml) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtwebchannel" ,qtwebchannel) + ("qtwebchannel" ,qtwebchannel-5) ("qtwebengine" ,qtwebengine) ("xapian" ,xapian) ("zlib" ,zlib) -- 2.31.1