diff options
| author | Zheng Junjie <z572@z572.online> | 2025-06-14 11:46:29 +0800 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-18 20:17:35 +0200 |
| commit | a23d7877ea0e5e1f76953361ab984e692f8ac68b (patch) | |
| tree | e19593d38460a37801f941a706bc0dfba27f5bbf /gnu | |
| parent | 3d2efdbd33f000bd05fae4d7a34e9e15f4c325c9 (diff) | |
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
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/kde-frameworks.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/patches/kwayland-5-fix-build.patch | 36 |
3 files changed, 39 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index f9e159b385e..9e04fae9f9e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -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 \ diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 52cd6c26f17..06d116776f8 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -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 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 00000000000..7035e5069c2 --- /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 <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 + |