commit: 098f5a7919fe1d090eaf56b6b6b95e9dc7e1ad39 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Sep 15 17:41:53 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Sep 15 17:42:02 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=098f5a79
kde-plasma/kwin: Fix build on x86 Tested-by: David Flogeras <dflogeras2 <AT> gmail.com> Closes: https://bugs.gentoo.org/813228 Package-Manager: Portage-3.0.23, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> kde-plasma/kwin/files/kwin-5.22.5-32bit.patch | 29 +++++++++++++++++++++++++++ kde-plasma/kwin/kwin-5.22.5.ebuild | 5 ++++- 2 files changed, 33 insertions(+), 1 deletion(-) 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 00000000000..7c40b207ca8 --- /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 <ast...@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 <dfloger...@gmail.com> +Signed-off-by: Andreas Sturmlechner <ast...@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 6bf17ada42c..ed5ad4fac40 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
