diff options
Diffstat (limited to 'kde-plasma/kwin')
| -rw-r--r-- | kde-plasma/kwin/Manifest | 5 | ||||
| -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 |
4 files changed, 8 insertions, 35 deletions
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest index b9568b132595..8c03189566ea 100644 --- a/kde-plasma/kwin/Manifest +++ b/kde-plasma/kwin/Manifest @@ -1,6 +1,5 @@ AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc -AUX kwin-5.22.5-32bit.patch 1080 BLAKE2B f92c94d83bae7e00240d4717cab0df9068ed2eb7ebcdf27d30030df72a70945017a182db55697564e1768d9d82358fd2232ec47274b3af0a69e91516ae446b24 SHA512 67b46e401256557bd0b1e35b9a1285cb180cf9b175d26089c537f805c54e9ae60222227443c3631fda5b5ebd299d5983beb537a41ead78dcf9b9cfda73608156 -AUX kwin-5.22.5-libglvnd-1.3.4.patch 2072 BLAKE2B bd49a10f8de69b315cd6f1a754c3f20c356cbd6b6cb37fea891dbac77f171c2eacdcdb9b2972ed9f03beab113d6bea6be10d12b612f99d96e87d3fbecccced9e SHA512 ee504d237cd7acf76e3b6e2bbed7b747938462e1350927d3c9655f341890613137e70aee12fbaa7003cf2ba0868852082343e24e32da03874a546d0b50b23c4a +AUX kwin-5.22.5-libglvnd-1.3.4.patch 2254 BLAKE2B 3a907856afa816dee53b50e17e2c3ba923c22fae8c9cb644a0b402d350bf9f2701c774daf8dbc45d9d9dac4afdd6e96f6a06ac401be890c3981cff976c61fcb1 SHA512 a71d7480b34503813724a358d01a8e0e8c85ad14e4d1cb3b7c0afb9ff2543552b8e8e49562e8ec81ff1fdeb87ca406fdb4a33e18815e2664143c23a69838831e DIST kwin-5.22.5.tar.xz 6459916 BLAKE2B caaec435be180fd4c359bea2d1f4a9a0e3e5854f73b91b83d62ad4e488e9d779a7f6bc5620dfb2ebcf5629b2f90c958d4a4a126df34c9734220c64262e751fba SHA512 4e466f3961279610c16d24c1dbc6368862308ee7bf677bf9f8ed1898465aa31263a34362b1beaad451b6c5e94068d908718c7bb37d12b814f2af9a1eccf417d2 -EBUILD kwin-5.22.5.ebuild 4164 BLAKE2B 4e027110c148d146114e0631cfd0bf2751ef16184ab44102f95f739887a2d8eabd72bd5949fd8d4cf80f30d12a42055565b68694eb98aff967ccad4e5666c33f SHA512 ab67f8105ad307536f7a7825f89ce0d036bd4d0a29e3c6756e64b30e5623f5ae973e8a2d320bbdd9bac3eed16f721694782014074b6ce2da8bc9ffc89e0acf7c +EBUILD kwin-5.22.5.ebuild 4128 BLAKE2B 8b93294d20199942f6aa0b4ed480618dff5bb7d4cc391340741c5c56088b577c02c15cec0742e6df2a7c45293316011c0a74dfec892ed53c566e86bb295ef81c SHA512 8d7c7c74e886ea8fd4d7a2dd47f8483cc162dd489d13c1d82a76595255d0c321c4e38ec6d9bba3a945349045963db018b0e1fa3526464e07d962922528f778c9 MISC metadata.xml 512 BLAKE2B 3e81119dbc98181573e294885c52623e4799b55c238ca9513e33547e718ec0f1762371d6391a4291c54159f31cd510cd8d9c192aa16ef0fc16672a3d0ef25dbe SHA512 a9a28562cb0f25abf24cb89c48fea816bfaf701c889ee08e66b80b3afe434af68e5ddb0fa21d313d68418c81a1e73eefcabf75e8e3878f55a1292039dde6ecdb 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() { |