guix_mirror_bot pushed a commit to branch core-packages-team
in repository guix.
commit 4fe6fb08ac69136f3a7f571e2f72f07d1ac87cca
Author: Zheng Junjie <z572@z572.online>
AuthorDate: Sat Jun 14 11:46:29 2025 +0800
gnu: kwayland-5: Fix build.
* gnu/packages/patches/kwayland-5-fix-build.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/kde-frameworks.scm (kwayland-5): Use It.
Change-Id: Ida72b1bdcacd59c112d1dceda669627e3bbe7110
---
gnu/local.mk | 1 +
gnu/packages/kde-frameworks.scm | 3 ++-
gnu/packages/patches/kwayland-5-fix-build.patch | 36 +++++++++++++++++++++++++
3 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index f69a90f1a5..9f92486811 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1721,6 +1721,7 @@ dist_patch_DATA =
\
%D%/packages/patches/krita-bump-sip-abi-version-to-12.8.patch \
%D%/packages/patches/krita-xsimd-13-compat.patch \
%D%/packages/patches/kvmfr-linux-module-fix-build.patch \
+ %D%/packages/patches/kwayland-5-fix-build.patch \
%D%/packages/patches/kwin-unwrap-executable-name-for-dot-desktop-search.patch\
%D%/packages/patches/laby-make-install.patch \
%D%/packages/patches/laby-use-tmpdir-from-runtime.patch \
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index fcc83f6640..a894f01596 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1595,7 +1595,8 @@ represented by a QPoint or a QSize.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1n5fq0gppx6rzgzkkskd077jygzj7cindb7zwr35yvbg5l69gdc8"))))
+ "1n5fq0gppx6rzgzkkskd077jygzj7cindb7zwr35yvbg5l69gdc8"))
+ (patches (search-patches "kwayland-5-fix-build.patch"))))
(native-inputs
(list extra-cmake-modules pkg-config))
(inputs
diff --git a/gnu/packages/patches/kwayland-5-fix-build.patch
b/gnu/packages/patches/kwayland-5-fix-build.patch
new file mode 100644
index 0000000000..7035e5069c
--- /dev/null
+++ b/gnu/packages/patches/kwayland-5-fix-build.patch
@@ -0,0 +1,36 @@
+from https://invent.kde.org/plasma/kwayland/-/merge_requests/130.patch
+
+From 0954a179d4ef72597efea44a91071eb9a55a385f Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aa...@kde.org>
+Date: Sun, 23 Mar 2025 01:29:27 +0100
+Subject: [PATCH] Fix build
+
+---
+ src/server/drm_fourcc.h | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/server/drm_fourcc.h b/src/server/drm_fourcc.h
+index 51124993..e10dbbcc 100644
+--- a/src/server/drm_fourcc.h
++++ b/src/server/drm_fourcc.h
+@@ -11,9 +11,14 @@
+
+ //#include "drm.h"
+
+-// These typedefs are copied from drm.h
+-typedef uint32_t __u32;
+-typedef uint64_t __u64;
++// This is copied from drm.h
++#if defined(__linux__)
++ #include <linux/types.h>
++ #include <asm/ioctl.h>
++#else /* One of the BSDs */
++ typedef uint32_t __u32;
++ typedef uint64_t __u64;
++#endif
+
+ #if defined(__cplusplus)
+ extern "C" {
+--
+GitLab
+
