diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2021-09-15 19:41:53 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-09-15 19:42:02 +0200 |
| commit | 098f5a7919fe1d090eaf56b6b6b95e9dc7e1ad39 (patch) | |
| tree | 6b8d3545ba2fc96d5d84e4a6915fcf8d1700c251 /kde-plasma/kwin | |
| parent | kde-frameworks/kdelibs4support: Add missing IUSE="X" usedeps (diff) | |
| download | gentoo-098f5a7919fe1d090eaf56b6b6b95e9dc7e1ad39.tar.gz gentoo-098f5a7919fe1d090eaf56b6b6b95e9dc7e1ad39.tar.bz2 gentoo-098f5a7919fe1d090eaf56b6b6b95e9dc7e1ad39.zip | |
kde-plasma/kwin: Fix build on x86
Tested-by: David Flogeras <dflogeras2@gmail.com>
Closes: https://bugs.gentoo.org/813228
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-plasma/kwin')
| -rw-r--r-- | kde-plasma/kwin/files/kwin-5.22.5-32bit.patch | 29 | ||||
| -rw-r--r-- | kde-plasma/kwin/kwin-5.22.5.ebuild | 5 |
2 files changed, 33 insertions, 1 deletions
diff --git a/kde-plasma/kwin/files/kwin-5.22.5-32bit.patch b/kde-plasma/kwin/files/kwin-5.22.5-32bit.patch new file mode 100644 index 000000000000..7c40b207ca86 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.22.5-32bit.patch @@ -0,0 +1,29 @@ +From 38e24ecd6416a975db0989c21b70d6a4cc242f35 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Wed, 15 Sep 2021 19:06:23 +0200 +Subject: [PATCH] Fix build with 32-bit + +Follow-up to 839710201c389b7f4ed248cb3818e755a37ce977 + +Tested-by: David Flogeras <dflogeras2@gmail.com> +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + src/plugins/platforms/x11/common/eglonxbackend.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/platforms/x11/common/eglonxbackend.cpp b/src/plugins/platforms/x11/common/eglonxbackend.cpp +index d2900c7c3..c8acefe82 100644 +--- a/src/plugins/platforms/x11/common/eglonxbackend.cpp ++++ b/src/plugins/platforms/x11/common/eglonxbackend.cpp +@@ -214,7 +214,7 @@ EGLSurface EglOnXBackend::createSurface(xcb_window_t window) + } + + // Window is 64 bits on a 64-bit architecture whereas xcb_window_t is always 32 bits. +- unsigned long nativeWindow = window; ++ uintptr_t nativeWindow = window; + + EGLSurface surface = EGL_NO_SURFACE; + if (havePlatformBase()) { +-- +2.33.0 + diff --git a/kde-plasma/kwin/kwin-5.22.5.ebuild b/kde-plasma/kwin/kwin-5.22.5.ebuild index 6bf17ada42c0..ed5ad4fac409 100644 --- a/kde-plasma/kwin/kwin-5.22.5.ebuild +++ b/kde-plasma/kwin/kwin-5.22.5.ebuild @@ -103,7 +103,10 @@ PDEPEND=" >=kde-plasma/kde-cli-tools-${PVCUT}:5 " -PATCHES=( "${FILESDIR}/${P}-libglvnd-1.3.4.patch" ) # KDE-bug 440372, bug 810511 +PATCHES=( + "${FILESDIR}/${P}-libglvnd-1.3.4.patch" # KDE-bug 440372, bug 810511 + "${FILESDIR}/${P}-32bit.patch" # bug 813228 +) src_prepare() { ecm_src_prepare |