From 372db7ce31761744bf78e5fa933d701c8b6f23af Mon Sep 17 00:00:00 2001
From: Eric Brown <ecbrown@ericcbrown.com>
Date: Fri, 21 May 2021 16:07:50 -0500
Subject: [PATCH 3/3] gnu: qtx11extras: Remove variable.

* gnu/packages/qt.scm (qtx11extras): Remove variable.
* gnu/packages/qt.scm (qtx11extras-5): New variable.

diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm
index 5482261a59..63cb8d0f35 100644
--- a/gnu/packages/aidc.scm
+++ b/gnu/packages/aidc.scm
@@ -208,7 +208,7 @@ (define-public zbar
        ("libjpeg" ,libjpeg-turbo)
        ("perl" ,perl)
        ("python" ,python)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("v4l-utils" ,v4l-utils)))
     (propagated-inputs
      ;; These are in 'requires' field of .pc files.
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index ff70a8a3cf..2defe8dbb9 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2970,7 +2970,7 @@ (define-public qjackctl
     (arguments
      '(#:tests? #f))                    ; no check target
     (inputs
-     (list jack-1 alsa-lib portaudio qtbase-5 qtx11extras))
+     (list jack-1 alsa-lib portaudio qtbase-5 qtx11extras-5))
     (native-inputs
      (list pkg-config qttools))
     (home-page "https://qjackctl.sourceforge.io/")
@@ -3780,7 +3780,7 @@ (define-public qsynth
     (native-inputs
      (list qttools pkg-config))
     (inputs
-     (list fluidsynth qtbase-5 qtx11extras))
+     (list fluidsynth qtbase-5 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 9f87e67043..7968b7010a 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -386,7 +386,7 @@ (define-public zeal
          ("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 571bd78cda..ff42b5395c 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -675,7 +675,7 @@ (define-public ktouch
            qtdeclarative
            qtgraphicaleffects
            qtquickcontrols2
-           qtx11extras
+           qtx11extras-5
            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 30889b6963..e8da89bfed 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2490,7 +2490,7 @@ (define-public freecad
            qtsvg-5
            qtwebchannel
            qtwebengine
-           qtx11extras
+           qtx11extras-5
            qtxmlpatterns
            sqlite
            tbb-2020                     ; Same version as opencascade-occt
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index ca2d8f6827..0e230e6a55 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -440,7 +440,7 @@ (define-public fcitx5-configtool
      `(("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 915d9d79e1..b0573c6cc0 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1967,7 +1967,7 @@ (define-public drawpile
              qtkeychain
              qtmultimedia
              qtsvg-5
-             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/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 2f19e8e16e..e75f749053 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -227,7 +227,7 @@ (define-public phonon-backend-gstreamer
      (list qtbase-5
            phonon
            qtbase-5
-           qtx11extras
+           qtx11extras-5
            gstreamer
            gst-plugins-base
            libxml2))
@@ -643,7 +643,7 @@ (define-public kdbusaddons
     (native-inputs
      (list extra-cmake-modules dbus qttools))
     (inputs
-     (list qtbase-5 qtx11extras kinit-bootstrap)) ;; kinit-bootstrap: kinit package which does not depend on kdbusaddons.
+     (list qtbase-5 qtx11extras-5 kinit-bootstrap)) ;; kinit-bootstrap: kinit package which does not depend on kdbusaddons.
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -742,7 +742,7 @@ (define-public kguiaddons
     (native-inputs
      (list extra-cmake-modules pkg-config))
     (inputs
-     (list qtbase-5 qtx11extras))
+     (list qtbase-5 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
@@ -841,7 +841,7 @@ (define-public kidletime
      (list extra-cmake-modules pkg-config))
     (inputs
      (list libxscrnsaver ; X-Screensaver based poller, fallback mode
-           qtbase-5 qtx11extras))
+           qtbase-5 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.
@@ -1132,7 +1132,7 @@ (define-public kwindowsystem
     (inputs
      `(("libxrender" ,libxrender)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("xcb-utils-keysyms" ,xcb-util-keysyms)
        ("xcb-util-wm" ,xcb-util-wm)))
     (arguments
@@ -1614,7 +1614,7 @@ (define-public kcrash
     (native-inputs
      (list extra-cmake-modules))
     (inputs
-     (list kcoreaddons kwindowsystem qtbase-5 qtx11extras))
+     (list kcoreaddons kwindowsystem qtbase-5 qtx11extras-5))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Graceful handling of application crashes")
     (description "KCrash provides support for intercepting and handling
@@ -1802,7 +1802,7 @@ (define-public kjobwidgets
     (native-inputs
      (list extra-cmake-modules qttools))
     (inputs
-     (list kcoreaddons kwidgetsaddons qtbase-5 qtx11extras))
+     (list kcoreaddons kwidgetsaddons qtbase-5 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
@@ -1835,7 +1835,7 @@ (define-public knotifications
            qtspeech
            ;; TODO: Think about adding dbusmenu-qt5 from
            ;; https://launchpad.net/libdbusmenu-qt
-           qtx11extras))
+           qtx11extras-5))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -2510,7 +2510,7 @@ (define-public kglobalaccel
            kwindowsystem
            libxcb
            qtbase-5
-           qtx11extras
+           qtx11extras-5
            xcb-util-keysyms))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Global desktop keyboard shortcuts")
@@ -2682,7 +2682,7 @@ (define-public kio
        ("libxslt" ,libxslt)
        ("qtbase" ,qtbase-5)
        ("qtscript" ,qtscript)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("sonnet" ,sonnet)))
     (arguments
      `(#:tests? #f ; FIXME: 41/50 tests fail.
@@ -3340,7 +3340,7 @@ (define-public plasma-framework
        ("qtdeclarative" ,qtdeclarative)
        ("qtquickcontrols2" ,qtquickcontrols2)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("solid" ,solid)))
     (arguments
      `(#:tests? #f ; FIXME: 9/15 tests fail.
@@ -3461,7 +3461,7 @@ (define-public kde-frameworkintegration
        ("kpackage" ,kpackage)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("qtbase" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)))
+       ("qtx11extras" ,qtx11extras-5)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -3550,7 +3550,7 @@ (define-public kdelibs4support
            openssl
            qtsvg-5
            qttools
-           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"
@@ -3642,7 +3642,7 @@ (define-public khtml
            openssl
            phonon
            qtbase-5
-           qtx11extras
+           qtx11extras-5
            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 d383549df1..f3ee264a5b 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -177,7 +177,7 @@ (define-public elisa
            qtquickcontrols
            qtquickcontrols2
            qtsvg-5
-           qtx11extras
+           qtx11extras-5
            ;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt
            vlc))
     (arguments
@@ -462,7 +462,7 @@ (define-public kaffeine
            libxscrnsaver
            oxygen-icons ; default icon set
            qtbase-5
-           qtx11extras
+           qtx11extras-5
            solid
            v4l-utils ; libdvbv5
            vlc))
@@ -520,7 +520,7 @@ (define-public kamoso
            qtgraphicaleffects
            qtquickcontrols
            qtquickcontrols2 ; not listed as dependency
-           qtx11extras))
+           qtx11extras-5))
     (arguments
      (list #:tests? #f ; test program gets built, but is not found
            #:configure-flags
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index a5acbb0da8..dd3b83146c 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -1439,7 +1439,7 @@ (define-public knotes
            libkdepim
            oxygen-icons ; default icon set, required for tests
            qtbase-5
-           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 5621d8ea35..7d1c020229 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -76,7 +76,7 @@ (define-public breeze
            kwindowsystem
            qtbase-5
            qtdeclarative ; optional
-           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
@@ -183,7 +183,7 @@ (define-public kscreenlocker
        ("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)))
@@ -210,7 +210,7 @@ (define-public libkscreen
            ;; For testing.
            dbus))
     (inputs
-     (list kwayland libxrandr qtbase-5 qtx11extras))
+     (list kwayland libxrandr qtbase-5 qtx11extras-5))
     (arguments
      '(#:tests? #f)) ; FIXME: 55% tests passed, 5 tests failed out of 11
     (home-page "https://community.kde.org/Solid/Projects/ScreenManagement")
@@ -252,7 +252,7 @@ (define-public libksysguard
        ("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 4e6cd1d6e1..074bc7f82e 100644
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@ -256,7 +256,7 @@ (define-public krfb
            oxygen-icons ;; default icon set
            pipewire-0.3
            qtbase-5
-           qtx11extras
+           qtx11extras-5
            xcb-util-image
            zlib))
     (home-page "https://kde.org/applications/internet/org.kde.krfb")
@@ -347,7 +347,7 @@ (define-public yakuake
            kwindowsystem
            qtbase-5
            qtsvg-5
-           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 2b3a0dd15e..58a2961a1f 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -385,7 +385,7 @@ (define-public kxstitch
     (native-inputs
      (list extra-cmake-modules kdoctools pkg-config))
     (inputs
-     (list ktexteditor imagemagick qtbase-5 qtx11extras))
+     (list ktexteditor imagemagick qtbase-5 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 ed1eca83a8..031207dad4 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -541,7 +541,7 @@ (define-public krita
            qtdeclarative
            qtmultimedia
            qtsvg-5
-           qtx11extras
+           qtx11extras-5
            quazip-0
            zlib))
     (home-page "https://krita.org")
@@ -749,7 +749,7 @@ (define-public kdeconnect
            qtmultimedia
            qtquickcontrols
            qtquickcontrols2
-           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 6c1242ebc5..871dff30c0 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -232,7 +232,7 @@ (define-public liblxqt
            libxscrnsaver
            polkit-qt
            qtsvg-5
-           qtx11extras))
+           qtx11extras-5))
     (native-inputs
      (list lxqt-build-tools qttools))
     (home-page "https://lxqt-project.org")
@@ -285,7 +285,7 @@ (define-public lxqt-about
            libqtxdg
            qtbase-5
            qtsvg-5
-           qtx11extras))
+           qtx11extras-5))
     (native-inputs
      (list lxqt-build-tools qttools))
     (arguments
@@ -327,7 +327,7 @@ (define-public lxqt-admin
            libqtxdg
            polkit-qt
            qtsvg-5
-           qtx11extras))
+           qtx11extras-5))
     (native-inputs
      (list lxqt-build-tools qttools))
     (arguments
@@ -376,7 +376,7 @@ (define-public lxqt-config
            libxi
            qtbase-5
            qtsvg-5
-           qtx11extras
+           qtx11extras-5
            solid
            xf86-input-libinput
            xkeyboard-config
@@ -444,7 +444,7 @@ (define-public lxqt-globalkeys
            libqtxdg
            qtbase-5
            qtsvg-5
-           qtx11extras))
+           qtx11extras-5))
     (native-inputs
      (list pkg-config qttools lxqt-build-tools))
     (arguments
@@ -490,7 +490,7 @@ (define-public lxqt-notificationd
            libqtxdg
            qtbase-5
            qtsvg-5
-           qtx11extras))
+           qtx11extras-5))
     (native-inputs
      (list lxqt-build-tools qttools))
     (arguments
@@ -535,7 +535,7 @@ (define-public lxqt-openssh-askpass
            libqtxdg
            qtbase-5
            qtsvg-5
-           qtx11extras))
+           qtx11extras-5))
     (native-inputs
      (list lxqt-build-tools qttools))
     (arguments
@@ -585,7 +585,7 @@ (define-public lxqt-panel
            pulseaudio
            qtbase-5
            qtsvg-5
-           qtx11extras
+           qtx11extras-5
            solid
            xcb-util
            xkeyboard-config))
@@ -647,7 +647,7 @@ (define-public lxqt-policykit
            polkit-qt
            qtbase-5
            qtsvg-5
-           qtx11extras))
+           qtx11extras-5))
     (native-inputs
      (list pkg-config polkit lxqt-build-tools qttools))
     (arguments
@@ -693,7 +693,7 @@ (define-public lxqt-powermanagement
            lxqt-globalkeys
            qtbase-5
            qtsvg-5
-           qtx11extras
+           qtx11extras-5
            solid))
     (native-inputs
      (list lxqt-build-tools qttools))
@@ -740,7 +740,7 @@ (define-public lxqt-qtplugin
            libqtxdg
            qtbase-5
            qtsvg-5
-           qtx11extras))
+           qtx11extras-5))
     (native-inputs
      (list lxqt-build-tools qttools))
     (arguments
@@ -780,7 +780,7 @@ (define-public lxqt-runner
            pcre
            qtbase-5
            qtsvg-5
-           qtx11extras))
+           qtx11extras-5))
     (native-inputs
      (list pkg-config qttools lxqt-build-tools))
     (arguments
@@ -826,7 +826,7 @@ (define-public lxqt-session
            procps
            qtbase-5
            qtsvg-5
-           qtx11extras
+           qtx11extras-5
            xdg-user-dirs))
     (native-inputs
      (list pkg-config lxqt-build-tools qttools))
@@ -896,6 +896,15 @@ (define-public lxqt-sudo
            qtsvg-5
            qtx11extras
            sudo))
+=======
+     `(("kwindowsystem" ,kwindowsystem)
+       ("liblxqt" ,liblxqt)
+       ("libqtxdg" ,libqtxdg)
+       ("qtbase" ,qtbase-5)
+       ("qtsvg" ,qtsvg-5)
+       ("qtx11extras" ,qtx11extras-5)
+       ("sudo" ,sudo)))
+>>>>>>> dcc84737d6 (gnu: qtx11extras: Remove variable.)
     (native-inputs
      (list pkg-config qttools lxqt-build-tools))
     (arguments
@@ -976,7 +985,7 @@ (define-public libfm-qt
            menu-cache
            pcre
            qtbase-5
-           qtx11extras))
+           qtx11extras-5))
     (native-inputs
      (list pkg-config lxqt-build-tools qttools))
     (home-page "https://lxqt-project.org")
@@ -998,7 +1007,7 @@ (define-public pcmanfm-qt
         (base32 "1axs7dnh2z08ygy28iipfbgfck15k2i2pwlf0v8d8axjrmavzb3l"))))
     (build-system cmake-build-system)
     (inputs
-     (list libfm-qt qtbase-5 qtx11extras))
+     (list libfm-qt qtbase-5 qtx11extras-5))
     (native-inputs
      (list pkg-config qttools lxqt-build-tools))
     (arguments
@@ -1068,7 +1077,7 @@ (define-public lximage-qt
         (base32 "0g6hs41xfw2ghhwpj0rqr2ciri0x9v984689yrnmnvah88zlya1f"))))
     (build-system cmake-build-system)
     (inputs
-     (list libexif libfm-qt qtbase-5 qtsvg-5 qtx11extras))
+     (list libexif libfm-qt qtbase-5 qtsvg-5 qtx11extras-5))
     (native-inputs
      (list pkg-config lxqt-build-tools qttools))
     (arguments
@@ -1101,7 +1110,7 @@ (define-public obconf-qt
            pango
            pcre
            qtbase-5
-           qtx11extras))
+           qtx11extras-5))
     (native-inputs
      (list lxqt-build-tools pkg-config qttools))
     (arguments
@@ -1125,7 +1134,7 @@ (define-public pavucontrol-qt
         (base32 "0w51dpjayav78lmhw966fz3gvypkmv64xgsd7x5rqs8am39lq9vc"))))
     (build-system cmake-build-system)
     (inputs
-     (list glib pcre pulseaudio qtbase-5 qtx11extras))
+     (list glib pcre pulseaudio qtbase-5 qtx11extras-5))
     (native-inputs
      (list pkg-config lxqt-build-tools qttools))
     (arguments
@@ -1154,7 +1163,7 @@ (define-public qps
            liblxqt
            libqtxdg
            qtbase-5
-           qtx11extras))
+           qtx11extras-5))
     (native-inputs
      (list lxqt-build-tools qttools))
     (arguments
@@ -1201,7 +1210,7 @@ (define-public qterminal
         (base32 "0rfv7a6ncm8fs8aicinh9l29w4636gxzcqz735jmch2r41v9i1d9"))))
     (build-system cmake-build-system)
     (inputs
-     (list qtbase-5 qtx11extras qtermwidget))
+     (list qtbase-5 qtx11extras-5 qtermwidget))
     (native-inputs
      (list lxqt-build-tools qttools))
     (arguments
@@ -1225,7 +1234,7 @@ (define-public screengrab
         (base32 "0cilzw7rz5m2klzpax7rrs5rr6whfda2svwzsn2jvmrirmh5by7r"))))
     (build-system cmake-build-system)
     (inputs
-     (list kwindowsystem libqtxdg qtbase-5 qtsvg-5 qtx11extras))
+     (list kwindowsystem libqtxdg qtbase-5 qtsvg-5 qtx11extras-5))
     (native-inputs
      (list pkg-config perl qttools))
     (arguments
@@ -1250,7 +1259,7 @@ (define-public lxqt-archiver
           (base32 "0fzgq7cyr7hx8qmq84xfgbsdx04mc1r7vzq5mz79j7bp2ysh134z"))))
     (build-system cmake-build-system)
     (inputs
-      (list glib json-glib libfm-qt qtbase-5 qtx11extras))
+      (list glib json-glib libfm-qt qtbase-5 qtx11extras-5))
     (native-inputs
       (list pkg-config lxqt-build-tools qttools))
     (arguments
@@ -1285,7 +1294,7 @@ (define-public lxqt-connman-applet
               qtbase-5
               qtsvg-5
               liblxqt
-              qtx11extras
+              qtx11extras-5
               libqtxdg))
       (native-inputs
         `(("lxqt-build-tools" ,lxqt-build-tools)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 229f409caa..7e5140e5f2 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -234,7 +234,7 @@ (define-public psi
        ("qtmultimedia" ,qtmultimedia)
        ("qtsvg" ,qtsvg-5)
        ("qtwebkit" ,qtwebkit)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("x11" ,libx11)
        ("xext" ,libxext)
        ("xcb" ,libxcb)
@@ -2975,7 +2975,7 @@ (define-public psi-plus
        ("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 dea4dc6cd0..32d50ab1f3 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -453,7 +453,7 @@ (define-public clementine
            protobuf
            pulseaudio
            qtbase-5
-           qtx11extras
+           qtx11extras-5
            sqlite
            sparsehash
            taglib))
@@ -546,7 +546,7 @@ (define-public strawberry
            protobuf
            pulseaudio
            qtbase-5
-           qtx11extras
+           qtx11extras-5
            sqlite
            taglib))
     (home-page "https://www.strawberrymusicplayer.org/")
@@ -2971,7 +2971,7 @@ (define-public vmpk
                                "/manpages/docbook.xsl")))
              #t)))))
     (inputs
-     (list drumstick qtbase-5 qtsvg-5 qtx11extras))
+     (list drumstick qtbase-5 qtsvg-5 qtx11extras-5))
     (native-inputs
      (list libxslt ;for xsltproc
            docbook-xsl qttools pkg-config))
@@ -3299,7 +3299,7 @@ (define-public qtractor
      `(#:tests? #f))                    ; no "check" target
     (inputs
      `(("qt" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("alsa-lib" ,alsa-lib)
        ("jack" ,jack-1)
        ("libsndfile" ,libsndfile)
@@ -4608,7 +4608,7 @@ (define-public lmms
     (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 7db592549d..d09abefa29 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -180,7 +180,7 @@ (define-public keepassxc
            qrencode
            qtbase-5
            qtsvg-5
-           qtx11extras
+           qtx11extras-5
            quazip-0                     ; XC_KEESHARE
            readline
            yubikey-personalization      ; XC_YUBIKEY
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 627f0d6df6..34b60a6f7c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -865,13 +865,13 @@ (define-public qtimageformats-5
     (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"))))
@@ -2135,7 +2135,7 @@ (define-public python-pyqt
        ("qtwebchannel" ,qtwebchannel)
        ("qtwebkit" ,qtwebkit)
        ("qtwebsockets" ,qtwebsockets)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("qtxmlpatterns" ,qtxmlpatterns)))
     (arguments
      `(#:modules ((srfi srfi-1)
@@ -2950,7 +2950,7 @@ (define-public python-pyside-2
            qtwebchannel
            qtwebengine
            qtwebsockets
-           qtx11extras
+           qtx11extras-5
            qtxmlpatterns))
     (propagated-inputs
      (list python-shiboken-2))
diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm
index 7266aa81f3..a17d33765b 100644
--- a/gnu/packages/robotics.scm
+++ b/gnu/packages/robotics.scm
@@ -121,7 +121,7 @@ (define-public aseba
              qtsvg-5
              qttools ;for libQt5Help, needed by "studio"
              qtwebkit
-             qtx11extras
+             qtx11extras-5
              eudev
              libxml2
              sdl2
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 608aa02ba5..427ac13465 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1964,7 +1964,7 @@ (define-public vlc
        ("python" ,python-wrapper)
        ("qtbase" ,qtbase-5)
        ("qtsvg" ,qtsvg-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ("samba" ,samba)
        ("sdl" ,sdl)
        ("sdl-image" ,sdl-image)
@@ -3356,7 +3356,7 @@ (define-public obs
       pulseaudio
       qtbase-5
       qtsvg-5
-      qtx11extras
+      qtx11extras-5
       qtwayland
       speexdsp
       v4l-utils
@@ -3615,7 +3615,7 @@ (define-public simplescreenrecorder
            libxinerama
            pulseaudio
            qtbase-5
-           qtx11extras))
+           qtx11extras-5))
     (native-inputs (list pkg-config))
     (arguments
      `(#:configure-flags
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 8a10dc0a22..a3ed1339c8 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -328,7 +328,7 @@ (define-public copyq
    `(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release")
      #:tests? #f)) ; Test suite is a rather manual process.
   (inputs
-   (list qtbase-5 qtscript qtsvg-5 qtx11extras))
+   (list qtbase-5 qtscript qtsvg-5 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 4ad8f07c09..b81fe5e59b 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6553,7 +6553,7 @@ (define-public uim-qt
     (name "uim-qt")
     (inputs
      `(("qt" ,qtbase-5)
-       ("qtx11extras" ,qtx11extras)
+       ("qtx11extras" ,qtx11extras-5)
        ,@(package-inputs uim)))
     (arguments
      (substitute-keyword-arguments (package-arguments uim)
-- 
2.36.1