diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2021-09-19 16:01:55 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2021-09-21 20:43:44 +0200 |
| commit | bb0d4f0f8e79ae8fb203418417177378231497db (patch) | |
| tree | d3e38ba1e9feab7b74419ace1c6129041d392abd /kde-plasma/kwin | |
| parent | sci-visualization/dash: disable testing (diff) | |
| download | gentoo-bb0d4f0f8e79ae8fb203418417177378231497db.tar.gz gentoo-bb0d4f0f8e79ae8fb203418417177378231497db.tar.bz2 gentoo-bb0d4f0f8e79ae8fb203418417177378231497db.zip | |
kde-plasma/kwin: Fix build on 32-bit
Upstream commits:
38e24ecd6416a975db0989c21b70d6a4cc242f35
e26ea6bf2313c021db7e5ca5454cd8b1e2e2037f
Bug: https://bugs.gentoo.org/810511
Bug: 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/files/kwin-5.22.5-libglvnd-1.3.4.patch | 6 | ||||
| -rw-r--r-- | kde-plasma/kwin/kwin-5.22.5.ebuild | 3 |
3 files changed, 6 insertions, 32 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 deleted file mode 100644 index 7c40b207ca86..000000000000 --- a/kde-plasma/kwin/files/kwin-5.22.5-32bit.patch +++ /dev/null @@ -1,29 +0,0 @@ -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/files/kwin-5.22.5-libglvnd-1.3.4.patch b/kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch index bdca6e2081bc..6db52bdd7492 100644 --- a/kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch +++ b/kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch @@ -8,6 +8,10 @@ EGL_NO_PLATFORM_SPECIFIC_TYPES, EGLNativeWindowType is defined as an opaque pointer, i.e. void*. BUG: 440372 + +* asturm 2021-09-21: Merged with upstream commits: +38e24ecd6416a975db0989c21b70d6a4cc242f35 "Fix build with 32-bit" +e26ea6bf2313c021db7e5ca5454cd8b1e2e2037f "Fix build on 32bit platforms" --- src/plugins/platforms/x11/common/eglonxbackend.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) @@ -21,7 +25,7 @@ index c62ec170d..d2900c7c3 100644 } + // Window is 64 bits on a 64-bit architecture whereas xcb_window_t is always 32 bits. -+ unsigned long nativeWindow = window; ++ Window nativeWindow = window; + EGLSurface surface = EGL_NO_SURFACE; if (havePlatformBase()) { diff --git a/kde-plasma/kwin/kwin-5.22.5.ebuild b/kde-plasma/kwin/kwin-5.22.5.ebuild index 2c65c2ef9f96..43b14d49330f 100644 --- a/kde-plasma/kwin/kwin-5.22.5.ebuild +++ b/kde-plasma/kwin/kwin-5.22.5.ebuild @@ -104,8 +104,7 @@ PDEPEND=" " PATCHES=( - "${FILESDIR}/${P}-libglvnd-1.3.4.patch" # KDE-bug 440372, bug 810511 - "${FILESDIR}/${P}-32bit.patch" # bug 813228 + "${FILESDIR}/${P}-libglvnd-1.3.4.patch" # KDE-bug 440372, bugs 810511, 813228 ) src_prepare() { |