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
This commit is contained in:
Zheng Junjie 2025-06-14 11:46:29 +08:00 committed by Andreas Enge
parent 3d2efdbd33
commit a23d7877ea
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
3 changed files with 39 additions and 1 deletions

View file

@ -1723,6 +1723,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 \

View file

@ -1606,7 +1606,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

View file

@ -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 <aacid@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