gentoo resync : 08.10.2021

3 files changed, 28 insertions, 13 deletions

diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 04458303bccd..69cf61436287 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,7 +1,7 @@
 AUX kwin-5.21.80-gstreamer-optional.patch 971 BLAKE2B f31d18f865a9108ff1bfb711ea95a281295487090be982719a8623faeb5fbc645b8c55468fdfa8482fc052b1546bb2445e4b150c10b239e1ca149f1402b97bff SHA512 cf08106ca39cb455044c47da104b66eb470b72573803a3a1fd6be0eaa58f80b9b7a163898a3234f28552214a1aa3d651f633490377bf87ec4d883878b115b7bc
-AUX kwin-5.22.5-libglvnd-1.3.4.patch 2254 BLAKE2B 3a907856afa816dee53b50e17e2c3ba923c22fae8c9cb644a0b402d350bf9f2701c774daf8dbc45d9d9dac4afdd6e96f6a06ac401be890c3981cff976c61fcb1 SHA512 a71d7480b34503813724a358d01a8e0e8c85ad14e4d1cb3b7c0afb9ff2543552b8e8e49562e8ec81ff1fdeb87ca406fdb4a33e18815e2664143c23a69838831e
+AUX kwin-5.22.5-libglvnd-1.3.4.patch 2959 BLAKE2B 849912f1b614d8ece456c9bbf020cd146a4a07ec759b1a5f8f19d773c3081ce464e26dff64e84fa5f7df7df3e44e8e5fe607a136d9fa29e93530aa14f336b7e8 SHA512 982b50894427ed5275ab0d807f616e7b4e17370000558c434d9178c09ec7fa5447b3f9ad08c1945fcf6f2cbc17f2653ce6863027678ae74fd2dc653a5d587263
 DIST kwin-5.22.5.tar.xz 6459916 BLAKE2B caaec435be180fd4c359bea2d1f4a9a0e3e5854f73b91b83d62ad4e488e9d779a7f6bc5620dfb2ebcf5629b2f90c958d4a4a126df34c9734220c64262e751fba SHA512 4e466f3961279610c16d24c1dbc6368862308ee7bf677bf9f8ed1898465aa31263a34362b1beaad451b6c5e94068d908718c7bb37d12b814f2af9a1eccf417d2
 DIST kwin-5.22.90.tar.xz 6327028 BLAKE2B 273c7a92225136e7c86e8249be0c0200cab2c9e90fcc64b24e3c4450580600ba53ace32da0a7409b7c3f7efe0985f12ed90229b524377511d95aae6d4d7841ac SHA512 89dcb08f00a130ff5498f641993aec3997b9ff95ffcc8749cd4d3bfacc204ac9e83f6a9653f14fa0743276cefc02220ac96e898c653c2f18261a2a5a0e3fffea
 EBUILD kwin-5.22.5.ebuild 4128 BLAKE2B 8b93294d20199942f6aa0b4ed480618dff5bb7d4cc391340741c5c56088b577c02c15cec0742e6df2a7c45293316011c0a74dfec892ed53c566e86bb295ef81c SHA512 8d7c7c74e886ea8fd4d7a2dd47f8483cc162dd489d13c1d82a76595255d0c321c4e38ec6d9bba3a945349045963db018b0e1fa3526464e07d962922528f778c9
-EBUILD kwin-5.22.90.ebuild 4002 BLAKE2B 10cf4368c6af39fa6e506e76aed1314c2e391fc8dd30aa1e5a1baf17b43099b6a566926118fcdb289c5d6ee14cc87a803b7af46994614fb76ee064b03533e992 SHA512 035baf1bbc507ef9eea7d57467462bbe136ee1d104cb373424c56854f1ee674d6e78feba88798499c4ebe1c4abc62a57efe69823009690a5f42d8922e7ca99f1
+EBUILD kwin-5.22.90.ebuild 4003 BLAKE2B 3a57c49c4640fc7aea1bb139b3b1a6298b951f99af5308573771822072d61e77898f66d11ed8f66cd2524eb49ffdfd903bbe158eb0211ac4938ec5b5e2de4a70 SHA512 a9d939d9e41cfccd0cfca8d0ad1c3dcda0064ae7dfb83d69efc594053bbea47bd8fa90803a071f8cc5c64e319888de76f70333002b85e1b9e65840a4106ed692
 MISC metadata.xml 512 BLAKE2B 3e81119dbc98181573e294885c52623e4799b55c238ca9513e33547e718ec0f1762371d6391a4291c54159f31cd510cd8d9c192aa16ef0fc16672a3d0ef25dbe SHA512 a9a28562cb0f25abf24cb89c48fea816bfaf701c889ee08e66b80b3afe434af68e5ddb0fa21d313d68418c81a1e73eefcabf75e8e3878f55a1292039dde6ecdb
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 6db52bdd7492..d185d5e41fe6 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
@@ -12,15 +12,30 @@ BUG: 440372
 * asturm 2021-09-21: Merged with upstream commits:
 38e24ecd6416a975db0989c21b70d6a4cc242f35 "Fix build with 32-bit"
 e26ea6bf2313c021db7e5ca5454cd8b1e2e2037f "Fix build on 32bit platforms"
+
+* asturm 2021-10-04: Merged with upstream commit:
+From df11acd46778e1e43183c2660bc9dcb1a8ad3282 Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Tue, 21 Sep 2021 17:34:59 +0300
+Subject: [PATCH] x11: Cast Window to EGLNativeWindowType using a C cast
+
+reinterpret_cast<>() will fail if the types we cast from and to have
+mismatching sizes.
+
+Unfortunately, there are platforms that have Window and
+EGLNativeWindowType of different size. This results in compilation
+errors.
+
+In order to work around those problematic platforms, this change
+replaces reinterpret_cast cast with a c style cast.
 ---
- src/plugins/platforms/x11/common/eglonxbackend.cpp | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
+ src/plugins/platforms/x11/common/eglonxbackend.cpp | 16 +++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
 
-diff --git a/src/plugins/platforms/x11/common/eglonxbackend.cpp b/src/plugins/platforms/x11/common/eglonxbackend.cpp
-index c62ec170d..d2900c7c3 100644
+diff -u a/src/plugins/platforms/x11/common/eglonxbackend.cpp b/src/plugins/platforms/x11/common/eglonxbackend.cpp
 --- a/src/plugins/platforms/x11/common/eglonxbackend.cpp
 +++ b/src/plugins/platforms/x11/common/eglonxbackend.cpp
-@@ -213,15 +213,16 @@ EGLSurface EglOnXBackend::createSurface(xcb_window_t window)
+@@ -213,15 +213,19 @@
          return EGL_NO_SURFACE;
      }
  
@@ -38,11 +53,11 @@ index c62ec170d..d2900c7c3 100644
 +        surface = eglCreatePlatformWindowSurfaceEXT(eglDisplay(), config(), (void *) &nativeWindow, nullptr);
      } else {
 -        surface = eglCreateWindowSurface(eglDisplay(), config(), window, nullptr);
-+        // eglCreateWindowSurface() expects a Window, not a pointer to the Window.
-+        surface = eglCreateWindowSurface(eglDisplay(), config(), reinterpret_cast<EGLNativeWindowType>(nativeWindow), nullptr);
++        // eglCreateWindowSurface() expects a Window, not a pointer to the Window. Use
++        // a c style cast as there are (buggy) platforms where the size of the Window
++        // type is not the same as the size of EGLNativeWindowType, reinterpret_cast<>()
++        // may not compile.
++        surface = eglCreateWindowSurface(eglDisplay(), config(), (EGLNativeWindowType) nativeWindow, nullptr);
      }
  
      return surface;
--- 
-GitLab
-
diff --git a/kde-plasma/kwin/kwin-5.22.90.ebuild b/kde-plasma/kwin/kwin-5.22.90.ebuild
index f745210aba18..52d15b22caac 100644
--- a/kde-plasma/kwin/kwin-5.22.90.ebuild
+++ b/kde-plasma/kwin/kwin-5.22.90.ebuild
@@ -48,7 +48,7 @@ COMMON_DEPEND="
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	>=kde-frameworks/kwayland-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5[X]
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5=[X]
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 	>=kde-frameworks/plasma-${KFMIN}:5
 	>=kde-plasma/breeze-${PVCUT}:5