From dcc84737d694faf76b6f1d68c14dbf298d964acd Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Fri, 21 May 2021 16:07:50 -0500 Subject: [PATCH 06/37] gnu: qtx11extras: Remove variable. * gnu/packages/qt.scm (qtx11extras): Remove variable. * gnu/packages/qt.scm (qtx11extras-5): New variable. --- gnu/packages/aidc.scm | 2 +- gnu/packages/audio.scm | 4 +-- gnu/packages/documentation.scm | 2 +- gnu/packages/education.scm | 2 +- gnu/packages/engineering.scm | 2 +- gnu/packages/fcitx5.scm | 2 +- gnu/packages/graphics.scm | 2 +- gnu/packages/gstreamer.scm | 2 +- gnu/packages/kde-frameworks.scm | 28 +++++++++---------- gnu/packages/kde-multimedia.scm | 8 +++--- gnu/packages/kde-pim.scm | 2 +- gnu/packages/kde-plasma.scm | 8 +++--- gnu/packages/kde-systemtools.scm | 4 +-- gnu/packages/kde-utils.scm | 2 +- gnu/packages/kde.scm | 4 +-- gnu/packages/lxqt.scm | 48 ++++++++++++++++---------------- gnu/packages/messaging.scm | 4 +-- gnu/packages/music.scm | 10 +++---- gnu/packages/password-utils.scm | 2 +- gnu/packages/qt.scm | 10 +++---- gnu/packages/robotics.scm | 2 +- gnu/packages/video.scm | 6 ++-- gnu/packages/xdisorg.scm | 2 +- gnu/packages/xorg.scm | 2 +- 24 files changed, 80 insertions(+), 80 deletions(-) diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index 3db631d92e..35985b1869 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -196,7 +196,7 @@ C/C++ programs to use its capabilities without restrictions or overhead.") ("libjpeg" ,libjpeg-turbo) ("python" ,python) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("v4l-utils" ,v4l-utils))) (synopsis "Bar code reader") (description diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 7b83d4f162..8045ad0d7b 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2734,7 +2734,7 @@ different audio devices such as ALSA or PulseAudio.") ("alsa-lib" ,alsa-lib) ("portaudio" ,portaudio) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) @@ -3559,7 +3559,7 @@ interface.") (inputs `(("fluidsynth" ,fluidsynth) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (home-page "https://qsynth.sourceforge.io") (synopsis "Graphical user interface for FluidSynth") (description diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index 19190f4480..a2f817d728 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -335,7 +335,7 @@ local system.") ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine) ("qtquickcontrols" ,qtquickcontrols) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("xcb-util-keyms" ,xcb-util-keysyms))) (home-page "https://zealdocs.org/") (synopsis "Offline documentation browser inspired by Dash") diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 1fe0fb40d0..ae1c68fcb9 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -715,7 +715,7 @@ language and very flexible regarding to new or unknown keyboard layouts.") ("qtdeclarative" ,qtdeclarative) ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols2" ,qtquickcontrols2) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("qtxmlpatterns" ,qtxmlpatterns))) (home-page "https://edu.kde.org/ktouch/") (synopsis "Touch typing tutor") diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 4d6a2aa432..a3ab2cdb9f 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2423,7 +2423,7 @@ comments."))) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) ("qtwebkit" ,qtwebkit) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("qtxmlpatterns" ,qtxmlpatterns) ("sqlite" ,sqlite) ("tbb" ,tbb) diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm index 9e0bc4ab21..310ba2207f 100644 --- a/gnu/packages/fcitx5.scm +++ b/gnu/packages/fcitx5.scm @@ -364,7 +364,7 @@ including input methods previous bundled inside Fcitx 4: `(("fcitx5" ,fcitx5) ("fcitx5-qt" ,fcitx5-qt) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("kitemviews" ,kitemviews) ("kwidgetsaddons" ,kwidgetsaddons) ("libx11" ,libx11) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index a409e924b9..8adb793225 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1939,7 +1939,7 @@ Automated palette selection is supported.") ("qtkeychain" ,qtkeychain) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (home-page "https://drawpile.net") (synopsis "Collaborative drawing program") (description "Drawpile is a drawing program that allows share the canvas diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 3047773e0f..cca892c77f 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -769,7 +769,7 @@ model to base your own plug-in on, here it is.") ("orc" ,orc) ;("qtbase" ,qtbase-5) ;("qtdeclarative" ,qtdeclarative) - ;("qtx11extras" ,qtx11extras) + ;("qtx11extras" ,qtx11extras-5) ("soundtouch" ,soundtouch) ;; GStreamer is not yet compatible with srt > 1.4.1. ("srt" ,srt-1.4.1) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 6892be4743..d772615d70 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -207,7 +207,7 @@ common build settings used in software produced by the KDE community.") `(("qtbase" ,qtbase-5) ("phonon" ,phonon) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) ("libxml2" ,libxml2))) @@ -645,7 +645,7 @@ many more.") ("qttools" ,qttools))) (inputs `(("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("kinit" ,kinit-bootstrap))) ;; kinit-bootstrap: kinit package which does not depend on kdbusaddons. (arguments `(#:phases @@ -750,7 +750,7 @@ replace the other outdated Graphviz tools.") ("pkg-config" ,pkg-config))) (inputs `(("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "Utilities for graphical user interfaces") (description "The KDE GUI addons provide utilities for graphical user @@ -855,7 +855,7 @@ translation scripting.") (inputs `(("libxscrnsaver" ,libxscrnsaver) ; X-Screensaver based poller, fallback mode ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "Reporting of idle time of user and system") (description "KIdleTime is a singleton reporting information on idle time. @@ -1158,7 +1158,7 @@ configuration pages, message boxes, and password requests.") (inputs `(("libxrender" ,libxrender) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("xcb-utils-keysyms" ,xcb-util-keysyms) ("xcb-util-wm" ,xcb-util-wm))) (arguments @@ -1673,7 +1673,7 @@ localized country name to ISO 3166-1 alpha 2 code mapping and vice verca. `(("kcoreaddons" ,kcoreaddons) ("kwindowsystem" ,kwindowsystem) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "Graceful handling of application crashes") (description "KCrash provides support for intercepting and handling @@ -1866,7 +1866,7 @@ formats.") `(("kcoreaddons" ,kcoreaddons) ("kwidgetsaddons" ,kwidgetsaddons) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (home-page "https://community.kde.org/Frameworks") (synopsis "Widgets for showing progress of asynchronous jobs") (description "KJobWIdgets provides widgets for showing progress of @@ -1901,7 +1901,7 @@ asynchronous jobs.") ("qtspeech" ,qtspeech) ;; TODO: Think about adding dbusmenu-qt5 from ;; https://launchpad.net/libdbusmenu-qt - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -2606,7 +2606,7 @@ emoticons coming from different providers.") ("kwindowsystem" ,kwindowsystem) ("libxcb" ,libxcb) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("xcb-util-keysyms" ,xcb-util-keysyms))) (home-page "https://community.kde.org/Frameworks") (synopsis "Global desktop keyboard shortcuts") @@ -2783,7 +2783,7 @@ consumption.") ("libxslt" ,libxslt) ("qtbase" ,qtbase-5) ("qtscript" ,qtscript) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("sonnet" ,sonnet))) (arguments `(#:tests? #f ; FIXME: 41/50 tests fail. @@ -3461,7 +3461,7 @@ setUrl, setUserAgent and call.") ("qtdeclarative" ,qtdeclarative) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("solid" ,solid))) (arguments `(#:tests? #f ; FIXME: 9/15 tests fail. @@ -3583,7 +3583,7 @@ need.") ("kpackage" ,kpackage) ("kwidgetsaddons" ,kwidgetsaddons) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -3672,7 +3672,7 @@ workspace.") ("openssl" ,openssl) ("qtsvg" ,qtsvg-5) ("qttools" ,qttools) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) ;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and ;; share/kf5/kssl/ca-bundle.crt ;; TODO: NixOS has nix-kde-include-dir.patch to change std-dir "include" @@ -3765,7 +3765,7 @@ http://community.kde.org/Frameworks/Porting_Notes should help with this.") ("openssl" ,openssl) ("phonon" ,phonon) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("sonnet" ,sonnet))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE Frameworks 5 HTML widget and component") diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 95e96884d6..d81ba425d1 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -176,7 +176,7 @@ This package is part of the KDE multimedia module.") ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt ("vlc" ,vlc))) (arguments @@ -415,7 +415,7 @@ available CD drives.") ("libxscrnsaver" ,libxscrnsaver) ("oxygen-icons" ,oxygen-icons) ; default icon set ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("solid" ,solid) ("v4l-utils" ,v4l-utils) ; libdvbv5 ("vlc" ,vlc))) @@ -473,7 +473,7 @@ autoloading of subtitle files for use while playing video.") ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) ; not listed as dependency - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (arguments `(#:tests? #f ; test program gets built, but is not found #:configure-flags @@ -569,7 +569,7 @@ This package is part of the KDE multimedia module.") ("qtbase" ,qtbase-5) ("cairo" ,cairo) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("xcb-util" ,xcb-util) ("xcb-util-cursor" ,xcb-util-cursor) ("xcb-util-errors" ,xcb-util-errors) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index db73941b42..f7ccd330f1 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -1476,7 +1476,7 @@ information in non-ASCII character sets.") ("libkdepim" ,libkdepim) ("oxygen-icons" ,oxygen-icons) ; default icon set, required for tests ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (home-page "https://kontact.kde.org/components/knotes.html") (synopsis "Note-taking utility") (description "KNotes lets you write the computer equivalent of sticky diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index b7a2b14f65..237459e7c0 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -76,7 +76,7 @@ ("kwindowsystem" ,kwindowsystem) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ; optional - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (home-page "https://invent.kde.org/plasma/breeze") (synopsis "Default KDE Plasma theme") (description "Artwork, styles and assets for the Breeze visual style for @@ -192,7 +192,7 @@ call it if it is not associated to a terminal.") ("logind" ,elogind) ;optional loginctl support ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("solid" ,solid) ("wayland" ,wayland) ("xcb-util-keysyms" ,xcb-util-keysyms))) @@ -222,7 +222,7 @@ call it if it is not associated to a terminal.") `(("kwayland" ,kwayland) ("libxrandr" ,libxrandr) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (arguments '(#:tests? #f)) ; FIXME: 55% tests passed, 5 tests failed out of 11 (home-page "https://community.kde.org/Solid/Projects/ScreenManagement") @@ -265,7 +265,7 @@ basic needs and easy to configure for those who want special setups.") ("qtdeclarative" ,qtdeclarative) ("qtscript" ,qtscript) ("qtwebkit" ,qtwebkit) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("plasma" ,plasma-framework) ("zlib" ,zlib))) (build-system qt-build-system) diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index a0bd90c839..e951031e18 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -263,7 +263,7 @@ This package is part of the KDE base applications module.") ("oxygen-icons" ,oxygen-icons) ;; default icon set ("pipewire" ,pipewire) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("xcb-util-image" ,xcb-util-image) ("zlib" ,zlib))) (home-page "https://kde.org/applications/internet/org.kde.krfb") @@ -355,7 +355,7 @@ This package is part of the KDE administration module.") ("kwindowsystem" ,kwindowsystem) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (home-page "https://www.kde.org/applications/system/yakuake/") (synopsis "Quad-style terminal emulator for KDE") (description "Yakuake is a drop-down terminal emulator based on KDE Konsole diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 40267c6e91..c586f6f866 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -319,7 +319,7 @@ great on your desktop.") `(("ktexteditor" ,ktexteditor) ("imagemagick" ,imagemagick) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (home-page "https://kde.org/applications/en/graphics/org.kde.kxstitch") (synopsis "Create and print cross stitch patterns") (description diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 37d9e8674d..3d34429981 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -536,7 +536,7 @@ illustrate project schedules.") ("qtdeclarative" ,qtdeclarative) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("quazip" ,quazip) ("zlib" ,zlib))) (home-page "https://krita.org") @@ -755,7 +755,7 @@ different notification systems.") ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) ("qtwayland" ,qtwayland) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (home-page "https://community.kde.org/KDEConnect") (synopsis "Enable your devices to communicate with each other") (description "KDE Connect is a project that enables all your devices to diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm index ae8c22f845..d6a397df71 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -231,7 +231,7 @@ in Qt.") ("libxscrnsaver" ,libxscrnsaver) ("polkit-qt" ,polkit-qt) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) ("qttools" ,qttools))) @@ -285,7 +285,7 @@ and memory usage or network traffic.") ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) ("qttools" ,qttools))) @@ -328,7 +328,7 @@ LXQt and the system it's running on.") ("libqtxdg" ,libqtxdg) ("polkit-qt" ,polkit-qt) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) ("qttools" ,qttools))) @@ -378,7 +378,7 @@ the operating system LXQt is running on.") ("libxi" ,libxi) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("solid" ,solid) ("xf86-input-libinput" ,xf86-input-libinput) ("xkeyboard-config" ,xkeyboard-config) @@ -444,7 +444,7 @@ configuration of both LXQt and the underlying operating system.") ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools) @@ -492,7 +492,7 @@ as a whole and are not limited to distinct applications.") ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) ("qttools" ,qttools))) @@ -538,7 +538,7 @@ according to the Desktop Notifications Specification.") ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) ("qttools" ,qttools))) @@ -589,7 +589,7 @@ of other programs.") ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("solid" ,solid) ("xcb-util" ,xcb-util) ("xkeyboard-config" ,xkeyboard-config))) @@ -654,7 +654,7 @@ of other programs.") ("polkit-qt" ,polkit-qt) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("pkg-config" ,pkg-config) ("polkit" ,polkit) @@ -702,7 +702,7 @@ LXQt.") ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("solid" ,solid))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) @@ -750,7 +750,7 @@ when laptop batteries are low on power.") ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) ("qttools" ,qttools))) @@ -791,7 +791,7 @@ Qt with LXQt.") ("pcre" ,pcre) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools) @@ -838,7 +838,7 @@ allows for launching applications or shutting down the system.") ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("xdg-user-dirs" ,xdg-user-dirs))) (native-inputs `(("pkg-config" ,pkg-config) @@ -908,7 +908,7 @@ for the LXQt desktop environment.") ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("sudo" ,sudo))) (native-inputs `(("pkg-config" ,pkg-config) @@ -992,7 +992,7 @@ for LXQt.") ("menu-cache" ,menu-cache) ("pcre" ,pcre) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("pkg-config" ,pkg-config) ("lxqt-build-tools" ,lxqt-build-tools) @@ -1018,7 +1018,7 @@ components to build desktop file managers which belongs to LXDE.") (inputs `(("libfm-qt" ,libfm-qt) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools) @@ -1097,7 +1097,7 @@ manager Compton.") ("libfm-qt" ,libfm-qt) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("pkg-config" ,pkg-config) ("lxqt-build-tools" ,lxqt-build-tools) @@ -1132,7 +1132,7 @@ image viewer.") ("pango" ,pango) ("pcre" ,pcre) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) ("pkg-config" ,pkg-config) @@ -1162,7 +1162,7 @@ window manager OpenBox.") ("pcre" ,pcre) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("pkg-config" ,pkg-config) ("lxqt-build-tools" ,lxqt-build-tools) @@ -1193,7 +1193,7 @@ window manager OpenBox.") ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) ("qttools" ,qttools))) @@ -1244,7 +1244,7 @@ processes currently in existence, much like code{top} or code{ps}.") (build-system cmake-build-system) (inputs `(("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("qtermwidget" ,qtermwidget))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) @@ -1274,7 +1274,7 @@ QTermWidget.") ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qttools" ,qttools))) @@ -1304,7 +1304,7 @@ easily publishing them on internet image hosting services.") ("json-glib" ,json-glib) ("libfm-qt" ,libfm-qt) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("pkg-config" ,pkg-config) ("lxqt-build-tools" ,lxqt-build-tools) @@ -1340,7 +1340,7 @@ like @command{tar} and @command{zip}.") ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) ("liblxqt" ,liblxqt) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("libqtxdg" ,libqtxdg))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index d359b1ec20..9507e8a505 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -182,7 +182,7 @@ ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg-5) ("qtwebkit" ,qtwebkit) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("x11" ,libx11) ("xext" ,libxext) ("xcb" ,libxcb) @@ -2855,7 +2855,7 @@ social and chat platform.") ("qtkeychain" ,qtkeychain) ("qtmultimedia" ,qtmultimedia) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("usrsctp" ,usrsctp) ("x11" ,libx11) ("xext" ,libxext) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2420f91282..a2045e3908 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -432,7 +432,7 @@ score, keyboard, guitar, drum and controller views.") ("protobuf" ,protobuf) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("sqlite" ,sqlite) ("sparsehash" ,sparsehash) ("taglib" ,taglib))) @@ -525,7 +525,7 @@ playing your music.") ("protobuf" ,protobuf) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("sqlite" ,sqlite) ("taglib" ,taglib))) (home-page "https://www.strawberrymusicplayer.org/") @@ -2767,7 +2767,7 @@ backends, including ALSA, OSS, Network and FluidSynth.") `(("drumstick" ,drumstick) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("libxslt" ,libxslt) ;for xsltproc ("docbook-xsl" ,docbook-xsl) @@ -3106,7 +3106,7 @@ from the command line.") `(#:tests? #f)) ; no "check" target (inputs `(("qt" ,qtbase-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("alsa-lib" ,alsa-lib) ("jack" ,jack-1) ("libsndfile" ,libsndfile) @@ -4638,7 +4638,7 @@ are a C compiler and glib. Full API documentation and examples are included.") (inputs `(("sdl" ,sdl) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("fltk" ,fltk) ("libogg" ,libogg) ("libsamplerate" ,libsamplerate) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index ba58f26b79..2a066a8b68 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -162,7 +162,7 @@ human.") ("qrencode" ,qrencode) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("quazip" ,quazip) ; XC_KEESHARE ("readline" ,readline) ("yubikey-personalization" ,yubikey-personalization) ; XC_YUBIKEY diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index fe5fa35340..ce9dca9c09 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -876,13 +876,13 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (description "The QtImageFormats module contains plugins for adding support for MNG, TGA, TIFF and WBMP image formats."))) -(define-public qtx11extras +(define-public qtx11extras-5 (package (inherit qtsvg-5) - (name "qtx11extras") + (name "qtx11extras-5") (version "5.15.2") (source (origin (method url-fetch) - (uri (qt5-urls name version)) + (uri (qt5-urls "qtx11extras" version)) (sha256 (base32 "0gkfzj195v9flwljnqpdz3a532618yn4h2577nlsai56x4p7053h")))) @@ -2133,7 +2133,7 @@ module provides support functions to the automatically generated code.") ("qtwebchannel" ,qtwebchannel) ("qtwebkit" ,qtwebkit) ("qtwebsockets" ,qtwebsockets) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("qtxmlpatterns" ,qtxmlpatterns))) (arguments `(#:modules ((srfi srfi-1) @@ -2946,7 +2946,7 @@ color-related widgets.") ("qtsvg" ,qtsvg-5) ("qtwebchannel" ,qtwebchannel) ("qtwebsockets" ,qtwebsockets) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("qtxmlpatterns" ,qtxmlpatterns))) (propagated-inputs `(("python-shiboken-2" ,python-shiboken-2))) diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm index 3a0b7165cd..a62d160e4f 100644 --- a/gnu/packages/robotics.scm +++ b/gnu/packages/robotics.scm @@ -111,7 +111,7 @@ hundred times faster than real-time.") ("qtsvg" ,qtsvg-5) ("qttools" ,qttools) ;for libQt5Help, needed by "studio" ("qtwebkit" ,qtwebkit) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("eudev" ,eudev) ("libxml2" ,libxml2) ("sdl2" ,sdl2) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b5a0f669dc..eecf6cb065 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1829,7 +1829,7 @@ videoformats depend on the configuration flags of ffmpeg.") ("python" ,python-wrapper) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("samba" ,samba) ("sdl" ,sdl) ("sdl-image" ,sdl-image) @@ -3133,7 +3133,7 @@ be used for realtime video capture via Linux-specific APIs.") ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ("speexdsp" ,speexdsp) ("v4l-utils" ,v4l-utils) ("zlib" ,zlib))) @@ -3399,7 +3399,7 @@ making @dfn{screencasts}.") ("libxinerama" ,libxinerama) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (native-inputs `(("pkg-config" ,pkg-config))) (arguments `(#:configure-flags diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 2361d31241..71b833961e 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -320,7 +320,7 @@ with X11 or Wayland, or in a text terminal with ncurses.") `(("qtbase" ,qtbase-5) ("qtscript" ,qtscript) ("qtsvg" ,qtsvg-5) - ("qtx11extras" ,qtx11extras))) + ("qtx11extras" ,qtx11extras-5))) (synopsis "Clipboard manager with advanced features") (description "CopyQ is clipboard manager with editing and scripting features. CopyQ monitors system clipboard and saves its content in customized diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 07784f474e..82f52f419a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6516,7 +6516,7 @@ and embedded platforms.") (name "uim-qt") (inputs `(("qt" ,qtbase-5) - ("qtx11extras" ,qtx11extras) + ("qtx11extras" ,qtx11extras-5) ,@(package-inputs uim))) (arguments (substitute-keyword-arguments (package-arguments uim) -- 2.31.1