| 1 |
commit: bb0d4f0f8e79ae8fb203418417177378231497db |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 19 14:01:55 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 21 18:43:44 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb0d4f0f |
| 7 |
|
| 8 |
kde-plasma/kwin: Fix build on 32-bit |
| 9 |
|
| 10 |
Upstream commits: |
| 11 |
38e24ecd6416a975db0989c21b70d6a4cc242f35 |
| 12 |
e26ea6bf2313c021db7e5ca5454cd8b1e2e2037f |
| 13 |
|
| 14 |
Bug: https://bugs.gentoo.org/810511 |
| 15 |
Bug: https://bugs.gentoo.org/813228 |
| 16 |
Package-Manager: Portage-3.0.23, Repoman-3.0.3 |
| 17 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 18 |
|
| 19 |
kde-plasma/kwin/files/kwin-5.22.5-32bit.patch | 29 ---------------------- |
| 20 |
.../kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch | 6 ++++- |
| 21 |
kde-plasma/kwin/kwin-5.22.5.ebuild | 3 +-- |
| 22 |
3 files changed, 6 insertions(+), 32 deletions(-) |
| 23 |
|
| 24 |
diff --git a/kde-plasma/kwin/files/kwin-5.22.5-32bit.patch b/kde-plasma/kwin/files/kwin-5.22.5-32bit.patch |
| 25 |
deleted file mode 100644 |
| 26 |
index 7c40b207ca8..00000000000 |
| 27 |
--- a/kde-plasma/kwin/files/kwin-5.22.5-32bit.patch |
| 28 |
+++ /dev/null |
| 29 |
@@ -1,29 +0,0 @@ |
| 30 |
-From 38e24ecd6416a975db0989c21b70d6a4cc242f35 Mon Sep 17 00:00:00 2001 |
| 31 |
-From: Andreas Sturmlechner <asturm@g.o> |
| 32 |
-Date: Wed, 15 Sep 2021 19:06:23 +0200 |
| 33 |
-Subject: [PATCH] Fix build with 32-bit |
| 34 |
- |
| 35 |
-Follow-up to 839710201c389b7f4ed248cb3818e755a37ce977 |
| 36 |
- |
| 37 |
-Tested-by: David Flogeras <dflogeras2@×××××.com> |
| 38 |
-Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
| 39 |
---- |
| 40 |
- src/plugins/platforms/x11/common/eglonxbackend.cpp | 2 +- |
| 41 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 42 |
- |
| 43 |
-diff --git a/src/plugins/platforms/x11/common/eglonxbackend.cpp b/src/plugins/platforms/x11/common/eglonxbackend.cpp |
| 44 |
-index d2900c7c3..c8acefe82 100644 |
| 45 |
---- a/src/plugins/platforms/x11/common/eglonxbackend.cpp |
| 46 |
-+++ b/src/plugins/platforms/x11/common/eglonxbackend.cpp |
| 47 |
-@@ -214,7 +214,7 @@ EGLSurface EglOnXBackend::createSurface(xcb_window_t window) |
| 48 |
- } |
| 49 |
- |
| 50 |
- // Window is 64 bits on a 64-bit architecture whereas xcb_window_t is always 32 bits. |
| 51 |
-- unsigned long nativeWindow = window; |
| 52 |
-+ uintptr_t nativeWindow = window; |
| 53 |
- |
| 54 |
- EGLSurface surface = EGL_NO_SURFACE; |
| 55 |
- if (havePlatformBase()) { |
| 56 |
--- |
| 57 |
-2.33.0 |
| 58 |
- |
| 59 |
|
| 60 |
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 |
| 61 |
index bdca6e2081b..6db52bdd749 100644 |
| 62 |
--- a/kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch |
| 63 |
+++ b/kde-plasma/kwin/files/kwin-5.22.5-libglvnd-1.3.4.patch |
| 64 |
@@ -8,6 +8,10 @@ EGL_NO_PLATFORM_SPECIFIC_TYPES, EGLNativeWindowType is defined as an |
| 65 |
opaque pointer, i.e. void*. |
| 66 |
|
| 67 |
BUG: 440372 |
| 68 |
+ |
| 69 |
+* asturm 2021-09-21: Merged with upstream commits: |
| 70 |
+38e24ecd6416a975db0989c21b70d6a4cc242f35 "Fix build with 32-bit" |
| 71 |
+e26ea6bf2313c021db7e5ca5454cd8b1e2e2037f "Fix build on 32bit platforms" |
| 72 |
--- |
| 73 |
src/plugins/platforms/x11/common/eglonxbackend.cpp | 13 +++++++------ |
| 74 |
1 file changed, 7 insertions(+), 6 deletions(-) |
| 75 |
@@ -21,7 +25,7 @@ index c62ec170d..d2900c7c3 100644 |
| 76 |
} |
| 77 |
|
| 78 |
+ // Window is 64 bits on a 64-bit architecture whereas xcb_window_t is always 32 bits. |
| 79 |
-+ unsigned long nativeWindow = window; |
| 80 |
++ Window nativeWindow = window; |
| 81 |
+ |
| 82 |
EGLSurface surface = EGL_NO_SURFACE; |
| 83 |
if (havePlatformBase()) { |
| 84 |
|
| 85 |
diff --git a/kde-plasma/kwin/kwin-5.22.5.ebuild b/kde-plasma/kwin/kwin-5.22.5.ebuild |
| 86 |
index 2c65c2ef9f9..43b14d49330 100644 |
| 87 |
--- a/kde-plasma/kwin/kwin-5.22.5.ebuild |
| 88 |
+++ b/kde-plasma/kwin/kwin-5.22.5.ebuild |
| 89 |
@@ -104,8 +104,7 @@ PDEPEND=" |
| 90 |
" |
| 91 |
|
| 92 |
PATCHES=( |
| 93 |
- "${FILESDIR}/${P}-libglvnd-1.3.4.patch" # KDE-bug 440372, bug 810511 |
| 94 |
- "${FILESDIR}/${P}-32bit.patch" # bug 813228 |
| 95 |
+ "${FILESDIR}/${P}-libglvnd-1.3.4.patch" # KDE-bug 440372, bugs 810511, 813228 |
| 96 |
) |
| 97 |
|
| 98 |
src_prepare() { |
Archives