From 8a0dc9bbf6624dcdfd5900aacbdd95640e0ab778 Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Fri, 21 May 2021 19:03:52 -0500 Subject: [PATCH 24/37] gnu: qtgraphicaleffects: Remove variable. * gnu/packages/qt.scm (qtgraphicaleffects): Remove variable. * gnu/packages/qt.scm (qtgraphicaleffects-5): New variable. --- gnu/packages/display-managers.scm | 2 +- gnu/packages/education.scm | 4 ++-- gnu/packages/finance.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-frameworks.scm | 2 +- gnu/packages/kde-multimedia.scm | 4 ++-- gnu/packages/kde.scm | 4 ++-- gnu/packages/linphone.scm | 2 +- gnu/packages/messaging.scm | 2 +- gnu/packages/qt.scm | 4 ++-- gnu/packages/radio.scm | 2 +- gnu/packages/sync.scm | 2 +- gnu/packages/terminals.scm | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 75726fa8a6..6948491d66 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -86,7 +86,7 @@ ;; Some user-defined themes use QtQuick components internally. Adding ;; QtQuick & co. here; they end up in QML2_IMPORT_PATH thanks to ;; 'wrap-qt-program'. - ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtgraphicaleffects" ,qtgraphicaleffects-5) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtsvg" ,qtsvg-5) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 6b1bedcf6b..94846ce915 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -192,7 +192,7 @@ of categories with some of the activities available in that category. ("python" ,python-wrapper) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtgraphicaleffects" ,qtgraphicaleffects-5) ("qtmultimedia" ,qtmultimedia-5) ("qtquickcontrols" ,qtquickcontrols) ("qtsensors" ,qtsensors-5) @@ -713,7 +713,7 @@ language and very flexible regarding to new or unknown keyboard layouts.") ("libxkbfile" ,libxkbfile) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtgraphicaleffects" ,qtgraphicaleffects-5) ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtx11extras" ,qtx11extras-5) ("qtxmlpatterns" ,qtxmlpatterns-5))) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index c3ba5a31da..0060d335e8 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -775,7 +775,7 @@ the Monero command line client and daemon.") ("monero" ,monero) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtgraphicaleffects" ,qtgraphicaleffects-5) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2",qtquickcontrols2-5) ("qtsvg" ,qtsvg-5) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index b1731911f4..6a4be92cb7 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -606,7 +606,7 @@ decentralized calling using P2P-DHT.") ("qtwebchannel" ,qtwebchannel-5) ("qtmultimedia" ,qtmultimedia-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtgraphicaleffects" ,qtgraphicaleffects-5) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2-5))) (propagated-inputs diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index e6f92f1ac7..b72ccf03fb 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -894,7 +894,7 @@ or user activity.") ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtsvg" ,qtsvg-5) ;; Run-time dependency - ("qtgraphicaleffects" ,qtgraphicaleffects))) + ("qtgraphicaleffects" ,qtgraphicaleffects-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "QtQuick components for mobile user interfaces") (description "Kirigami is a set of high level QtQuick components looking diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 40b32fa5b1..e0c1559a77 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -171,7 +171,7 @@ This package is part of the KDE multimedia module.") ("phonon" ,phonon) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtgraphicaleffects" ,qtgraphicaleffects) ; not listed as dependency + ("qtgraphicaleffects" ,qtgraphicaleffects-5) ; not listed as dependency ("qtmultimedia" ,qtmultimedia-5) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2-5) @@ -470,7 +470,7 @@ autoloading of subtitle files for use while playing video.") ("purpose" ,purpose) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtgraphicaleffects" ,qtgraphicaleffects-5) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2-5) ; not listed as dependency ("qtx11extras" ,qtx11extras-5))) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 7cfac4efc2..f741bcafce 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -266,7 +266,7 @@ browser for easy news reading.") ("breeze-icons" ,breeze-icons) ; recommended icon set ("purpose" ,purpose) ("qtwebkit" ,qtwebkit) - ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtgraphicaleffects" ,qtgraphicaleffects-5) ("kplotting" ,kplotting))) (arguments `(#:tests? #f ;TODO needs X @@ -750,7 +750,7 @@ different notification systems.") ("qca" ,qca) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtgraphicaleffects" ,qtgraphicaleffects-5) ("qtmultimedia" ,qtmultimedia-5) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2-5) diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm index e7314f46b6..3e0f50267b 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -862,7 +862,7 @@ and video calls or instant messaging capabilities to an application.") ("ortp" ,ortp) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtgraphicaleffects" ,qtgraphicaleffects-5) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtsvg" ,qtsvg-5))) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3ad03e28ea..360e3735b4 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -2331,7 +2331,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") ("openssl" ,openssl) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtgraphicaleffects" ,qtgraphicaleffects-5) ("qtmultimedia" ,qtmultimedia-5) ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtsvg" ,qtsvg-5) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index bbb17ff0dd..41d58f80ef 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1518,9 +1518,9 @@ module that provides platform integration: native dialogs, menus and menu bars, and tray icons. It falls back to Qt Widgets when a native implementation is not available."))) -(define-public qtgraphicaleffects +(define-public qtgraphicaleffects-5 (package (inherit qtsvg-5) - (name "qtgraphicaleffects") + (name "qtgraphicaleffects-5") (version "5.15.2") (source (origin (method url-fetch) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index c6173100a9..98e0f0e6a6 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -1567,7 +1567,7 @@ receiver.") ("qtbase" ,qtbase-5) ("qtcharts" ,qtcharts) ("qtdeclarative" ,qtdeclarative-5) - ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtgraphicaleffects" ,qtgraphicaleffects-5) ("qtmultimedia" ,qtmultimedia-5) ("qtquickcontrols2" ,qtquickcontrols2-5))) (arguments diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index c9454dacf1..112f5ee285 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -194,7 +194,7 @@ ("python-nautilus" ,python-nautilus) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtgraphicaleffects" ,qtgraphicaleffects-5) ("qtkeychain" ,qtkeychain) ("qtquickcontrols2" ,qtquickcontrols2-5) ("qtsolutions" ,qtsolutions) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index ca22c76026..dd5b62df76 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -647,7 +647,7 @@ embedded kernel situations.") (inputs `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative-5) - ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtgraphicaleffects" ,qtgraphicaleffects-5) ("qtquickcontrols" ,qtquickcontrols))) (arguments `(#:phases -- 2.31.1