Merge remote-tracking branch 'origin/master' into staging

Conflicts:
	gnu/packages/gnuzilla.scm
	gnu/packages/graphics.scm
	gnu/packages/gstreamer.scm
	gnu/packages/gtk.scm
	gnu/packages/kde-frameworks.scm
	gnu/packages/video.scm

diff --cc gnu/local.mk
Simple merge

diff --cc gnu/packages/crates-io.scm
Simple merge

diff --cc gnu/packages/education.scm
Simple merge

diff --cc gnu/packages/freedesktop.scm
Simple merge

diff --cc gnu/packages/games.scm
Simple merge

diff --cc gnu/packages/gnome.scm
Simple merge

diff --cc gnu/packages/gnuzilla.scm
Simple merge

diff --cc gnu/packages/graphics.scm
Simple merge

diff --cc gnu/packages/gtk.scm
Simple merge

diff --cc gnu/packages/guile-xyz.scm
Simple merge

diff --cc gnu/packages/haskell.scm
Simple merge

diff --cc gnu/packages/kde-frameworks.scm
index 87c9884,059667e..20b3006
--- 1/gnu/packages/kde-frameworks.scm
--- 2/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@@ -730,7 -734,7 +730,7 @@@ replace the other outdated Graphviz too
      (native-inputs
       (list extra-cmake-modules pkg-config))
      (inputs
-      (list qtbase-5 qtwayland qtx11extras plasma-wayland-protocols wayland))
 -     (list qtbase-5 qtx11extras))
++     (list qtbase-5 qtwayland-5 qtx11extras plasma-wayland-protocols wayland))
      (home-page "https://community.kde.org/Frameworks")
      (synopsis "Utilities for graphical user interfaces")
      (description "The KDE GUI addons provide utilities for graphical user
@@@ -1051,21 -1068,16 +1051,21 @@@ protocols used in KDE Plasma."
      (native-inputs
       (list extra-cmake-modules pkg-config))
      (inputs
-      (list qtbase-5 plasma-wayland-protocols qtwayland wayland wayland-protocols))
 -     (list qtbase-5 qtwayland-5 wayland wayland-protocols))
++     (list qtbase-5 plasma-wayland-protocols qtwayland-5 wayland wayland-protocols))
      (arguments
 -     `(#:tests? #f ; FIXME tests require weston to run
 -                   ; weston requires wayland flags in mesa
 -       #:phases
 +     `(#:phases
         (modify-phases %standard-phases
 -         (add-before 'check 'check-setup
 +         (add-after 'unpack 'skip-specific-tests
             (lambda _
 -             (setenv "XDG_RUNTIME_DIR" "/tmp")
 -             #t)))))
 +             ;; PlasmaWindowModelTest::testChangeWindowAfterModelDestroy(icon)
 +             (substitute* "autotests/client/test_plasma_window_model.cpp"
 +               ((".*changedSpy\\.wait.*") ""))))
 +         (replace 'check
 +           (lambda* (#:key tests? #:allow-other-keys)
 +             (setenv "XDG_RUNTIME_DIR" (getcwd))
 +             (setenv "QT_QPA_PLATFORM" "offscreen")
 +             (when tests? ;; One test fails.
 +               (invoke "ctest" "-E" "kwayland-testWaylandRegistry")))))))
      (home-page "https://community.kde.org/Frameworks")
      (synopsis "Qt-style API to interact with the wayland client and server")
      (description "As the names suggest they implement a Client respectively a

diff --cc gnu/packages/kde-plasma.scm
index 634a44e,064f5f7..2b88ea2
--- 1/gnu/packages/kde-plasma.scm
--- 2/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@@ -269,8 -265,7 +269,8 @@@ call it if it is not associated to a te
             ;; For testing.
             dbus))
      (inputs
 -     (list kwayland libxrandr qtbase-5 qtx11extras))
 +     (list kwayland libxrandr plasma-wayland-protocols
-            qtbase-5 qtwayland wayland qtx11extras))
++           qtbase-5 qtwayland-5 wayland qtx11extras))
      (arguments
       '(#:tests? #f)) ; FIXME: 55% tests passed, 5 tests failed out of 11
      (home-page "https://community.kde.org/Solid/Projects/ScreenManagement")
@@@ -337,52 -335,3 +337,52 @@@ manage running processes.  It obtains t
  with a ksysguardd daemon, which may also run on a remote system.")
      (license license:gpl3+)))
  
-            qtwayland
 +(define-public kwayland-server
 +  (package
 +    (name "kwayland-server")
 +    (version "5.24.4")
 +    (source (origin
 +              (method url-fetch)
 +              (uri (string-append
 +                    "mirror://kde/stable/plasma/" version
 +                    "/" name "-" version ".tar.xz"))
 +              (sha256
 +               (base32
 +                "1279nqhy1qyz84dkn23rvzak8bg71hbrp09jlhv9mkjdb3bhnyfi"))))
 +    (build-system qt-build-system)
 +    (native-inputs
 +     (list extra-cmake-modules pkg-config))
 +    (inputs
 +     (list plasma-wayland-protocols
 +           qtbase-5
++           qtwayland-5
 +           kwayland
 +           wayland
 +           wayland-protocols-next))
 +    (arguments
 +     '(#:phases
 +       (modify-phases %standard-phases
 +         (add-after 'unpack 'patch-install-path
 +           (lambda _
 +             ;; Fixes errors including nonexistant /include/KF5
 +             (substitute* "src/server/CMakeLists.txt"
 +               (("KF5_INSTALL") "KDE_INSTALL"))))
 +         (replace 'check
 +           (lambda* (#:key tests? #:allow-other-keys)
 +             (when tests?
 +               (setenv "HOME" (getcwd))
 +               (setenv "XDG_RUNTIME_DIR" (getcwd))
 +               (setenv "QT_QPA_PLATFORM" "offscreen")
 +               (invoke "ctest" "-E"
 +                       ;; This test fails inconsistently.
 +                       "kwayland-testDragAndDrop")))))))
 +    (home-page "https://api.kde.org/kwayland-server/html/index.html")
 +    (synopsis "KDE wayland server component")
 +    (description
 +     "KWayland is a Qt-style API to interact with the wayland-client and
 +wayland-server API.")
 +    ;; Most files are LGPL2.1 or LGPL3.0 only, at the users option.
 +    (license (list license:lgpl2.1 license:lgpl3
 +                   ;; src/server/drm_fourcc.h carries the MIT license.
 +                   license:expat))))
 +

diff --cc gnu/packages/kde-systemtools.scm
index 5515c58,4e6cd1d..96ed5cb
--- 1/gnu/packages/kde-systemtools.scm
--- 2/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@@ -269,16 -253,13 +269,16 @@@ This package is part of the KDE base ap
             libvnc
             libxcb
             libxtst
 -           oxygen-icons ;; default icon set
 +           breeze-icons ;; default icon set
             pipewire-0.3
 +           plasma-wayland-protocols
             qtbase-5
-            qtwayland
++           qtwayland-5
             qtx11extras
 +           wayland
             xcb-util-image
             zlib))
 -    (home-page "https://kde.org/applications/internet/org.kde.krfb")
 +    (home-page "https://apps.kde.org/krfb/")
      (synopsis "Desktop Sharing utility")
      (description "KDE Desktop Sharing is a server application that allows you
  to share your current session with a user on another machine.  The desktop

diff --cc gnu/packages/kde.scm
index e83470b,20df62f..1d43212
--- 1/gnu/packages/kde.scm
--- 2/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@@ -750,9 -748,7 +750,9 @@@ different notification systems."
             qtmultimedia-5
             qtquickcontrols-5
             qtquickcontrols2-5
 -           qtx11extras))
 +           qtx11extras
-            qtwayland
++           qtwayland-5
 +           wayland))
      (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 --cc gnu/packages/linux.scm
Simple merge

diff --cc gnu/packages/maths.scm
Simple merge

diff --cc gnu/packages/perl.scm
Simple merge

diff --cc gnu/packages/python-crypto.scm
Simple merge

diff --cc gnu/packages/python-web.scm
Simple merge

diff --cc gnu/packages/python-xyz.scm
Simple merge

diff --cc gnu/packages/qt.scm
index 64db8ea,6e30980..134215e
--- 1/gnu/packages/qt.scm
--- 2/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@@ -1448,10 -1450,10 +1448,10 @@@ record media, and manage a collection o
  set of plugins for interacting with pulseaudio and GStreamer.")
      (license (package-license qtbase))))
  
- (define-public qtwayland
+ (define-public qtwayland-5
    (package (inherit qtsvg-5)
      (name "qtwayland")
 -    (version "5.15.2")
 +    (version "5.15.5")
      (source (origin
               (method url-fetch)
               (uri (qt-urls name version))

diff --cc gnu/packages/tex.scm
Simple merge

diff --cc gnu/packages/video.scm
Simple merge

diff --cc gnu/packages/webkit.scm
Simple merge