gentoo resync : 02.02.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-02-02 01:39:05 +0000
commit: fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree: 3bfce096b38a9cea8eed13fc70c1526c456e9abd /kde-frameworks
parent: 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)
35 files changed, 1213 insertions, 11 deletions
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index d1a030faac1b..ff3e7f11c758 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index 3800271de337..9fdb0c71b5c6 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,5 +1,6 @@
+AUX breeze-icons-rcc-5.90.0-fix-dupe-tests.patch 7297 BLAKE2B c2f92475bff51b9aec09578cf7ca04c63c048d9b6e600d55d190174d2ce4fd175badcbe19839ea6e6bbd04c5030c34c10bbb1756e1d1de5c684f9a8a67fdf97f SHA512 efaee2462e810d355a5a20a768506fe4ef3d8b36abe9778ba563f4526ed73f008c0b27325ffe150ff219301bbef17b0ed7cf30f6a54b50bc80bf4fb6297bb4a3
 DIST breeze-icons-5.88.0.tar.xz 2128308 BLAKE2B e96b04d524d99227ee09935c63ed8362b0a75a88e89835afc8537d03e360c202957392eee329397c0c502a47140d975ac2bde79738b911fd0600c6d2a3a079ab SHA512 e66ee04a2e073fe954e97dfd377581715313a041d62740eda7c4b599fd6785ca241f58508afafcb2fb3a8803df72f5e451a213dff7329f6beca87197e8e1f00d
 DIST breeze-icons-5.90.0.tar.xz 2145144 BLAKE2B af9c5b771d164441fee38bdb82c86909391abf0e3b91db203bbc2775c75e88abc8d1d1762e71ae07a9374391d280fe737ffb34f49c02932eb4a3620dcdacbdc4 SHA512 17279b11fa221a81c488f832826b28a02343b74e4d0ff486503b79aca399c25a1ce0f7c905a2f4b35e47fe86ed7dbb93442daba452676e117773e47031697280
 EBUILD breeze-icons-rcc-5.88.0.ebuild 911 BLAKE2B 474a0407b727eff529affe1d3cf3c811b247025159b2fe0fa43e9486e0b42cb7c469de2172671aefbb5aa8115ce8d074d2882529a18f80f5ca9dd8ce03afd431 SHA512 cdcc9fb786093b2bad5ca33314e93afc7f5433a622e7afdab3e51fad6dc28941d9311f47642dde76946bfd16320620cecfdf1534b41f68b8e04911328234934a
-EBUILD breeze-icons-rcc-5.90.0.ebuild 914 BLAKE2B a714ed182f668314c45d898dc10a491a18810d896328c6bbd12c93cb02f4b41378da0a02785a91acc569e7135f5ddb827c4491347bed09bc084dce14416faca3 SHA512 0c9104895ba1d0437131d9484c8dc10652bdd52b9d8e09ffa14ecdb38100f0073142ef44edce41167509cdedc2a0cbdfdb9c0e38623d07364b6c6616c4aa431e
+EBUILD breeze-icons-rcc-5.90.0.ebuild 967 BLAKE2B e75beb4b7c93f19dd11b3611471356db6fdbff82978caadeb0ed8ec4ef764ab7f711fe9ea87e0914fc990f0b6fe3378abb7d7259d3bfc731545d125c2ac8da0b SHA512 b4c76c4dd62f25798d04fd18605045eb68762b68c5a1bbdab3392b224c86c09f56f48c754db5152335ca699bec938b84ced84b5615249b4896702f5951753529
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.90.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.90.0.ebuild
index 98610eaa6083..a85058e7c6f3 100644
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.90.0.ebuild
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.90.0.ebuild
@@ -23,6 +23,8 @@ BDEPEND="${PYTHON_DEPS}
 "
 DEPEND="test? ( dev-qt/qttest:5 )"
 
+PATCHES=( "${FILESDIR}/${P}-fix-dupe-tests.patch" )
+
 python_check_deps() {
 	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
 }
diff --git a/kde-frameworks/breeze-icons-rcc/files/breeze-icons-rcc-5.90.0-fix-dupe-tests.patch b/kde-frameworks/breeze-icons-rcc/files/breeze-icons-rcc-5.90.0-fix-dupe-tests.patch
new file mode 100644
index 000000000000..af066fda766b
--- /dev/null
+++ b/kde-frameworks/breeze-icons-rcc/files/breeze-icons-rcc-5.90.0-fix-dupe-tests.patch
@@ -0,0 +1,193 @@
+From eb684892d7528cf4790cbcaf65b2fe1abda5e114 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Tue, 4 Jan 2022 22:43:49 +0100
+Subject: [PATCH] Fix dupe tests by replacing icons with symlinks
+
+[1] introduced new icons which are apparently duplicates of already
+existing icons and made the dupe test fail.
+
+[1] 9073eb1f7c34045930ac375e288827c29c0553fc
+---
+ icons/places/16/folder-book.svg    | 14 +-------------
+ icons/places/16/folder-comic.svg   | 14 +-------------
+ icons/places/16/folder-library.svg | 15 +--------------
+ icons/places/22/folder-book.svg    | 15 +--------------
+ icons/places/22/folder-comic.svg   | 15 +--------------
+ icons/places/22/folder-library.svg | 15 +--------------
+ 6 files changed, 6 insertions(+), 82 deletions(-)
+ mode change 100644 => 120000 icons/places/16/folder-book.svg
+ mode change 100644 => 120000 icons/places/16/folder-comic.svg
+ mode change 100644 => 120000 icons/places/16/folder-library.svg
+ mode change 100644 => 120000 icons/places/22/folder-book.svg
+ mode change 100644 => 120000 icons/places/22/folder-comic.svg
+ mode change 100644 => 120000 icons/places/22/folder-library.svg
+
+diff --git a/icons/places/16/folder-book.svg b/icons/places/16/folder-book.svg
+deleted file mode 100644
+index eff7ce86..00000000
+--- a/icons/places/16/folder-book.svg
++++ /dev/null
+@@ -1,13 +0,0 @@
+-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+-  <defs id="defs3051">
+-    <style type="text/css" id="current-color-scheme">
+-      .ColorScheme-Text {
+-        color:#232629;
+-      }
+-      </style>
+-  </defs>
+- <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+-       d="M 3 2 L 3 3 L 3 4 L 2 4 L 2 6 L 3 6 L 3 10 L 2 10 L 2 12 L 3 12 L 3 13.5 L 3 14 L 14 14 L 14 13 L 14 3 L 14 2 L 3 2 z M 4 3 L 5 3 L 5 13 L 4 13 L 4 3 z M 6 3 L 13 3 L 13 13 L 6 13 L 6 3 z "
+-     class="ColorScheme-Text"
+-     />
+-</svg>
+diff --git a/icons/places/16/folder-book.svg b/icons/places/16/folder-book.svg
+new file mode 120000
+index 00000000..328a27f3
+--- /dev/null
++++ b/icons/places/16/folder-book.svg
+@@ -0,0 +1 @@
++../../actions/16/address-book-new.svg
+\ No newline at end of file
+diff --git a/icons/places/16/folder-comic.svg b/icons/places/16/folder-comic.svg
+deleted file mode 100644
+index e2f5c9f3..00000000
+--- a/icons/places/16/folder-comic.svg
++++ /dev/null
+@@ -1,13 +0,0 @@
+-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+-  <defs id="defs3051">
+-    <style type="text/css" id="current-color-scheme">
+-      .ColorScheme-Text {
+-        color:#232629;
+-      }
+-      </style>
+-  </defs>
+- <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+-     d="M 5 2 L 5 5 L 2 5 L 2 11 L 5 14 L 5 11 L 10 11 L 10 8 L 11 8 L 11 11 L 14 8 L 14 2 L 5 2 z M 6 3 L 13 3 L 13 7 L 6 7 L 6 3 z M 3 6 L 5 6 L 5 8 L 9 8 L 9 10 L 3 10 L 3 6 z "
+-     class="ColorScheme-Text"
+-     />
+-</svg>
+diff --git a/icons/places/16/folder-comic.svg b/icons/places/16/folder-comic.svg
+new file mode 120000
+index 00000000..0725f950
+--- /dev/null
++++ b/icons/places/16/folder-comic.svg
+@@ -0,0 +1 @@
++../../actions/16/kmouth-phrasebook.svg
+\ No newline at end of file
+diff --git a/icons/places/16/folder-library.svg b/icons/places/16/folder-library.svg
+deleted file mode 100644
+index d78dee94..00000000
+--- a/icons/places/16/folder-library.svg
++++ /dev/null
+@@ -1,14 +0,0 @@
+-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+-  <defs id="defs3051">
+-    <style type="text/css" id="current-color-scheme">
+-      .ColorScheme-Text {
+-        color:#232629;
+-      }
+-      </style>
+-  </defs>
+-<path
+-    d="m8 2.0039062-6 3.8984376v1.0976562h1v6h-1v1h12v-1h-1v-6h1v-1.0976562zm0 1.1933594 4.310547 2.8027344h-8.6210939zm-4 3.8027344h1v6h-1zm2 0h4v6h-1v-2h-2v2h-1zm5 0h1v6h-1z"
+-    style="fill:currentColor;fill-opacity:1;stroke:none"
+-    class="ColorScheme-Text"
+-    />
+-</svg>
+diff --git a/icons/places/16/folder-library.svg b/icons/places/16/folder-library.svg
+new file mode 120000
+index 00000000..1ce765df
+--- /dev/null
++++ b/icons/places/16/folder-library.svg
+@@ -0,0 +1 @@
++../../actions/16/view-institution.svg
+\ No newline at end of file
+diff --git a/icons/places/22/folder-book.svg b/icons/places/22/folder-book.svg
+deleted file mode 100644
+index d124463e..00000000
+--- a/icons/places/22/folder-book.svg
++++ /dev/null
+@@ -1,14 +0,0 @@
+-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+-  <defs id="defs3051">
+-    <style type="text/css" id="current-color-scheme">
+-      .ColorScheme-Text {
+-        color:#232629;
+-      }
+-      </style>
+-  </defs>
+- <path 
+-     style="fill:currentColor;fill-opacity:1;stroke:none" 
+-     d="m5 3v1 1h-2v3h2v6h-2v3h2v2h1 13v-1-14-1h-14m1 1h2v14h-2v-14m3 0h9v14h-9v-14"
+-	 class="ColorScheme-Text"
+-     />
+-</svg>
+diff --git a/icons/places/22/folder-book.svg b/icons/places/22/folder-book.svg
+new file mode 120000
+index 00000000..69db4d57
+--- /dev/null
++++ b/icons/places/22/folder-book.svg
+@@ -0,0 +1 @@
++../../actions/22/address-book-new.svg
+\ No newline at end of file
+diff --git a/icons/places/22/folder-comic.svg b/icons/places/22/folder-comic.svg
+deleted file mode 100644
+index 75c26bc4..00000000
+--- a/icons/places/22/folder-comic.svg
++++ /dev/null
+@@ -1,14 +0,0 @@
+-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+-  <defs id="defs3051">
+-    <style type="text/css" id="current-color-scheme">
+-      .ColorScheme-Text {
+-        color:#232629;
+-      }
+-      </style>
+-  </defs>
+- <path 
+-     style="fill:currentColor;fill-opacity:1;stroke:none" 
+-     d="M 7 4 L 7 7 L 3 7 L 3 15 L 6 18 L 6 15 L 15 15 L 15 12 L 16 12 L 16 15 L 19 12 L 19 4 L 7 4 z M 8 5 L 18 5 L 18 11 L 15 11 L 14 11 L 8 11 L 8 8 L 8 7 L 8 5 z M 4 8 L 7 8 L 7 12 L 14 12 L 14 14 L 4 14 L 4 8 z "
+-     class="ColorScheme-Text"
+-     />
+-</svg>
+diff --git a/icons/places/22/folder-comic.svg b/icons/places/22/folder-comic.svg
+new file mode 120000
+index 00000000..097a5a84
+--- /dev/null
++++ b/icons/places/22/folder-comic.svg
+@@ -0,0 +1 @@
++../../actions/22/kmouth-phrasebook.svg
+\ No newline at end of file
+diff --git a/icons/places/22/folder-library.svg b/icons/places/22/folder-library.svg
+deleted file mode 100644
+index d62c7ddf..00000000
+--- a/icons/places/22/folder-library.svg
++++ /dev/null
+@@ -1,14 +0,0 @@
+-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+-  <defs id="defs3051">
+-    <style type="text/css" id="current-color-scheme">
+-      .ColorScheme-Text {
+-        color:#232629;
+-      }
+-      </style>
+-  </defs>
+- <path 
+-    style="fill:currentColor;fill-opacity:1;stroke:none" 
+-    d="M 11 3 L 3 7.6230469 L 3 7.9980469 L 3 9 L 4 9 L 4 10 L 4 18 L 3 18 L 3 19 L 19 19 L 19 18 L 18 18 L 18 10 L 18 9 L 19 9 L 19 7.9980469 L 19 7.6230469 L 11 3 z M 11 4.15625 L 17.650391 7.9980469 L 4.3496094 7.9980469 L 11 4.15625 z M 5 9 L 7 9 L 7 10 L 7 18 L 5 18 L 5 10 L 5 9 z M 8 9 L 14 9 L 14 10 L 14 18 L 13 18 L 13 14 L 9 14 L 9 18 L 8 18 L 8 10 L 8 9 z M 15 9 L 17 9 L 17 10 L 17 18 L 15 18 L 15 10 L 15 9 z "
+-	class="ColorScheme-Text"
+-    />  
+-</svg>
+diff --git a/icons/places/22/folder-library.svg b/icons/places/22/folder-library.svg
+new file mode 120000
+index 00000000..d95f23aa
+--- /dev/null
++++ b/icons/places/22/folder-library.svg
+@@ -0,0 +1 @@
++../../actions/22/view-institution.svg
+\ No newline at end of file
+-- 
+GitLab
+
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index ad84906b5020..b6b4bc64535e 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,5 +1,6 @@
+AUX breeze-icons-5.90.0-fix-dupe-tests.patch 7297 BLAKE2B c2f92475bff51b9aec09578cf7ca04c63c048d9b6e600d55d190174d2ce4fd175badcbe19839ea6e6bbd04c5030c34c10bbb1756e1d1de5c684f9a8a67fdf97f SHA512 efaee2462e810d355a5a20a768506fe4ef3d8b36abe9778ba563f4526ed73f008c0b27325ffe150ff219301bbef17b0ed7cf30f6a54b50bc80bf4fb6297bb4a3
 DIST breeze-icons-5.88.0.tar.xz 2128308 BLAKE2B e96b04d524d99227ee09935c63ed8362b0a75a88e89835afc8537d03e360c202957392eee329397c0c502a47140d975ac2bde79738b911fd0600c6d2a3a079ab SHA512 e66ee04a2e073fe954e97dfd377581715313a041d62740eda7c4b599fd6785ca241f58508afafcb2fb3a8803df72f5e451a213dff7329f6beca87197e8e1f00d
 DIST breeze-icons-5.90.0.tar.xz 2145144 BLAKE2B af9c5b771d164441fee38bdb82c86909391abf0e3b91db203bbc2775c75e88abc8d1d1762e71ae07a9374391d280fe737ffb34f49c02932eb4a3620dcdacbdc4 SHA512 17279b11fa221a81c488f832826b28a02343b74e4d0ff486503b79aca399c25a1ce0f7c905a2f4b35e47fe86ed7dbb93442daba452676e117773e47031697280
 EBUILD breeze-icons-5.88.0.ebuild 1117 BLAKE2B 44177793428397a14ad50b7773ee87eff50273a4510efe605d2dbc707a360b3c2cc15d721455ee883b65ca5de35898b91c0ec3f4c9525ae794aab3df99f01d77 SHA512 c04e87bf3eed2efda2956ae4c55ccabd271e23d23eb2a75fd39d81bfe83b64c42b4fb0bae7abd57abe41785f87668d6e5aa6a26a533f054ab2a302d03da91c99
-EBUILD breeze-icons-5.90.0.ebuild 1120 BLAKE2B 5358e9e8c7a8bea406ac478b7ef2e1251323494e5605446474a5ed68a8a7113d776b102c50653d0f7a0eb61c81d80887fb79622a42917c9f3a42d4a6dd43fdb5 SHA512 e275eaeb54aafa2ddece39e07e4fad45037b9815105ab1e2522788c56d0a82bfe566a9fa58063bd2cb452aa69c17de4f1e8e4a2b1f1117cc56e7dca346c4d960
+EBUILD breeze-icons-5.90.0.ebuild 1173 BLAKE2B 4295fb7e5f469bacabbc6b371dbbd048ed198a1a5d700409f631cd7cf31d2b92e0c3a57dbde2b70c80885a9887687230ec862ec98a62910c349c452afbae3094 SHA512 1a39bb31fe8199a4e1faeeebeb6a0b5bc8ee6724afd3c53ec181806152e6a9c6ae8ad736802c96ce3422b4f0a06f62f3a845f23c70f4cd9a39ea88c6c25f2dc8
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.90.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.90.0.ebuild
index 152a388fe1ee..9ff7256479ab 100644
--- a/kde-frameworks/breeze-icons/breeze-icons-5.90.0.ebuild
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.90.0.ebuild
@@ -23,6 +23,8 @@ BDEPEND="${PYTHON_DEPS}
 	test? ( app-misc/fdupes )
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-dupe-tests.patch" )
+
 python_check_deps() {
 	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
 }
diff --git a/kde-frameworks/breeze-icons/files/breeze-icons-5.90.0-fix-dupe-tests.patch b/kde-frameworks/breeze-icons/files/breeze-icons-5.90.0-fix-dupe-tests.patch
new file mode 100644
index 000000000000..af066fda766b
--- /dev/null
+++ b/kde-frameworks/breeze-icons/files/breeze-icons-5.90.0-fix-dupe-tests.patch
@@ -0,0 +1,193 @@
+From eb684892d7528cf4790cbcaf65b2fe1abda5e114 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Tue, 4 Jan 2022 22:43:49 +0100
+Subject: [PATCH] Fix dupe tests by replacing icons with symlinks
+
+[1] introduced new icons which are apparently duplicates of already
+existing icons and made the dupe test fail.
+
+[1] 9073eb1f7c34045930ac375e288827c29c0553fc
+---
+ icons/places/16/folder-book.svg    | 14 +-------------
+ icons/places/16/folder-comic.svg   | 14 +-------------
+ icons/places/16/folder-library.svg | 15 +--------------
+ icons/places/22/folder-book.svg    | 15 +--------------
+ icons/places/22/folder-comic.svg   | 15 +--------------
+ icons/places/22/folder-library.svg | 15 +--------------
+ 6 files changed, 6 insertions(+), 82 deletions(-)
+ mode change 100644 => 120000 icons/places/16/folder-book.svg
+ mode change 100644 => 120000 icons/places/16/folder-comic.svg
+ mode change 100644 => 120000 icons/places/16/folder-library.svg
+ mode change 100644 => 120000 icons/places/22/folder-book.svg
+ mode change 100644 => 120000 icons/places/22/folder-comic.svg
+ mode change 100644 => 120000 icons/places/22/folder-library.svg
+
+diff --git a/icons/places/16/folder-book.svg b/icons/places/16/folder-book.svg
+deleted file mode 100644
+index eff7ce86..00000000
+--- a/icons/places/16/folder-book.svg
++++ /dev/null
+@@ -1,13 +0,0 @@
+-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+-  <defs id="defs3051">
+-    <style type="text/css" id="current-color-scheme">
+-      .ColorScheme-Text {
+-        color:#232629;
+-      }
+-      </style>
+-  </defs>
+- <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+-       d="M 3 2 L 3 3 L 3 4 L 2 4 L 2 6 L 3 6 L 3 10 L 2 10 L 2 12 L 3 12 L 3 13.5 L 3 14 L 14 14 L 14 13 L 14 3 L 14 2 L 3 2 z M 4 3 L 5 3 L 5 13 L 4 13 L 4 3 z M 6 3 L 13 3 L 13 13 L 6 13 L 6 3 z "
+-     class="ColorScheme-Text"
+-     />
+-</svg>
+diff --git a/icons/places/16/folder-book.svg b/icons/places/16/folder-book.svg
+new file mode 120000
+index 00000000..328a27f3
+--- /dev/null
++++ b/icons/places/16/folder-book.svg
+@@ -0,0 +1 @@
++../../actions/16/address-book-new.svg
+\ No newline at end of file
+diff --git a/icons/places/16/folder-comic.svg b/icons/places/16/folder-comic.svg
+deleted file mode 100644
+index e2f5c9f3..00000000
+--- a/icons/places/16/folder-comic.svg
++++ /dev/null
+@@ -1,13 +0,0 @@
+-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+-  <defs id="defs3051">
+-    <style type="text/css" id="current-color-scheme">
+-      .ColorScheme-Text {
+-        color:#232629;
+-      }
+-      </style>
+-  </defs>
+- <path style="fill:currentColor;fill-opacity:1;stroke:none" 
+-     d="M 5 2 L 5 5 L 2 5 L 2 11 L 5 14 L 5 11 L 10 11 L 10 8 L 11 8 L 11 11 L 14 8 L 14 2 L 5 2 z M 6 3 L 13 3 L 13 7 L 6 7 L 6 3 z M 3 6 L 5 6 L 5 8 L 9 8 L 9 10 L 3 10 L 3 6 z "
+-     class="ColorScheme-Text"
+-     />
+-</svg>
+diff --git a/icons/places/16/folder-comic.svg b/icons/places/16/folder-comic.svg
+new file mode 120000
+index 00000000..0725f950
+--- /dev/null
++++ b/icons/places/16/folder-comic.svg
+@@ -0,0 +1 @@
++../../actions/16/kmouth-phrasebook.svg
+\ No newline at end of file
+diff --git a/icons/places/16/folder-library.svg b/icons/places/16/folder-library.svg
+deleted file mode 100644
+index d78dee94..00000000
+--- a/icons/places/16/folder-library.svg
++++ /dev/null
+@@ -1,14 +0,0 @@
+-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+-  <defs id="defs3051">
+-    <style type="text/css" id="current-color-scheme">
+-      .ColorScheme-Text {
+-        color:#232629;
+-      }
+-      </style>
+-  </defs>
+-<path
+-    d="m8 2.0039062-6 3.8984376v1.0976562h1v6h-1v1h12v-1h-1v-6h1v-1.0976562zm0 1.1933594 4.310547 2.8027344h-8.6210939zm-4 3.8027344h1v6h-1zm2 0h4v6h-1v-2h-2v2h-1zm5 0h1v6h-1z"
+-    style="fill:currentColor;fill-opacity:1;stroke:none"
+-    class="ColorScheme-Text"
+-    />
+-</svg>
+diff --git a/icons/places/16/folder-library.svg b/icons/places/16/folder-library.svg
+new file mode 120000
+index 00000000..1ce765df
+--- /dev/null
++++ b/icons/places/16/folder-library.svg
+@@ -0,0 +1 @@
++../../actions/16/view-institution.svg
+\ No newline at end of file
+diff --git a/icons/places/22/folder-book.svg b/icons/places/22/folder-book.svg
+deleted file mode 100644
+index d124463e..00000000
+--- a/icons/places/22/folder-book.svg
++++ /dev/null
+@@ -1,14 +0,0 @@
+-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+-  <defs id="defs3051">
+-    <style type="text/css" id="current-color-scheme">
+-      .ColorScheme-Text {
+-        color:#232629;
+-      }
+-      </style>
+-  </defs>
+- <path 
+-     style="fill:currentColor;fill-opacity:1;stroke:none" 
+-     d="m5 3v1 1h-2v3h2v6h-2v3h2v2h1 13v-1-14-1h-14m1 1h2v14h-2v-14m3 0h9v14h-9v-14"
+-	 class="ColorScheme-Text"
+-     />
+-</svg>
+diff --git a/icons/places/22/folder-book.svg b/icons/places/22/folder-book.svg
+new file mode 120000
+index 00000000..69db4d57
+--- /dev/null
++++ b/icons/places/22/folder-book.svg
+@@ -0,0 +1 @@
++../../actions/22/address-book-new.svg
+\ No newline at end of file
+diff --git a/icons/places/22/folder-comic.svg b/icons/places/22/folder-comic.svg
+deleted file mode 100644
+index 75c26bc4..00000000
+--- a/icons/places/22/folder-comic.svg
++++ /dev/null
+@@ -1,14 +0,0 @@
+-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+-  <defs id="defs3051">
+-    <style type="text/css" id="current-color-scheme">
+-      .ColorScheme-Text {
+-        color:#232629;
+-      }
+-      </style>
+-  </defs>
+- <path 
+-     style="fill:currentColor;fill-opacity:1;stroke:none" 
+-     d="M 7 4 L 7 7 L 3 7 L 3 15 L 6 18 L 6 15 L 15 15 L 15 12 L 16 12 L 16 15 L 19 12 L 19 4 L 7 4 z M 8 5 L 18 5 L 18 11 L 15 11 L 14 11 L 8 11 L 8 8 L 8 7 L 8 5 z M 4 8 L 7 8 L 7 12 L 14 12 L 14 14 L 4 14 L 4 8 z "
+-     class="ColorScheme-Text"
+-     />
+-</svg>
+diff --git a/icons/places/22/folder-comic.svg b/icons/places/22/folder-comic.svg
+new file mode 120000
+index 00000000..097a5a84
+--- /dev/null
++++ b/icons/places/22/folder-comic.svg
+@@ -0,0 +1 @@
++../../actions/22/kmouth-phrasebook.svg
+\ No newline at end of file
+diff --git a/icons/places/22/folder-library.svg b/icons/places/22/folder-library.svg
+deleted file mode 100644
+index d62c7ddf..00000000
+--- a/icons/places/22/folder-library.svg
++++ /dev/null
+@@ -1,14 +0,0 @@
+-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
+-  <defs id="defs3051">
+-    <style type="text/css" id="current-color-scheme">
+-      .ColorScheme-Text {
+-        color:#232629;
+-      }
+-      </style>
+-  </defs>
+- <path 
+-    style="fill:currentColor;fill-opacity:1;stroke:none" 
+-    d="M 11 3 L 3 7.6230469 L 3 7.9980469 L 3 9 L 4 9 L 4 10 L 4 18 L 3 18 L 3 19 L 19 19 L 19 18 L 18 18 L 18 10 L 18 9 L 19 9 L 19 7.9980469 L 19 7.6230469 L 11 3 z M 11 4.15625 L 17.650391 7.9980469 L 4.3496094 7.9980469 L 11 4.15625 z M 5 9 L 7 9 L 7 10 L 7 18 L 5 18 L 5 10 L 5 9 z M 8 9 L 14 9 L 14 10 L 14 18 L 13 18 L 13 14 L 9 14 L 9 18 L 8 18 L 8 10 L 8 9 z M 15 9 L 17 9 L 17 10 L 17 18 L 15 18 L 15 10 L 15 9 z "
+-	class="ColorScheme-Text"
+-    />  
+-</svg>
+diff --git a/icons/places/22/folder-library.svg b/icons/places/22/folder-library.svg
+new file mode 120000
+index 00000000..d95f23aa
+--- /dev/null
++++ b/icons/places/22/folder-library.svg
+@@ -0,0 +1 @@
++../../actions/22/view-institution.svg
+\ No newline at end of file
+-- 
+GitLab
+
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 97b0cd6d8f0c..4fd612a8c555 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,7 +1,7 @@
 AUX kconfigwidgets-5.88.0-KCommandBar-alignment.patch 19750 BLAKE2B f4d2cfeb271238067217b0b45a990c5decd766dd225c9c88ea0976b699c96c2cacb2cde8c336be297902234a22c77d12f3e80cb32f82de3a1a5b3fe0c30809f0 SHA512 40875e9f7b6eeedd5ddfdebade4faca2b8f9a86485a656ef83b3e65b925233c97af3daafa0f41d042451a98a198523117cf5cc10f4c2ec8e209be7ea4734a4ad
 AUX kconfigwidgets-5.88.0-hamburger-menu-no-window-on-wayland.patch 3542 BLAKE2B 87448642741508dc6d259500a6539f83f270a9ad473146e76f527d22843149245b296ccaac67bed0b1566b45f97e2e6f77fc19ed8c7698101daf81d7d7fa988a SHA512 6aabfbe4923882d8d3dbd2271120a2a748f8299f4a9ff3a413ff107442319c698f47adc248b548f2fb33ee61313365d346154175e5edab481fb19f5891c92d94
 DIST kconfigwidgets-5.88.0.tar.xz 412648 BLAKE2B 45b08f839fea13f848a8c6f0990b0da1fad44c27659d18102fcba9ec407fed7588cafc20d401f9b0253fb26baba484bb901b5ffe310f2e8ad4b666673773968d SHA512 cbc4af1f19509325528cef138746b081552547bbbd5c741dada8d9b58e6d510eb3611867335d94b892d42fa1eb771f0ab4b93c56014cede65bf6769cf10b5a3e
-DIST kconfigwidgets-5.90.0.tar.xz 414220 BLAKE2B 7e5e5eff81251807966a79a04a1c2f48ba1a2a6fade3fcd7f7395e4a2f9f0322a7f5d2e6c25887a4990fba428a44572eca8a284619f4c1641cc1fab4513510d7 SHA512 5edfaf50f7ad665d75b548ae95aab63c6b5fe6baf084ef5ff9f75ce0fed75503b6b133c846309274e8e93112686efa7d4a5eef30d50cdad4a57d9e3c142a3bee
+DIST kconfigwidgets-5.90.1.tar.xz 414176 BLAKE2B 3e6bdcefd2dc0b275b2c8d7e6d314e98fb3f2911fc60e4445b6a07adb52240b247927cb869a27695f2c43d0304e545a534de809518a84b2f53c34cce9fa73ed0 SHA512 51e1f388a4d6c41f538b7adc01b0fd87242b483f10c425f8ff0e4920e82cded5b9c921ec0e1ad858cdb905bd3fdc32befd5e17424702c7861ec2c9fbf517a208
 EBUILD kconfigwidgets-5.88.0-r1.ebuild 1125 BLAKE2B 2152f35149beb1f0ddf579a33eb0db4de132d71cb8b46f39fb02ef2f2b3613b4a7c20d92d92b54d7f3b37567a778e76e078dbd70862b5fa59fef550428d55626 SHA512 753778fa41c1fae49735400ae42d3371571da782f06f99d626a9a3199159523479cfdabe6ab2fa3573e889f3b582e774a7eb2e4501aca5110708a622d2504f87
-EBUILD kconfigwidgets-5.90.0.ebuild 1005 BLAKE2B 433269c97c4b813fef3cc54ca7cb49d257224cb82d9c1330527f7928fafeeca4d917fee99672703046c28789983738e455045ed6505faa0e1a006813c25d23e4 SHA512 d9cc5388fc6bc2b5cf81bcd7072e04aa6a76a51a842ddb84309919ebb65740a66bc788ef89b2489f9280f66ac8fbe253dbba2ed0ae7668fd60f1ce6875a2b369
+EBUILD kconfigwidgets-5.90.1.ebuild 1005 BLAKE2B 433269c97c4b813fef3cc54ca7cb49d257224cb82d9c1330527f7928fafeeca4d917fee99672703046c28789983738e455045ed6505faa0e1a006813c25d23e4 SHA512 d9cc5388fc6bc2b5cf81bcd7072e04aa6a76a51a842ddb84309919ebb65740a66bc788ef89b2489f9280f66ac8fbe253dbba2ed0ae7668fd60f1ce6875a2b369
 MISC metadata.xml 547 BLAKE2B 127ee4110b748cd3e3c26b63248d35f78b233b00cf4466ccc0145a613062a5aa9cc2e9ebd91d0e7482c67f6e265938176b169a9c52eda30bfcddf02549ec8f06 SHA512 2d36585b1af6205dc1bfcff7c3cb24c85376716159317b5c105c866143d49e89e91e501c9a4cf2d63265c30a09e8df71bca841319bd3f2b551e79fde90b1d96e
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.90.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.90.1.ebuild
index cbcdf38eef25..cbcdf38eef25 100644
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.90.0.ebuild
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.90.1.ebuild
diff --git a/kde-frameworks/kholidays/Manifest b/kde-frameworks/kholidays/Manifest
index d34f4785c090..52cbda900987 100644
--- a/kde-frameworks/kholidays/Manifest
+++ b/kde-frameworks/kholidays/Manifest
@@ -1,5 +1,6 @@
+AUX kholidays-5.90.0-UK-2022-spring-bank-holiday.patch 4481 BLAKE2B d7f7e5f129e2e0c3fc0c13817f7fb5b1af757170654016c34607c584fb68bffee2f898235648d91c0b47fbd3798af0165a362db1a959169544e0b223170a751a SHA512 38869eef2cf8fdd615200e8129099923125ef07c56615316f67a4b8fc683f1ce9719d22d1860c5e61f67e0064f131c15e3d56b7513a3a6c1c8932c730f67a351
 DIST kholidays-5.88.0.tar.xz 232400 BLAKE2B 5d72a0d86c91f1061e4c01b9df6f53abbc0837577df9ac3d53a171225eca3b9a714fdfd44e0afacca99f2f85ef67dff9e99099d05875f1f42e6be1ed3d9d3884 SHA512 364bee9a2798cc47e26c359d31fcca4d7fcffb4e85baeadacfbfb62d199b7ca9a1e177d7f1e853e669888c8ddf83512fde5794c30a64abc3b9f897068bce982a
 DIST kholidays-5.90.0.tar.xz 234532 BLAKE2B 90f197d1cf98b0012209507fae6af315b57a8721b1c4edc37b7a49559e3b6c1b2ab4f6f7f4b5b78499aca65a66355e86976206449dbbb71966ed4b388c13ee49 SHA512 0517275260f31f8f97ba1e31d9d76007702d9baecc9ba2a4336ea28d74690b84be63f5548644e53f59eafd4f1dbcd61a76bc50f24960de0794a8db4f8e99ed91
 EBUILD kholidays-5.88.0.ebuild 656 BLAKE2B 08e36dbbb3fe25bc15dd19f619506ab8fff0da2e9630961e8d5f7b8fcc862b50ad6cb8b59d0eb2415fd811c05b172e92339a522438cf470ebe958e1805c77b14 SHA512 8a59b08492c61e09bd79c8c79d2712374114532d0dd2c27faf5dfdda7b6bb13edca66382967620e785d30c2a1c5c75582b13d1e2ab50765d5950e72dc18f9ebb
-EBUILD kholidays-5.90.0.ebuild 659 BLAKE2B 7610b973f9e73e1786dda9108b9e3b203ea69d368ee381e7e76647e8c333faefed5d87f36438fa381819461012cff0a7dfb69303b7f5aca42cb63d449872720f SHA512 534c02b5d4a7d95f91c367f1ba087820367111c07b58783cd94bbf2f49ce9859104b675ae55e19fe724da759216bddcada78799f0e2293f8b7b186b371c664b4
+EBUILD kholidays-5.90.0-r1.ebuild 725 BLAKE2B 01f0d0afeeaf0b3589ff3f0df0c6018b807d2ae8f352cd4b91b1e9da19fb904a7f089db15e2d25d4b5c021ba1568f0dec5dc57bb1b28523edab9954e00017a2f SHA512 d292e9a0a0d3f39a17a50bf6ff9a05a538a3020de9e3621e1a43b1685c3119db18df6dbec1625b32b4b674c993882aef41c682e4fbc888450d92dc95a83fb137
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kholidays/files/kholidays-5.90.0-UK-2022-spring-bank-holiday.patch b/kde-frameworks/kholidays/files/kholidays-5.90.0-UK-2022-spring-bank-holiday.patch
new file mode 100644
index 000000000000..15d630269b40
--- /dev/null
+++ b/kde-frameworks/kholidays/files/kholidays-5.90.0-UK-2022-spring-bank-holiday.patch
@@ -0,0 +1,75 @@
+From f46efdf93ebf02b5e7ac0ac0b11aefbd42ec71b2 Mon Sep 17 00:00:00 2001
+From: Allen Winter <winter@kde.org>
+Date: Sat, 15 Jan 2022 09:54:39 -0500
+Subject: [PATCH] UK holiday change 2022 (Spring bank holiday)
+
+applied to all 3 legal regions
+
+BUG: 448305
+FIXED-IN: 5.91
+---
+ holidays/plan2/holiday_gb-eaw_en-gb | 5 ++++-
+ holidays/plan2/holiday_gb-nir_en-gb | 5 ++++-
+ holidays/plan2/holiday_gb-sct_en-gb | 5 ++++-
+ 3 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/holidays/plan2/holiday_gb-eaw_en-gb b/holidays/plan2/holiday_gb-eaw_en-gb
+index 64bdee7..4235247 100644
+--- a/holidays/plan2/holiday_gb-eaw_en-gb
++++ b/holidays/plan2/holiday_gb-eaw_en-gb
+@@ -27,8 +27,11 @@ description "National holiday file for England and Wales"
+ "Easter Monday"                 public on easter plus 1
+ "Royal Wedding"                 public on 29.4.2011
+ "Early May Bank Holiday"        public on ((year == 2020) ? [may 8] : [first monday in may])
+-"Spring Bank Holiday"           public on ((year == 2012) ? [june 4] : [last monday in may])
++"Spring Bank Holiday"           public on ((year == 2012) ? [june 4] :
++                                           ((year == 2022) ? [june 2] :
++                                            [last monday in may]))
+ "Diamond Jubilee Holiday"       public on 5.6.2012
++"Platinum Jubilee Holiday"      public on 3.6.2022
+ "Summer Bank Holiday"           public on last monday in august
+ "Christmas Day"                 public religious on december 25
+ "Christmas Day Bank Holiday"    public on ( (([december 25] == [saturday after ([december 25])]) || ([december 25] == [sunday after ([december 25])])) ?
+diff --git a/holidays/plan2/holiday_gb-nir_en-gb b/holidays/plan2/holiday_gb-nir_en-gb
+index 677f290..85c2de6 100644
+--- a/holidays/plan2/holiday_gb-nir_en-gb
++++ b/holidays/plan2/holiday_gb-nir_en-gb
+@@ -33,8 +33,11 @@ description "National holiday file for Northern Ireland"
+ "Easter Monday"                             public on easter plus 1
+ "Royal Wedding"                             public on 29.4.2011
+ "Early May Bank Holiday"                    public on ((year == 2020) ? [may 8] : [first monday in may])
+-"Spring Bank Holiday"                       public on ((year == 2012) ? [june 4] : [last monday in may])
++"Spring Bank Holiday"                       public on ((year == 2012) ? [june 4] :
++                                                       ((year == 2022) ? [june 2] :
++                                                         [last monday in may]))
+ "Diamond Jubilee Holiday"                   public on 5.6.2012
++"Platinum Jubilee Holiday"                  public on 3.6.2022
+ "Battle of the Boyne (Orangemen's Day)"     public on july 12
+ "Battle of the Boyne Bank Holiday"          public on ( (([july 12] == [saturday after ([july 12])]) ||
+                                                           ([july 12] == [sunday after ([july 12])])) ?
+diff --git a/holidays/plan2/holiday_gb-sct_en-gb b/holidays/plan2/holiday_gb-sct_en-gb
+index 57d90d6..938d639 100644
+--- a/holidays/plan2/holiday_gb-sct_en-gb
++++ b/holidays/plan2/holiday_gb-sct_en-gb
+@@ -43,6 +43,7 @@ description "National holiday file for Scotland"
+ "Royal Wedding"                     public on 29.4.2011
+ "Early May Bank Holiday"            public on ((year == 2020) ? [may 8] : [first monday in may])
+ "Diamond Jubilee Holiday"           public on 5.6.2012
++"Platinum Jubilee Holiday"          public on 3.6.2022
+ "Christmas Day"                     public religious on december 25
+ "Christmas Day Substitute Holiday"  public on ( (([december 25] == [saturday after ([december 25])]) ||
+                                                   ([december 25] == [sunday after ([december 25])])) ?
+@@ -60,7 +61,9 @@ description "National holiday file for Scotland"
+ 
+ :: Financial
+ "Good Friday Bank Holiday"          religious on easter minus 2
+-"Spring Bank Holiday"               civil on ((year == 2012) ? [june 4] : [last monday in may])
++"Spring Bank Holiday"               civil on ((year == 2012) ? [june 4] :
++                                              ((year == 2022) ? [june 2] :
++                                               [last monday in may]))
+ "Summer Bank Holiday"               civil on first monday in august
+ "St Andrew's Day Bank Holiday"      civil on ( (([november 30] == [saturday after ([november 30])]) ||
+                                                 ([november 30] == [sunday after ([november 30])])) ?
+-- 
+GitLab
+
diff --git a/kde-frameworks/kholidays/kholidays-5.90.0.ebuild b/kde-frameworks/kholidays/kholidays-5.90.0-r1.ebuild
index e5ccb350b590..b18414e9a211 100644
--- a/kde-frameworks/kholidays/kholidays-5.90.0.ebuild
+++ b/kde-frameworks/kholidays/kholidays-5.90.0-r1.ebuild
@@ -21,6 +21,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-UK-2022-spring-bank-holiday.patch" )
+
 src_test() {
 	# bug 624214
 	mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 3d3b6fbc0d0a..e00b5c46b27c 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,5 +1,6 @@
+AUX khtml-5.90.0-fix-crash-in-wayland.patch 1249 BLAKE2B 0b66fd470e0da8b52c88866d817f306cad197694e458b2a015ad5ced133c51e8f72b936be14e05cb663b4e830dd23f315e0aa49d855ea13d9a1f2a866d493e90 SHA512 11281fff2de04a5c177e161bb16994a769601cf6c35360e0049fab1c19325539eb00ce8f7538285c59120b22908d4d95c26d4c23da5c3801380be238eff86f1c
 DIST khtml-5.88.0.tar.xz 2093664 BLAKE2B 85379c7d3fffed82794c33977f8d1ebaf2670158ea52feff72db694a47a5a5223d2d91850e5ccf21cb4f495c6bd4c884aae65b65f5ba2ce3962ce9b7dc410258 SHA512 7fa39361e2353b5abdd7c92ddc91c0e9a8216a756d6976ae57249649d9fad97957793ca446a5668a7d0f44031eae3ed38c35d6331f07d1286af18f3346bc4a87
 DIST khtml-5.90.0.tar.xz 2093520 BLAKE2B dbab7070371c4b426ea5027b69cc928f76b7c52a40c4373c576f568dbf69752914793445cc51b8f73c46fe625c39f9e283cd17551bb72b3266acc6cc552d3b02 SHA512 0292a7497c51a576ae9603cfa3bf49031d9bd2a5ee493be08935bcedf67d75d9a41b06d0a0829e1f08391aafb60c7145859e596885dbd3d40017d1181ee2969d
 EBUILD khtml-5.88.0.ebuild 1760 BLAKE2B 74d67c320828dfb8cee26876498486587ed14cf7d80115f7abc701ba213113a3f27fd40ad3240832b983c824c918a70f40362938ad34a0bd4b36ef0fc8d55039 SHA512 23806a9491e03c1c6710536275412bb06dbf9318370cef5ab718f4263d36d04ea7674d7451e86723a6875c4c9b9545e484f73329dfaa9ed57a713a718763d861
-EBUILD khtml-5.90.0.ebuild 1763 BLAKE2B 7e1b7d59c06d7a451ecd45ead7b7c54e8f2d8c44c2d3e2462adfb2273362dff954438694b876efbbc559f7168850a43f2780b3c942480c101fd45a3c9d89e193 SHA512 20af814de1fd75955b3d3d9041a3b2c8a2983b5d1d4eaca1ccc0811fb9d68716f935a063ae01834f842e0d39c2ab9b08f8dfd8908e0e0bf8ad592a106ea31793
+EBUILD khtml-5.90.0-r1.ebuild 1822 BLAKE2B f832f97b25ed48cdcae64688a626ff701d21c306ba94449358d6df38cc66c13e0576a2b8779d7b3d3cb9d8a230d0a62570644906b6cf57d6c9d748fff8bb94c9 SHA512 ed236d034a842873d3357f6a30b7d46e6552f0b5b131631f414ad56fad355a6c19e9ca1588282c26b0f4170ce91c410ff453a289496b062fe6948b120f4f2135
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/khtml/files/khtml-5.90.0-fix-crash-in-wayland.patch b/kde-frameworks/khtml/files/khtml-5.90.0-fix-crash-in-wayland.patch
new file mode 100644
index 000000000000..c6ed34998037
--- /dev/null
+++ b/kde-frameworks/khtml/files/khtml-5.90.0-fix-crash-in-wayland.patch
@@ -0,0 +1,42 @@
+From 04aa1739d06d3ff7d16a3296fd27fa392d8ba318 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Sat, 1 Jan 2022 23:42:16 +0100
+Subject: [PATCH] fix khtml crash in wayland session
+
+---
+ src/khtmlview.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/khtmlview.cpp b/src/khtmlview.cpp
+index 79f0d7c..75df959 100644
+--- a/src/khtmlview.cpp
++++ b/src/khtmlview.cpp
+@@ -69,6 +69,7 @@
+ #include <kstringhandler.h>
+ #include <kconfiggroup.h>
+ #include <ksharedconfig.h>
++#include <KWindowSystem>
+ 
+ #include <QBitmap>
+ #include <QDialog>
+@@ -1530,7 +1531,8 @@ void KHTMLView::mouseMoveEvent(QMouseEvent *_mouse)
+ 
+     if (linkCursor != LINK_NORMAL && isVisible() && hasFocus()) {
+ #if HAVE_X11
+-
++    // ensure we don't trigger this code paths if we run in a Wayland session
++    if (KWindowSystem::isPlatformX11()) {
+         if (!d->cursorIconWidget) {
+ #if HAVE_X11
+             d->cursorIconWidget = new QLabel(nullptr, Qt::X11BypassWindowManagerHint);
+@@ -1572,6 +1574,7 @@ void KHTMLView::mouseMoveEvent(QMouseEvent *_mouse)
+         //TODO?
+ #endif
+         d->cursorIconWidget->show();
++      }
+ #endif
+     } else if (d->cursorIconWidget) {
+         d->cursorIconWidget->hide();
+-- 
+GitLab
+
diff --git a/kde-frameworks/khtml/khtml-5.90.0.ebuild b/kde-frameworks/khtml/khtml-5.90.0-r1.ebuild
index 91278423475f..050f9c3112c9 100644
--- a/kde-frameworks/khtml/khtml-5.90.0.ebuild
+++ b/kde-frameworks/khtml/khtml-5.90.0-r1.ebuild
@@ -62,6 +62,8 @@ DEPEND="${RDEPEND}
 	X? ( x11-base/xorg-proto )
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-crash-in-wayland.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package X X11)
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index a645b116827d..40345d7e9aad 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,6 +1,10 @@
 AUX ktexteditor-5.88.0-revert-invoke-always.patch 1534 BLAKE2B 836612b2e41a73a7099e4bb775427854901b999f471d02eb2f19ca1e516eaa6f5f35799cd9d038a1a2ac8f7b9e7d6160cd4d42776d471fe49291d2c761ca320f SHA512 41d99f771817daceff02a9589c78d4af6987e819437bbd923ccc8108baf89f40e5fdfc0512bba0a816a778710e41626391ea53087a162f591baef8715e689a84
+AUX ktexteditor-5.90.0-CVE-2022-23853-1.patch 4837 BLAKE2B e5e33538c06f2a8b6e1aa319357f17889ecf58273d6c64c2eca146c9d6dc85d635a0d45177c55cf33f726ed32b3a4ea831277e74d84ac3dab1f23582e991e4cd SHA512 58c0074049e9218cf03d8adfbb60fe57c3d331e1d10c53c289f1288ba078185aff9bcbdb0946d421e01378642b40474649bb589b79b098f3c6929ba92b418ca0
+AUX ktexteditor-5.90.0-CVE-2022-23853-2.patch 2513 BLAKE2B de206fc9fb6e9996b544d74b86614849fb75b44420fedef86a81f325f5137a4adffbb34eebec21f275945ee94835b5bed4921179c4ca515c781ba6b1cfa2d5fe SHA512 9186b4ce88dc4eec04cf4367e04c089c72edc26074dcbea7c7c8755b29ffbb6c33c98c22ad16d763b04320caa0a60eca900e050b98fb3c9cca41517d9a42765d
+AUX ktexteditor-5.90.0-KDEBUG-447972.patch 891 BLAKE2B 460bcc4e9469a0ab8712e0ee7b1dc3b8e4e6b042a595014f7e24ce950455c1adda1463ca8fabedd20e255eb59a663d0cda0f84af65993b80ab58e47ef0a8531a SHA512 81cbfdc26b3e04380f6a2ffe7821a7ce7177df05773af5973c1eab84a42076ed027e911ec3552029a9450564cf35a2850b8c4f2708b1bff68995e9cf87353886
+AUX ktexteditor-5.90.0-revert-5dce70a9.patch 4113 BLAKE2B 7f92be945f002118463b1144116f88ff20fb2ab2d7d3ba51e7db41280900bea435e26b6c99854d040b026994f037996ac407afbcf826bc0f5eaff6135f1bcfcc SHA512 8118a66e4824a90db477f6dd1b7f31f7237b840c270f3464c975f11df4f051b8e9c4f35cb1cefa53ed61164f3eade67491bc32052c658d2e86eae426aab0bd4f
 DIST ktexteditor-5.88.0.tar.xz 2335128 BLAKE2B 8d173dadd77ca4ba3980bc4c80908d194617afd59c00aefd2492dbf7411e7ad1cafeffcb00193cdb8fc3588084db6b71a57fd84c1b14129c1b3897f090c93dbb SHA512 e5e42b6bb46de07caa0594e2356273e590240a7a48913bd21ba162a3d993fa15208a34e6aae844ca6b1a6d15e3df7fa861ac4c0f6a1414a62332fff17304312b
 DIST ktexteditor-5.90.0.tar.xz 2340540 BLAKE2B eceb56847e43c7d8e8883bc219228ec365bf85cb5279ef255f59d3005a5e1fb6cbc55309b9791b5cdc088201283a08f5b0ab9c0fd840604c349442e60bfa4a0f SHA512 7c63802a4d904d2e5eff6e3c957e9a94848993898bdd37eb033842d4033985820348d81080a3701db19aef1a5762ebdc8a4a4749c931d79f00c986837faa5837
 EBUILD ktexteditor-5.88.0-r1.ebuild 1671 BLAKE2B 2761849095b4c0f1111a712e1e80a5303c29193699a21b2521faaa139131976048659e08a5e41ceb562b9c95d7b4994496940898c874efc61c81aec81752c722 SHA512 9189838fe20bae11fa9a3687fd8ce4bf80fa0c17fcca9bd4a8b1038ccf2e7a8fb5f37b9695886cb9d53fd211f3d096ea72a6a5140c7fa16915af9af46e636561
-EBUILD ktexteditor-5.90.0.ebuild 1521 BLAKE2B 5369b952a0611ed8e1bae5a7425a182988241595eeef627f476a39a742f939c0a410ec0e6d892b7bd2826a2847eb2435be0e1c6b067b5e36a191ec2e5c5fd801 SHA512 b20a89b54095ee48027493bd13dc64f778763f0e847b5bf2ce51aa738bfe7c05360445385287dd12ca67a58b886a8f4ed4d7c6ce757982e28c4a914458495f4e
+EBUILD ktexteditor-5.90.0-r2.ebuild 1689 BLAKE2B 626f42fb2562f3151e16ca507ec57a3c9e4509ffd55fdb0a295865f20b46e6d21440cadc01a1d2bf460954010a0929364dbb93aaa7b9006b171270c51b29414a SHA512 7fb419ec40b1fb5adc43518dda100ddb5102892e071cbb48f5afa9afbb89de4cc629f978fe78e448ea3bf10ca08fcfbba01a74752895a1ba15a4e2a3d44303aa
 MISC metadata.xml 558 BLAKE2B 4f17698120e7bb1f131519e4a43f33e99916d3690a548412572a43cc060a115eeed44d0ca0cab43f7c3fea8c098f4c495ce571ea1cb6ce78a25e7ef0fb49f1e5 SHA512 441d42f0f301c60e77f90d40cf57f76addaf455225a99e63ea95ed3b7a08d944fe80260c7188a989d830277006da96f271fb6a02bad41ead3bea7358621ae04a
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-1.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-1.patch
new file mode 100644
index 000000000000..854cf0da4b2e
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-1.patch
@@ -0,0 +1,104 @@
+From 804e49444c093fe58ec0df2ab436565e50dc147e Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 20 Jan 2022 09:46:34 +0100
+Subject: [PATCH] only start programs in user's path
+
+don't use QProcess with just program name
+first search the right program in the user's path
+---
+ src/document/katedocument.cpp        | 29 ++++++++++++++++------------
+ src/swapfile/kateswapdiffcreator.cpp | 17 ++++++++++++----
+ 2 files changed, 30 insertions(+), 16 deletions(-)
+
+diff --git a/src/document/katedocument.cpp b/src/document/katedocument.cpp
+index 01f74da1..05d0e91b 100644
+--- a/src/document/katedocument.cpp
++++ b/src/document/katedocument.cpp
+@@ -72,6 +72,7 @@
+ #include <QMimeDatabase>
+ #include <QProcess>
+ #include <QRegularExpression>
++#include <QStandardPaths>
+ #include <QTemporaryFile>
+ #include <QTextCodec>
+ #include <QTextStream>
+@@ -5054,18 +5055,22 @@ void KTextEditor::DocumentPrivate::slotDelayedHandleModOnHd()
+         // skip that, if document is modified!
+         // only do that, if the file is still there, else reload makes no sense!
+         if (m_modOnHd && !isModified() && QFile::exists(url().toLocalFile())) {
+-            QProcess git;
+-            const QStringList args{QStringLiteral("cat-file"), QStringLiteral("-e"), QString::fromUtf8(oldDigest)};
+-            git.start(QStringLiteral("git"), args);
+-            if (git.waitForStarted()) {
+-                git.closeWriteChannel();
+-                if (git.waitForFinished()) {
+-                    if (git.exitCode() == 0) {
+-                        // this hash exists still in git => just reload
+-                        m_modOnHd = false;
+-                        m_modOnHdReason = OnDiskUnmodified;
+-                        m_prevModOnHdReason = OnDiskUnmodified;
+-                        documentReload();
++            // we only want to use git from PATH, cache this
++            static const QString fullGitPath = QStandardPaths::findExecutable(QStringLiteral("git"));
++            if (!fullGitPath.isEmpty()) {
++                QProcess git;
++                const QStringList args{QStringLiteral("cat-file"), QStringLiteral("-e"), QString::fromUtf8(oldDigest)};
++                git.start(fullGitPath, args);
++                if (git.waitForStarted()) {
++                    git.closeWriteChannel();
++                    if (git.waitForFinished()) {
++                        if (git.exitCode() == 0) {
++                            // this hash exists still in git => just reload
++                            m_modOnHd = false;
++                            m_modOnHdReason = OnDiskUnmodified;
++                            m_prevModOnHdReason = OnDiskUnmodified;
++                            documentReload();
++                        }
+                     }
+                 }
+             }
+diff --git a/src/swapfile/kateswapdiffcreator.cpp b/src/swapfile/kateswapdiffcreator.cpp
+index 5c515c45..a185123a 100644
+--- a/src/swapfile/kateswapdiffcreator.cpp
++++ b/src/swapfile/kateswapdiffcreator.cpp
+@@ -14,6 +14,7 @@
+ #include <KMessageBox>
+ 
+ #include <QDir>
++#include <QStandardPaths>
+ #include <QTextCodec>
+ 
+ // BEGIN SwapDiffCreator
+@@ -85,17 +86,25 @@ void SwapDiffCreator::viewDiff()
+     connect(&m_proc, &QProcess::readyRead, this, &SwapDiffCreator::slotDataAvailable, Qt::UniqueConnection);
+     connect(&m_proc, &QProcess::finished, this, &SwapDiffCreator::slotDiffFinished, Qt::UniqueConnection);
+ 
+-    // try to start diff process, if we can't be started be done with error
+-    m_proc.start(QStringLiteral("diff"), QStringList() << QStringLiteral("-u") << m_originalFile.fileName() << m_recoveredFile.fileName());
+-    if (!m_proc.waitForStarted()) {
++    // use diff from PATH only => inform if not found at all
++    const QString fullDiffPath = QStandardPaths::findExecutable(QStringLiteral("diff"));
++    if (fullDiffPath.isEmpty()) {
+         KMessageBox::sorry(nullptr,
+-                           i18n("The diff command could not be started. Please make sure that "
++                           i18n("The diff command could not be found. Please make sure that "
+                                 "diff(1) is installed and in your PATH."),
+                            i18n("Error Creating Diff"));
+         deleteLater();
+         return;
+     }
+ 
++    // try to start the diff program, might fail, too
++    m_proc.start(fullDiffPath, QStringList() << QStringLiteral("-u") << m_originalFile.fileName() << m_recoveredFile.fileName());
++    if (!m_proc.waitForStarted()) {
++        KMessageBox::sorry(nullptr, i18n("The diff command '%1' could not be started.").arg(fullDiffPath), i18n("Error Creating Diff"));
++        deleteLater();
++        return;
++    }
++
+     // process is up and running, we can write data to it
+     QTextStream ts(&m_proc);
+     int lineCount = recoverDoc.lines();
+-- 
+GitLab
+
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-2.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-2.patch
new file mode 100644
index 000000000000..8cccfe3a95b0
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-CVE-2022-23853-2.patch
@@ -0,0 +1,55 @@
+From c80f935c345de2e2fb10635202800839ca9697bf Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Thu, 20 Jan 2022 10:30:20 +0100
+Subject: [PATCH] only execute diff in path
+
+---
+ src/dialogs/katedialogs.cpp | 5 +++--
+ src/dialogs/katedialogs.h   | 1 +
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/dialogs/katedialogs.cpp b/src/dialogs/katedialogs.cpp
+index 5b949f36..63a58aee 100644
+--- a/src/dialogs/katedialogs.cpp
++++ b/src/dialogs/katedialogs.cpp
+@@ -1317,6 +1317,7 @@ KateModOnHdPrompt::KateModOnHdPrompt(KTextEditor::DocumentPrivate *doc, KTextEdi
+     : QObject(doc)
+     , m_doc(doc)
+     , m_modtype(modtype)
++    , m_fullDiffPath(QStandardPaths::findExecutable(QStringLiteral("diff")))
+     , m_proc(nullptr)
+     , m_diffFile(nullptr)
+     , m_diffAction(nullptr)
+@@ -1334,7 +1335,7 @@ KateModOnHdPrompt::KateModOnHdPrompt(KTextEditor::DocumentPrivate *doc, KTextEdi
+         m_message->addAction(aAutoReload, false);
+         connect(aAutoReload, &QAction::triggered, this, &KateModOnHdPrompt::autoReloadTriggered);
+ 
+-        if (!QStandardPaths::findExecutable(QStringLiteral("diff")).isEmpty()) {
++        if (!m_fullDiffPath.isEmpty()) {
+             m_diffAction = new QAction(i18n("View &Difference"), this);
+             m_diffAction->setIcon(QIcon::fromTheme(QStringLiteral("document-multiple")));
+             m_diffAction->setToolTip(i18n("Shows a diff of the changes"));
+@@ -1394,7 +1395,7 @@ void KateModOnHdPrompt::slotDiff()
+     // Start a KProcess that creates a diff
+     m_proc = new KProcess(this);
+     m_proc->setOutputChannelMode(KProcess::MergedChannels);
+-    *m_proc << QStringLiteral("diff") << QStringLiteral("-u") << QStringLiteral("-") << m_doc->url().toLocalFile();
++    *m_proc << m_fullDiffPath << QStringLiteral("-u") << QStringLiteral("-") << m_doc->url().toLocalFile();
+     connect(m_proc, &KProcess::readyRead, this, &KateModOnHdPrompt::slotDataAvailable);
+     connect(m_proc, &KProcess::finished, this, &KateModOnHdPrompt::slotPDone);
+ 
+diff --git a/src/dialogs/katedialogs.h b/src/dialogs/katedialogs.h
+index 80b611d9..e5574023 100644
+--- a/src/dialogs/katedialogs.h
++++ b/src/dialogs/katedialogs.h
+@@ -376,6 +376,7 @@ private:
+     KTextEditor::DocumentPrivate *m_doc;
+     QPointer<KTextEditor::Message> m_message;
+     KTextEditor::ModificationInterface::ModifiedOnDiskReason m_modtype;
++    QString m_fullDiffPath;
+     KProcess *m_proc;
+     QTemporaryFile *m_diffFile;
+     QAction *m_diffAction;
+-- 
+GitLab
+
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-KDEBUG-447972.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-KDEBUG-447972.patch
new file mode 100644
index 000000000000..05cfbd107cd9
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-KDEBUG-447972.patch
@@ -0,0 +1,26 @@
+From 863f606b1fcf3b91b256d9167a00539289246188 Mon Sep 17 00:00:00 2001
+From: Waqar Ahmed <waqar.17a@gmail.com>
+Date: Tue, 11 Jan 2022 20:03:12 +0500
+Subject: [PATCH] Find: Update working range when replacing
+
+BUG: 447972
+---
+ src/search/katesearchbar.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/search/katesearchbar.cpp b/src/search/katesearchbar.cpp
+index ed52c4cb..c1c85bd4 100644
+--- a/src/search/katesearchbar.cpp
++++ b/src/search/katesearchbar.cpp
+@@ -843,6 +843,8 @@ void KateSearchBar::findOrReplaceAll()
+ 
+                 // Replace
+                 lastRange = match.replace(m_replacement, false, ++m_matchCounter);
++                // update working range as text must have changed now
++                workingRangeCopy = m_workingRange->toRange();
+             } else {
+                 lastRange = match.range();
+                 ++m_matchCounter;
+-- 
+GitLab
+
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-revert-5dce70a9.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-revert-5dce70a9.patch
new file mode 100644
index 000000000000..140bc0cf7111
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.90.0-revert-5dce70a9.patch
@@ -0,0 +1,138 @@
+From 3b31919427baf3da1ab1a24f682a4cefc7e5106f Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Sun, 16 Jan 2022 18:29:57 +0100
+Subject: [PATCH] Revert "Do not cancel mouse selection when using the
+ keyboard"
+
+This reverts commit 5dce70a9693f8cce37f733b4687bb9b303376742.
+
+=> this leads to regressions
+
+if somebody has time to properly reproduce and fix that, we can reapply
+this, otherwise it is better to have some always working state without
+this small usability improvement
+
+BUG: 447525
+BUG: 446189
+
+frameworks/ktexteditor#11
+---
+ src/view/kateview.cpp         | 20 ++++++++++----------
+ src/view/kateviewinternal.cpp |  5 -----
+ src/view/kateviewinternal.h   |  2 --
+ 3 files changed, 10 insertions(+), 17 deletions(-)
+
+diff --git a/src/view/kateview.cpp b/src/view/kateview.cpp
+index 6b88eb75..56348480 100644
+--- a/src/view/kateview.cpp
++++ b/src/view/kateview.cpp
+@@ -3063,9 +3063,9 @@ void KTextEditor::ViewPrivate::shiftCursorRight()
+ void KTextEditor::ViewPrivate::wordLeft()
+ {
+     if (currentTextLine().isRightToLeft()) {
+-        m_viewInternal->wordNext(m_viewInternal->isUserSelecting());
++        m_viewInternal->wordNext();
+     } else {
+-        m_viewInternal->wordPrev(m_viewInternal->isUserSelecting());
++        m_viewInternal->wordPrev();
+     }
+ }
+ 
+@@ -3081,9 +3081,9 @@ void KTextEditor::ViewPrivate::shiftWordLeft()
+ void KTextEditor::ViewPrivate::wordRight()
+ {
+     if (currentTextLine().isRightToLeft()) {
+-        m_viewInternal->wordPrev(m_viewInternal->isUserSelecting());
++        m_viewInternal->wordPrev();
+     } else {
+-        m_viewInternal->wordNext(m_viewInternal->isUserSelecting());
++        m_viewInternal->wordNext();
+     }
+ }
+ 
+@@ -3098,7 +3098,7 @@ void KTextEditor::ViewPrivate::shiftWordRight()
+ 
+ void KTextEditor::ViewPrivate::home()
+ {
+-    m_viewInternal->home(m_viewInternal->isUserSelecting());
++    m_viewInternal->home();
+ }
+ 
+ void KTextEditor::ViewPrivate::shiftHome()
+@@ -3108,7 +3108,7 @@ void KTextEditor::ViewPrivate::shiftHome()
+ 
+ void KTextEditor::ViewPrivate::end()
+ {
+-    m_viewInternal->end(m_viewInternal->isUserSelecting());
++    m_viewInternal->end();
+ }
+ 
+ void KTextEditor::ViewPrivate::shiftEnd()
+@@ -3118,7 +3118,7 @@ void KTextEditor::ViewPrivate::shiftEnd()
+ 
+ void KTextEditor::ViewPrivate::up()
+ {
+-    m_viewInternal->cursorUp(m_viewInternal->isUserSelecting());
++    m_viewInternal->cursorUp();
+ }
+ 
+ void KTextEditor::ViewPrivate::shiftUp()
+@@ -3128,7 +3128,7 @@ void KTextEditor::ViewPrivate::shiftUp()
+ 
+ void KTextEditor::ViewPrivate::down()
+ {
+-    m_viewInternal->cursorDown(m_viewInternal->isUserSelecting());
++    m_viewInternal->cursorDown();
+ }
+ 
+ void KTextEditor::ViewPrivate::shiftDown()
+@@ -3168,7 +3168,7 @@ void KTextEditor::ViewPrivate::shiftBottomOfView()
+ 
+ void KTextEditor::ViewPrivate::pageUp()
+ {
+-    m_viewInternal->pageUp(m_viewInternal->isUserSelecting());
++    m_viewInternal->pageUp();
+ }
+ 
+ void KTextEditor::ViewPrivate::shiftPageUp()
+@@ -3178,7 +3178,7 @@ void KTextEditor::ViewPrivate::shiftPageUp()
+ 
+ void KTextEditor::ViewPrivate::pageDown()
+ {
+-    m_viewInternal->pageDown(m_viewInternal->isUserSelecting());
++    m_viewInternal->pageDown();
+ }
+ 
+ void KTextEditor::ViewPrivate::shiftPageDown()
+diff --git a/src/view/kateviewinternal.cpp b/src/view/kateviewinternal.cpp
+index d642938a..c8d479d6 100644
+--- a/src/view/kateviewinternal.cpp
++++ b/src/view/kateviewinternal.cpp
+@@ -4077,11 +4077,6 @@ void KateViewInternal::viewSelectionChanged()
+     m_selectionCached.setStart(KTextEditor::Cursor::invalid());
+ }
+ 
+-bool KateViewInternal::isUserSelecting() const
+-{
+-    return m_selChangedByUser;
+-}
+-
+ KateLayoutCache *KateViewInternal::cache() const
+ {
+     return m_layoutCache;
+diff --git a/src/view/kateviewinternal.h b/src/view/kateviewinternal.h
+index 66b137b6..8639dcef 100644
+--- a/src/view/kateviewinternal.h
++++ b/src/view/kateviewinternal.h
+@@ -228,8 +228,6 @@ public:
+         return m_leftBorder;
+     }
+ 
+-    bool isUserSelecting() const;
+-
+     // EVENT HANDLING STUFF - IMPORTANT
+ private:
+     void fixDropEvent(QDropEvent *event);
+-- 
+GitLab
+
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.90.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r2.ebuild
index 76c58654bcfd..4b7520cf0d9f 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.90.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.90.0-r2.ebuild
@@ -46,6 +46,12 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:5 )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-revert-5dce70a9.patch # KDE-bugs 446189, 447525
+	"${FILESDIR}"/${P}-KDEBUG-447972.patch
+	"${FILESDIR}"/${P}-CVE-2022-23853-{1,2}.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package editorconfig EditorConfig)
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 3f0ccfb3355f..7a1367a289ae 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,5 +1,6 @@
+AUX kwindowsystem-5.90.0-avoid-XKeycodeToKeysym.patch 1918 BLAKE2B 2407fc4cd4ebf3f3979be4dcc2f9d9859c7dedfd03d797e150d42989d2ce1008294d1a29ee0edbf1455863f4e75663c1622a066898dc06967b883a00d361840e SHA512 633719c5f28cc515fa5623f57813b2f3e88cf933343b68b2a13e32a5910af6fb1a7b023c95e5b98f994f08e7e9b778d2a6728b4f8b31559fb021dd3b303bb9ce
 DIST kwindowsystem-5.88.0.tar.xz 179400 BLAKE2B f2798ae0fa85674ecaf7d5faa55460adffc180cde49cd00051480495ae8dd1a72e851d3138dfb97d097049fc68208bcd9a094b620ecd3eac3e2be5a271acfce7 SHA512 1863cf4185d2920e46511ec247165c1af8a6035a62a12db9c0a39ac3ebb0c701ab01072d919d115ce2288ecbccb5cdaf66d055cc372270dcf8979ca9e227bdf0
 DIST kwindowsystem-5.90.0.tar.xz 182024 BLAKE2B 8b7a451d8b0b713b07f10f459e816a31209fb0606c4810691517d9f3892840e0633989759e2ce5d767f04b59cbbca7c55f44818d90dc2b869ce587e798c89c19 SHA512 c63417e4c2e33f1b08898722f582324b72beae9e1931f08e6866bc6939681a612a30cd704236ae373aa075ef94f73f8868c92558a21e4849d6d0c467574916a2
 EBUILD kwindowsystem-5.88.0.ebuild 856 BLAKE2B 322e2a182351ae4bfc21761d4a6f7b3786ae91ac3c4504e10a7acb5885025fafaa25f5660740fb78b4a2bf1ac96b2b67078e71f6885452a739c3becb75a386a4 SHA512 ee4638e1ca03a993108b5a635102c8eabeaf919b014d4bae07b787bc063271bb35e430123823f53990e3042f292456fbe36a206df9459b405932d8e3f9bf89b1
-EBUILD kwindowsystem-5.90.0.ebuild 859 BLAKE2B d59136393021043eb28e79e41aadb00355144165bb27e5059dbfa0b0173202b3d5923169e31e947f4322ac8f20890382970be876aeb54d5734525344d7f76f8b SHA512 f200fbc76e1666f7aed1ea2e9f7bae12048f77042ee2ec16eeac2d0059b1973db69a4b7a4b8d1c72efdaf7c43fb3863cd663f1ae20989a11bccd9a563948f50b
+EBUILD kwindowsystem-5.90.0-r1.ebuild 937 BLAKE2B 47b66476f09cbdef8527c6acbe37c9856bb7293292ac80361cf88f2261638bf5a24598aaf703543355d66be2292b8ff941f81e9512fa252e8f7532fc9ad02e6f SHA512 67c78ee835b003694cfa8fd5326e7769ffe8621b3f297759d9e5a007f8a2aafc183b84ae77c36e0c2d59e47c1aa4885cd6e81509c45b538f62c796f1510d7f47
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/kwindowsystem/files/kwindowsystem-5.90.0-avoid-XKeycodeToKeysym.patch b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.90.0-avoid-XKeycodeToKeysym.patch
new file mode 100644
index 000000000000..a9f47883e6e8
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/files/kwindowsystem-5.90.0-avoid-XKeycodeToKeysym.patch
@@ -0,0 +1,50 @@
+From 6e3d645d444073097e93520f047bb2321673119a Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Sun, 2 Jan 2022 23:52:07 +0100
+Subject: [PATCH] Avoid XKeycodeToKeysym in KKeyServer::initializeMods
+
+Xlib functions which work with keyboard mappings have a (Display) internal
+cache, which needs to be refreshed on mapping changes by calling
+X(kb)RefreshKeyboardMapping on change notify events.
+
+After Qt switched to XCB, that is no longer happening, and it's also not
+possible to get to the XEvent needed for triggering the refresh. Switch
+over to using the XCB equivalent and just load the symbols on every invocation.
+
+BUG: 426684
+---
+ src/platforms/xcb/kkeyserver.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/platforms/xcb/kkeyserver.cpp b/src/platforms/xcb/kkeyserver.cpp
+index 306c63b..bc43dbd 100644
+--- a/src/platforms/xcb/kkeyserver.cpp
++++ b/src/platforms/xcb/kkeyserver.cpp
+@@ -496,6 +496,7 @@ bool initializeMods()
+     }
+ 
+     checkDisplay();
++    xcb_key_symbols_t *symbols = xcb_key_symbols_alloc(QX11Info::connection());
+     XModifierKeymap *xmk = XGetModifierMapping(QX11Info::display());
+ 
+     int min_keycode;
+@@ -515,7 +516,7 @@ bool initializeMods()
+         // found fixes the problem.
+         for (int j = 0; j < xmk->max_keypermod; ++j) {
+             for (int k = 0; k < keysyms_per_keycode; ++k) {
+-                keySymX = XKeycodeToKeysym(QX11Info::display(), xmk->modifiermap[xmk->max_keypermod * i + j], k);
++                keySymX = xcb_key_symbols_get_keysym(symbols, xmk->modifiermap[xmk->max_keypermod * i + j], k);
+ 
+                 switch (keySymX) {
+                 case XK_Alt_L:
+@@ -628,6 +629,7 @@ bool initializeMods()
+     g_rgX11ModInfo[2].modX = g_alt_mask;
+     g_rgX11ModInfo[3].modX = g_meta_mask;
+ 
++    xcb_key_symbols_free(symbols);
+     XFreeModifiermap(xmk);
+     g_bInitializedMods = true;
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.90.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.90.0-r1.ebuild
index e0af04ee37a0..9b74f0ae66e9 100644
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.90.0.ebuild
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.90.0-r1.ebuild
@@ -34,6 +34,8 @@ BDEPEND="
 
 DOCS=( docs/README.kstartupinfo )
 
+PATCHES=( "${FILESDIR}/${P}-avoid-XKeycodeToKeysym.patch" ) # KDE-bug 426684
+
 src_configure() {
 	local mycmakeargs=(
 		-DKWINDOWSYSTEM_NO_WIDGETS=ON
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 10f899587bf9..cd38669ae829 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -5,9 +5,12 @@ AUX plasma-5.88.0-no-double-delete.patch 988 BLAKE2B 9d3fce0c542c557cddf12cea739
 AUX plasma-5.88.0-reload-shared-renderers-if-changed-on-disk.patch 9892 BLAKE2B b0804a3f5b568c518178ef703c002a58fd71dc8139259d2e3cf81aac67070a8c60fde6a7ebf048e5912a28ad1f3e0f135846a589192ef2223087e19835c8fe07 SHA512 367f76b3a2c8ea357506dbd2926d8bfe92b922edcc3ad78d2b52491aaf7fd13689be3c1554cad0a297bbb1ab6839a379926b47d2793ef1e58db0568a2b0c56f8
 AUX plasma-5.88.0-svg-smaller-mask-to-hide-glitches.patch 2027 BLAKE2B a0136afc58043cc49925a70bd24d73e2b9a5ee9d3c0474ba77a0c9d34daedd117c151c7376907220b176bc159935fe57edacd4fa885fcd082ccfb30f585baa8f SHA512 808643c91081d31e0e5579ef394858de0e82f74b44c01e39c6ebabd8a269809bd79f0666361d30ca370042e976880169dbb6b41dc1d008f31d64199260234739
 AUX plasma-5.88.0-update-after-clearing-actions.patch 1104 BLAKE2B f4fb2603d06760c77f2bd4e927d59f2aad9baace236ea1c58799158e99931027eaef9993f39bf2e768a590a0e2dc1cb2bced6c11a1c6374a5136b87f9cc562f5 SHA512 a3687beb4bfb2d3384b4921f13ab7c20b27ce12866741e574ce2225483a6905cf1b95d6647b976f44196909ff25232a430d2eae5f7158a1a39dac23d9ae42cda
+AUX plasma-5.90.0-KDEBUG-426969.patch 3254 BLAKE2B 2b2bcafa630b3daaecd54e6cf2d10b5d7f3a668c54393ca0f1f307c3dac05450801d80537b7af6188e39f25ec00430601ea5fa55f7cc7c2c4564e7f234f5fc7d SHA512 f87839edda4fd680d81ddaf59befcf6836bc5510fd287e3ca3737de0f0b16e3d8272ac3d9eaf4b12704bdd65991348e450c93824ae6ab2603c47f25be9950884
+AUX plasma-5.90.0-KDEBUG-447752.patch 2649 BLAKE2B 879a0fbb02e6a90120797d2352e8b3c9874b3203fc1125a004b940f52757eea907a4499d047589c59b4cc7f87dd1ca15119aaa2d990462fda8cc989da5996826 SHA512 17e43da6fd6d6f956e17c889fd4bccdb39d88a1a08cd4cf6bf3af1021eae7dc034821b2b87e2bc5bf2eeedf0338e0d2afb3adba62c0d07a0c68bece08ac781e8
+AUX plasma-5.90.0-KDEBUG-448590.patch 1433 BLAKE2B 667d2f07b474ac5b5ceda34e1e819e7b62fc74463dcc763638d18b60b9dfd93eeca87519069792ff91a80cfe0d795562468b1423943b672556bb6b49a2e84362 SHA512 822f3795fc89f95deb71d6ab3608d38608cff9be48bb30748b2c52adecdf12899707ad2be918fe014087297539c42018914d4c77f7855d4d912844838cca871c
 DIST plasma-framework-5.88.0.tar.xz 3142640 BLAKE2B cbd0cc61b6c39e56a1bceed44d7f04f0033c0daaa3073760f04536b22760147b1bb82f5b85d70d48301083e9ae13e3f6bbebafa75e264762157e2fcaf658123d SHA512 b99c8d5722198d7f2096734f62f913f74471810331980a2722f1864602f3facf796c17a494d16fca7dbbe4389fd5db64b9fe82fd34f148f4ff6230ffde0ded93
 DIST plasma-framework-5.90.0.tar.xz 3143720 BLAKE2B 497a1808c2f07b985f3b458d2bf6b4b4e0198a8bd92cffdad86cc9470cd51c857c3de66edbe4d6ea543da74f6ba05fe5ce1b6746e2df7830839e45549ca01293 SHA512 0f22e100ad996be39a2cc5afa72d3e769dc512d3854d417e81536908bc4e6c9874788554fcea1ca1ec4798cd78681c78ab7c2242b95d7f5fdb6cfd9eeee9543b
 EBUILD plasma-5.88.0-r2.ebuild 2369 BLAKE2B 14e4deb3f5292674fcb30e824a386a0cc65538bde2deacd4a811983e7c16d3592627d08dc6f9584882eb4d2b839d25a88607398d0f1ee48c18ac0080ebdddd42 SHA512 7b58ac1d7120a87ab3588352ba6e7b9a529741ebd98ead6a5c7138dc685f2a64697b9e1985cd614da31adf5b61d04cef10128e6f3be5a2cf82be47f00b6268a1
 EBUILD plasma-5.88.0-r3.ebuild 2447 BLAKE2B 2a1471cb8dab390459b6745a038a56ecf9f5a08b3fbcc5ebe67b5b30442a8a20a3e7a892de120c0e336d4bf4fa5027220b10c656ed00ad61a6a2286cedfddf56 SHA512 bc975c57746ff89492db6fc1149c27478a3510422f0b58f46676a48701dcc93501b8cf83896fd481cbc3713657402f1562d9aaa06089b8fcf553bccc774e80b0
-EBUILD plasma-5.90.0.ebuild 1943 BLAKE2B acf5b27409eb3763f894a3e64e472b0343eba7b98ff0719b51b5db2efe8e82daad3daff398679b89810c6e4d356d8fd2657fc9d1344a678009c2be35478e3fb9 SHA512 429185ca06ec503371c74dd1ec1c02f50fd57482cacead69e95b3efcae8751bb20befb8b0ff79d8133b63b3e0bfbe41467fd953a73f4d5883e3a15db7745af98
+EBUILD plasma-5.90.0-r1.ebuild 2076 BLAKE2B 14fed7b4fc036b009261d64e098201a91ae946cfdad0573ce7a8e145dfbff3d12c06aedd4947c2707e39b21c8bdd39d43bb1a2574d9611051e754cc4eab2aca4 SHA512 4be7bdec353776454b87191091f5649a04d1ae22402898b5d7603c2e782fde0de23d4a39e43254cb5ac7ba73717dad6cb069d6ddf6f083de1add8888c706e630
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch
new file mode 100644
index 000000000000..bccc097a3b99
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-426969.patch
@@ -0,0 +1,90 @@
+From d40d36057a0ee9fcb4badc7ff8b56844da79dfc8 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Wed, 12 Jan 2022 22:21:34 +0000
+Subject: [PATCH] Always sync the setPanelBehavior to wayland
+
+Currently this code is in the else statement to if (type !=
+Dialog::Normal) {
+
+This doesn't make sense as panel roles apply explicitly to other types,
+like Dialog::Dock. On X11 the equivalent always applies.
+
+BUG: 426969
+
+* asturm 2022-01-22: Merged with below fixup:
+
+From b882b34d7b55975f679133ef86cfd12869e8bba5 Mon Sep 17 00:00:00 2001
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Thu, 13 Jan 2022 17:03:38 +0000
+Subject: [PATCH] Always sync the setPanelBehavior to wayland
+
+The previous patch moved some code that reapplied setRole in a way that
+caused issues.
+
+BUG: 448373
+
+--- a/src/plasmaquick/dialog.cpp
++++ b/src/plasmaquick/dialog.cpp
+@@ -693,14 +693,13 @@
+ 
+ void DialogPrivate::applyType()
+ {
+-    if (type != Dialog::Normal) {
+         /*QXcbWindowFunctions::WmWindowType*/ int wmType = 0;
+ 
+ #if HAVE_X11
+         if (KWindowSystem::isPlatformX11()) {
+             switch (type) {
+             case Dialog::Normal:
+-                Q_UNREACHABLE();
++                q->setFlags(Qt::FramelessWindowHint | q->flags());
+                 break;
+             case Dialog::Dock:
+                 wmType = QXcbWindowFunctions::WmWindowType::Dock;
+@@ -729,11 +728,15 @@
+         }
+ #endif
+ 
+-        if (!wmType) {
++        if (!wmType && type != Dialog::Normal) {
+             KWindowSystem::setType(q->winId(), static_cast<NET::WindowType>(type));
+         }
+ #if HAVE_KWAYLAND
+         if (shellSurface) {
++            if (q->flags() & Qt::WindowStaysOnTopHint) {
++                type = Dialog::Dock;
++                shellSurface->setPanelBehavior(KWayland::Client::PlasmaShellSurface::PanelBehavior::WindowsGoBelow);
++            }
+             switch (type) {
+                 case Dialog::Dock:
+                 shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Panel);
+@@ -750,27 +753,13 @@
+             case Dialog::CriticalNotification:
+                 shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::CriticalNotification);
+                 break;
++            case Dialog::Normal:
++                shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Normal);
+             default:
+                 break;
+             }
+         }
+ #endif
+-    } else {
+-        q->setFlags(Qt::FramelessWindowHint | q->flags());
+-
+-#if HAVE_KWAYLAND
+-        // Only possible after setup
+-        if (shellSurface) {
+-            if (q->flags() & Qt::WindowStaysOnTopHint) {
+-                shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Panel);
+-                shellSurface->setPanelBehavior(KWayland::Client::PlasmaShellSurface::PanelBehavior::WindowsGoBelow);
+-            } else {
+-                shellSurface->setRole(KWayland::Client::PlasmaShellSurface::Role::Normal);
+-                shellSurface->setPanelBehavior(KWayland::Client::PlasmaShellSurface::PanelBehavior::AlwaysVisible);
+-            }
+-        }
+-#endif
+-    }
+ 
+     // an OSD can't be a Dialog, as qt xcb would attempt to set a transient parent for it
+     // see bug 370433
diff --git a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-447752.patch b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-447752.patch
new file mode 100644
index 000000000000..62cb8a52b6c5
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-447752.patch
@@ -0,0 +1,68 @@
+From ecf0cc36936f69830a07937b97807ec0ba4d3f41 Mon Sep 17 00:00:00 2001
+From: Marco Martin <notmart@gmail.com>
+Date: Mon, 10 Jan 2022 09:22:09 +0000
+Subject: [PATCH] Don't crash when a screen gets disabled and enabled again
+
+when a screen gets disabled, the containment loses its view, and when gets enabled again,
+the process of the old orphaned containment getting a new view causes a plasma crash.
+It comes from the wallpaper, which indicates a hierarchy of C++ owned objects
+makes the internal one (wallpaper) to not reset correctly its window and have a stray pointer to it.
+
+BUG:447752
+---
+ .../qml/plasmoid/containmentinterface.cpp     | 21 +++++++++++++++----
+ .../qml/plasmoid/containmentinterface.h       |  1 +
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.cpp b/src/scriptengines/qml/plasmoid/containmentinterface.cpp
+index d8a89014c..29a7738ca 100644
+--- a/src/scriptengines/qml/plasmoid/containmentinterface.cpp
++++ b/src/scriptengines/qml/plasmoid/containmentinterface.cpp
+@@ -74,10 +74,6 @@ void ContainmentInterface::init()
+     connect(m_activityInfo, &KActivities::Info::nameChanged, this, &ContainmentInterface::activityNameChanged);
+     Q_EMIT activityNameChanged();
+ 
+-    if (!m_containment->wallpaper().isEmpty()) {
+-        loadWallpaper();
+-    }
+-
+     AppletInterface::init();
+ 
+     // Create the ToolBox
+@@ -1162,4 +1158,21 @@ bool ContainmentInterface::isLoading() const
+     return loading;
+ }
+ 
++void ContainmentInterface::itemChange(ItemChange change, const ItemChangeData &value)
++{
++    if (change == QQuickItem::ItemSceneChange) {
++        // we have a window: create the representations if needed
++        if (value.window && !m_containment->wallpaper().isEmpty()) {
++            loadWallpaper();
++        } else if (m_wallpaperInterface) {
++            m_wallpaperInterface->deleteLater();
++            m_wallpaperInterface = nullptr;
++            Q_EMIT wallpaperInterfaceChanged();
++        }
++    }
++
++    AppletInterface::itemChange(change, value);
++}
++
++
+ #include "moc_containmentinterface.cpp"
+diff --git a/src/scriptengines/qml/plasmoid/containmentinterface.h b/src/scriptengines/qml/plasmoid/containmentinterface.h
+index a91c60c5e..f1276ee80 100644
+--- a/src/scriptengines/qml/plasmoid/containmentinterface.h
++++ b/src/scriptengines/qml/plasmoid/containmentinterface.h
+@@ -169,6 +169,7 @@ protected:
+     void addContainmentActions(QMenu *desktopMenu, QEvent *event);
+ 
+     virtual bool isLoading() const override;
++    void itemChange(ItemChange change, const ItemChangeData &value) override;
+ 
+ Q_SIGNALS:
+     /**
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch
new file mode 100644
index 000000000000..4bbb7a8ce1b0
--- /dev/null
+++ b/kde-frameworks/plasma/files/plasma-5.90.0-KDEBUG-448590.patch
@@ -0,0 +1,32 @@
+From e9ba0c54f2c01bb530370c16502cf304fc18b3f6 Mon Sep 17 00:00:00 2001
+From: Alexander Lohnau <alexander.lohnau@gmx.de>
+Date: Mon, 17 Jan 2022 19:58:53 +0100
+Subject: [PATCH] Corona::containmentForScreen: Ignore activities when an empty
+ string is used
+
+With the other overloads being deprecated, consumers are forced to put in an empty string
+for the activity. As one can see in the pre-existing code, an empty string indicates
+that the activity should be ignored. Consequently we should skip the activity check, when
+we got an empty string.
+
+BUG: 448590
+---
+ src/plasma/corona.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plasma/corona.cpp b/src/plasma/corona.cpp
+index f034d7b2e..8f532d690 100644
+--- a/src/plasma/corona.cpp
++++ b/src/plasma/corona.cpp
+@@ -206,7 +206,7 @@ Containment *Corona::containmentForScreen(int screen, const QString &activity, c
+     for (Containment *cont : std::as_const(d->containments)) {
+         /* clang-format off */
+         if (cont->lastScreen() == screen
+-            && (cont->activity().isEmpty() || cont->activity() == activity)
++            && ((cont->activity().isEmpty() || activity.isEmpty()) || cont->activity() == activity)
+             && (cont->containmentType() == Plasma::Types::DesktopContainment
+                 || cont->containmentType() == Plasma::Types::CustomContainment)) { /* clang-format on */
+             containment = cont;
+-- 
+GitLab
+
diff --git a/kde-frameworks/plasma/plasma-5.90.0.ebuild b/kde-frameworks/plasma/plasma-5.90.0-r1.ebuild
index 0a0ae5ff71e9..a59a50636a36 100644
--- a/kde-frameworks/plasma/plasma-5.90.0.ebuild
+++ b/kde-frameworks/plasma/plasma-5.90.0-r1.ebuild
@@ -59,6 +59,12 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:5 )"
 
+PATCHES=(
+	"${FILESDIR}/${P}-KDEBUG-426969.patch"
+	"${FILESDIR}/${P}-KDEBUG-447752.patch"
+	"${FILESDIR}/${P}-KDEBUG-448590.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package !gles2-only OpenGL)
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index 97f4a1bece52..f0c059ffb515 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,5 +1,6 @@
+AUX qqc2-desktop-style-5.90.0-KDEBUG-447289.patch 2692 BLAKE2B d6c6038c6aba645b866d1ed9f9666291fb2ac0ef107705b26813811e06b8e8f777c341298c0ef1bc9df403f8f0969ce9f80317e010751c267b07fcd6442f56d4 SHA512 57e48a1975ae4670cc3bf74ce6b1b8e54818e28518ee2d0831b1eb276b656252146309dc929f4e795d50a00dab1e9a85ff29dabef4cccd9ae89ed679fb68c924
 DIST qqc2-desktop-style-5.88.0.tar.xz 62656 BLAKE2B daf5c039728be40f8980edc05cab1f43f96ae987c9f1569fcb661fff9e1047f1e937f4d3d5a870ccf61825abe66bb6b637ba1d9d5d4abccc6e8b4a29a92ee6b5 SHA512 a0433c619b3978c5884e3fc8067f254f487fd22c5668fe683e35e7a8bb5ddea90c2d72bf6c0586cd03fdf4fa8238653fb37fe0c35f4cf96fe57e13d569816606
 DIST qqc2-desktop-style-5.90.0.tar.xz 65004 BLAKE2B 19d0dbdfe2c6891458e80a2e1935f2a5357db565ac213eb31232b127136d6fc426ce8a8240837fa3f341753d311ca5caaf416a7bfde309dcca787199891bb660 SHA512 c0d95897624d08fd378a1c3e0392d703034775cf4ff7ec463c8117db071c0ada697d0bc05bf0382b19c9fbb865a75371062bc13cbeea7f65213db214b12bdc00
 EBUILD qqc2-desktop-style-5.88.0.ebuild 725 BLAKE2B a9c667c828982fce0fcdd0a9e4446dd63091260f4ab852759a8aae9cab244c97bc4ff7f8dec4bbbcb2cacae0185a68e4aa51c797e34a84ca04c7be978214301f SHA512 06d28314b8add5679c69fd0d778f80c5b81eabe79956d61a202aff5bba867fd4a1d96b8ef042d616cf60f7f2211fdadd98f676b998496a1e0486a41ebd776e1d
-EBUILD qqc2-desktop-style-5.90.0.ebuild 728 BLAKE2B 205cc37f90622e03fc1892dd1e52e5301d4431cc65fea1584e16a81b86f26435aa9ae8fe8aac18514885be272dfe3cb6b06bc4066170dae88e3d403812a72253 SHA512 11a0a78dcf3dbb7f664a3a169673492324873486837742b5a2eeb0e6157186125f443e55b431ecd419b5b8a19f9321c70013d363fa1c1eeb7c04388cdab1d7ad
+EBUILD qqc2-desktop-style-5.90.0-r1.ebuild 780 BLAKE2B c7a1d125bcf197b55ada26c9027add799c010084455cc6df247a23701667c8adfe641cf9f338eb7f16b2a08b9f16383c4603ceefbf91bc79b6fd754777064c3c SHA512 a450c3880c0d13c4a3f8f7a046c7228e1c42f399f5296fb4ecdaa0d08162ca0a84b0855804d289490613f546abd517fede06bd0a179ebf8a93966229cdd08202
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.90.0-KDEBUG-447289.patch b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.90.0-KDEBUG-447289.patch
new file mode 100644
index 000000000000..69991acb5c75
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/files/qqc2-desktop-style-5.90.0-KDEBUG-447289.patch
@@ -0,0 +1,63 @@
+From bc0ca29bd47ce45b30c66bd8743b6a48e20123d2 Mon Sep 17 00:00:00 2001
+From: Nate Graham <nate@kde.org>
+Date: Thu, 23 Dec 2021 12:11:28 -0700
+Subject: [PATCH] Use metrics from Breeze for menu items
+
+We can't read them dynamically right now, unfortunately. So the values
+are hardcoded.
+
+BUG: 447289
+FIXED-IN: 5.91
+---
+ org.kde.desktop/Menu.qml     | 3 +++
+ org.kde.desktop/MenuItem.qml | 6 +++---
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/org.kde.desktop/Menu.qml b/org.kde.desktop/Menu.qml
+index adaf644..205c0b7 100644
+--- a/org.kde.desktop/Menu.qml
++++ b/org.kde.desktop/Menu.qml
+@@ -37,6 +37,9 @@ T.Menu {
+             }
+             return maxWidth;
+         }
++
++        spacing: 0 // Hardcoded to the Breeze theme value
++
+         interactive: ApplicationWindow.window ? contentHeight > ApplicationWindow.window.height : false
+         clip: true
+         currentIndex: control.currentIndex || 0
+diff --git a/org.kde.desktop/MenuItem.qml b/org.kde.desktop/MenuItem.qml
+index d8a7cf0..f0c95e5 100644
+--- a/org.kde.desktop/MenuItem.qml
++++ b/org.kde.desktop/MenuItem.qml
+@@ -25,7 +25,7 @@ T.MenuItem {
+ 
+     Layout.fillWidth: true
+     padding: Kirigami.Units.smallSpacing
+-    verticalPadding: Math.floor(Kirigami.Units.smallSpacing * 1.5)
++    verticalPadding: 4 // Hardcoded to the Breeze theme value
+     hoverEnabled: !Kirigami.Settings.isMobile
+ 
+     Kirigami.MnemonicData.enabled: controlRoot.enabled && controlRoot.visible
+@@ -53,7 +53,7 @@ T.MenuItem {
+             visible: (controlRoot.ListView.view && controlRoot.ListView.view.hasIcons) || (controlRoot.icon != undefined && (controlRoot.icon.name.length > 0 || controlRoot.icon.source.length > 0))
+             source: controlRoot.icon ? (controlRoot.icon.name || controlRoot.icon.source) : ""
+             color: controlRoot.icon ? controlRoot.icon.color : "transparent"
+-            Layout.preferredHeight: Math.max(Kirigami.Units.iconSizes.roundedIconSize(label.height), Kirigami.Units.iconSizes.small)
++            Layout.preferredHeight: Kirigami.Units.iconSizes.small
+             Layout.preferredWidth: Layout.preferredHeight
+         }
+         Label {
+@@ -94,7 +94,7 @@ T.MenuItem {
+         x: controlRoot.mirrored ? controlRoot.padding : controlRoot.width - width - controlRoot.padding
+         y: controlRoot.topPadding + (controlRoot.availableHeight - height) / 2
+         source: controlRoot.mirrored ? "go-next-symbolic-rtl" : "go-next-symbolic"
+-        width: Math.max(Kirigami.Units.iconSizes.roundedIconSize(label.height), Kirigami.Units.iconSizes.small)
++        width: Kirigami.Units.iconSizes.small
+         height: width
+         visible: controlRoot.subMenu
+     }
+-- 
+GitLab
+
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.90.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.90.0-r1.ebuild
index 6b92d3a6fc3c..0f870ace3d87 100644
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.90.0.ebuild
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.90.0-r1.ebuild
@@ -27,3 +27,5 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 "
+
+PATCHES=( "${FILESDIR}/${P}-KDEBUG-447289.patch" )
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 9782e125cf0f..f4bd6858e56b 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,6 +1,7 @@
 AUX solid-5.88.0-dev-desc-for-storage-medium-w-o-size.patch 1488 BLAKE2B 632c6106072491017b89f8ff399f1fb3ac5fc8437e6b9a89c9189cb4b509bf75ffb659c5f761e820f425da66aec9c2e6c00c7a213cf416c49d25a1408c2c149b SHA512 ef4f462a6ef8ca0fa38b69a84a773a2ae1f737f7925db43b8c8d7dd114bdc3e9e37df1fd825040133cc471e85080aac6ab8b3666df471617152ab6889802de80
+AUX solid-5.90.0-properly-round-battery-capacity.patch 1077 BLAKE2B 83e2da4013c8437ab5d1351ba31ec57ea76123c1a0853494919a868acdd6d6014073749133f9e967b7ae19729f642b08726914da9f43056d3290b3061ddcc7b7 SHA512 83d451f3041c7f623f53d185c16dfef78603eaed528deec25d2fa4fef45f86aa1aacdf04467f534b4f1ed27bbc8dc68f9e39259d2b9bafe4b4ffba1cd2336438
 DIST solid-5.88.0.tar.xz 253504 BLAKE2B 8c8ecea29f16ac281ee417ff5223ef4a013860a3c9ac90d4db62badf35d0e230cbc3ffd383ac5ed05fe2956aaea2c403cc713c7efd3baed25c6a95379e5e3b89 SHA512 dbdd619402b036c7d6d4003b1d61ca82e68333a5afb0c424cc8a7236927ac7f42d97c14ad11bebb2729632cbee9681399da2d32dfd1566c400fee8f3a13dc4fa
 DIST solid-5.90.0.tar.xz 256768 BLAKE2B 932a08f48cc84eb31f9038b1e3f4233a7988efe6600b2b500292da878ff00690155334c24145ba0b52f598025eebd5b05165d395bb4d6409b7c42e165087ab7d SHA512 407ebc65b96f4e74862e30a80016c58d338ddc6e037cee5dbec928e3c2a6d1ae8d81e76eaf9a7a619ef2b7c0bad6e7642a96da0fbbe158fcf90519c5b2d758d7
 EBUILD solid-5.88.0-r1.ebuild 1159 BLAKE2B afcbb67e4eeaf0489c722c35186e93a9c38b0c449bdad36c0d0db5581434ad77dd0880af2fa10d175092053967600a98291d74d07aa4df1cb4ac3476bb203f38 SHA512 b7b4c29420d930e7437995ad933fd45b8801cf39b7fdf85e668530cc9fc5235d9eba32092a46c631353e271eadf5755da1c8bb8c58b903edaa0267d6c6053594
-EBUILD solid-5.90.0.ebuild 1070 BLAKE2B 47664260902acdb23f6584951d512cc054a937fede2d6fbc72e39f1f0265d059988b7d2d170c21ad79b27a59e7982ad5305d2cc45610bc43ee0e674edef17001 SHA512 5f1874695511701ce12db955fccc667ad1e5809561a45e54c1f477be8d667e2d832dc47ccf957658078a641ecde8cecd0f0d000d489af728d9612e1670e43a1b
+EBUILD solid-5.90.0-r1.ebuild 1158 BLAKE2B 267e512de25ee770076a70a717179b26cc788582ad1be129cc12ac80ebee6197c114db4d6acca07fcf04fd83dc13cf1e38bce675dbda72320cd1493825777ace SHA512 010a92c85f7565de50903d2047a300f12b78f6eaa24fd948ee5fb7a588bbc587151471484e512390bfb5f3ce46742bae4249c57801a13bc361b34ca87faa6985
 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80
diff --git a/kde-frameworks/solid/files/solid-5.90.0-properly-round-battery-capacity.patch b/kde-frameworks/solid/files/solid-5.90.0-properly-round-battery-capacity.patch
new file mode 100644
index 000000000000..77296074bfa7
--- /dev/null
+++ b/kde-frameworks/solid/files/solid-5.90.0-properly-round-battery-capacity.patch
@@ -0,0 +1,31 @@
+From 2f305a7134f27489203c3fd2e9ca81790f35ac3b Mon Sep 17 00:00:00 2001
+From: ivan tkachenko <me@ratijas.tk>
+Date: Mon, 17 Jan 2022 02:24:44 +0300
+Subject: [PATCH] [upower] Properly round up battery's capacity
+
+The same rounding is already used for charge percent just few lines
+above. Without it, for example, values that are close to 100%
+(e.g. 99.9825%) were rounded down to 99% instead of up to 100%.
+
+BUG: 448372
+FIXED-IN: 5.91
+---
+ src/solid/devices/backends/upower/upowerbattery.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/solid/devices/backends/upower/upowerbattery.cpp b/src/solid/devices/backends/upower/upowerbattery.cpp
+index 22b25d9..055856b 100644
+--- a/src/solid/devices/backends/upower/upowerbattery.cpp
++++ b/src/solid/devices/backends/upower/upowerbattery.cpp
+@@ -84,7 +84,7 @@ int Battery::chargePercent() const
+ 
+ int Battery::capacity() const
+ {
+-    return m_device.data()->prop("Capacity").toDouble();
++    return qRound(m_device.data()->prop("Capacity").toDouble());
+ }
+ 
+ bool Battery::isRechargeable() const
+-- 
+GitLab
+
diff --git a/kde-frameworks/solid/solid-5.90.0.ebuild b/kde-frameworks/solid/solid-5.90.0-r1.ebuild
index 28d6fc82200b..4848819bb62a 100644
--- a/kde-frameworks/solid/solid-5.90.0.ebuild
+++ b/kde-frameworks/solid/solid-5.90.0-r1.ebuild
@@ -35,6 +35,10 @@ BDEPEND="
 	nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-properly-round-battery-capacity.patch" # KDE-bug 448372
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package ios IMobileDevice)
author	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-02-02 01:39:05 +0000
commit	fcc5224904648a8e6eb528d7603154160a20022f (patch)
tree	3bfce096b38a9cea8eed13fc70c1526c456e9abd /kde-frameworks
parent	2fd57282f0262ca084e05b0f2c63fbada395d02b (diff)