gentoo new year resync : 01.01.2021

8 files changed, 40 insertions, 234 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 95cd44bb35d4..e556e5dc5064 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index d6a3bf2dba9b..ce43eab48461 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,7 +1,8 @@
 AUX kxmlgui-5.74.0-fix-multiple-tabs-popup-on-logout.patch 2160 BLAKE2B c467d71f6ce8d24f90aa29192e1f19d10ff8c2d290a1695259e93fb90b1f0d77ed46a2346599c8c5a540a406c55ef68a3fe8cf9b8fe40bcbdb8cca9f113df755 SHA512 4188f192ac437f6334d261f8f178dd2ca29d2ea48fa4d51e23483b2212369ee79521f098a9a51e8e8ac1ec0f861b76a96fefe5a1620149102d2d9268ca794cb3
+AUX kxmlgui-5.77.0-fix-key-recording.patch 929 BLAKE2B c880e82e443f2bc4ca3df5a358843322dab68c2b47f075f5b25aaa9f9a5ad08820ecf9162c23d5595898ba15af3117538268a8db26cc0cd53bc3e43c822abf2e SHA512 66c5e6dcf10742c947b0da909edb762346e55111769c6481c0820bf45b8ccc5c4af8fe61a1f76072ff33b77d62c981f419555709348b49c68c2e36b76c3d3b78
 AUX kxmlgui-5.77.0-no-kwindowsystem.patch 1591 BLAKE2B a7034d980cd0c6106b87b3bf33fc719552af846648f3139e1604a4314e5aea6273c5dec73026dc3815e90f7c4355ad457e5dad99b65bbcac4df193785e7b1a36 SHA512 6395aaf426ac1ccde9f9cd14e296f92f00d8540e5a753ececa7cded09229a9131c733081e1d9d1a93fd03948eb2a9a4c63e0785e8d1c44a9d072674254694ac3
 DIST kxmlgui-5.74.0.tar.xz 864784 BLAKE2B d6cc88603f0036415981411bbaeca6ba7877df085d5b5095b04b7d5567d0e1f23ad3d8c8b1472a365018e9360ee4351c7523fd791d4e53ecca3e9143cc8f2b72 SHA512 98f3e65c30a095d17c0512894bbba0bb172b2044652a0d23324f843489f5bb726359be40a9d68a7916d45a2a6e135f0bbbf7924b35a1939611b75ad6d44ccd92
 DIST kxmlgui-5.77.0.tar.xz 860548 BLAKE2B c862dd9524698c5fc3f83933a20b229ad8b52c94b3b5a703f64518bd4e13543f46bfa2dcf85ed21a0d19c0d72e9efafe412f6cbf6698c14e4827ad4f38da6afa SHA512 bd0e9f0b41927f6e90b71328f5e680a9d83a9c9f502edefc78f898fcab6be3cf553409b63e117c80cc8541b7a48ceb66de49fbcc6e7c8afc33a0d9fd901512b0
 EBUILD kxmlgui-5.74.0-r2.ebuild 1357 BLAKE2B 6c6005846bf19a7183596eb941ce21234a2cb82c80dea14daa01b5a3340e1e14b3aaecea4555514bcbefbb31176c1462f2121fca823cc249ef1cf929bfb6be52 SHA512 b04f9bf2d45d1cdbd68fe46f015d24b7341b836e673d299b35d3c55688764b829206a39766e521dad0adbdf716371236ff87091f446467c8277f25aa74ecd57c
-EBUILD kxmlgui-5.77.0.ebuild 1340 BLAKE2B eeace13d3f75e5e5fddcdb499604782f9f9f0139fa110713d749a96940d146a9c36f0160d7884cf999fedbd28fb459d24fc0832c5377492b1dd9d0523b9b7bb4 SHA512 7f5c7e34ce42426d268b5c0038751b9d5cbdf5f259a523f533d13fa04d94f2974636d5856660957bc513067c557cbaf004065f90f9f6fb968d00719547fe9158
+EBUILD kxmlgui-5.77.0-r1.ebuild 1385 BLAKE2B 269b77c622efe27e538c7246756649b50a01cebcd88fbfe95a073e862c0ccc6a9a7e3ce4ba9e6a54a9d9ac79f13eb978ef37609464d67b36d2417eac4a0d5a5f SHA512 9b9eda7eb3197a548d153ad42cffd8d3a37354bfba713567964bd8e62c1a8b3ae1d8bf7ad2e18534603175d4214d8aa21507f77fa2fdd3a94ec5d1890a7d295f
 MISC metadata.xml 340 BLAKE2B a8e14dd471ebcdaf382d71d9dec13809433c811acbc813ea4c74b1cd05829474df09efba54d8e3aa1041bce3f5e4a61db879e228bab4f79e3b4d9eed32e40a25 SHA512 c6fa7ef3ff6e38f17ef6db3784bfe04e35607464521488253d03863919392c38e76b7d4cf92e83502b1bec109fa1b1a257a7e4a955ea2c01d61e1784f89f59ae
diff --git a/kde-frameworks/kxmlgui/files/kxmlgui-5.77.0-fix-key-recording.patch b/kde-frameworks/kxmlgui/files/kxmlgui-5.77.0-fix-key-recording.patch
new file mode 100644
index 000000000000..ae1269ac6679
--- /dev/null
+++ b/kde-frameworks/kxmlgui/files/kxmlgui-5.77.0-fix-key-recording.patch
@@ -0,0 +1,29 @@
+From 1bd9ac05b0eed3582937829150b31ea48fd95bb0 Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wengxt@gmail.com>
+Date: Thu, 17 Dec 2020 11:12:40 -0800
+Subject: [PATCH] Fix key recording by setWindow before capture starts.
+
+It is common that during the construction of widget, it is not yet added to
+a window. Thus windowHandle will simply return null in this case. Always set
+the window to before the capture starts.
+
+BUG: 430388
+---
+ src/kkeysequencewidget.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/kkeysequencewidget.cpp b/src/kkeysequencewidget.cpp
+index a51c6cc..c1f5c42 100644
+--- a/src/kkeysequencewidget.cpp
++++ b/src/kkeysequencewidget.cpp
+@@ -493,6 +493,7 @@ void KKeySequenceWidget::setCheckActionCollections(const QList<KActionCollection
+ //slot
+ void KKeySequenceWidget::captureKeySequence()
+ {
++    d->recorder->setWindow(window()->windowHandle());
+     d->recorder->startRecording();
+ }
+ 
+-- 
+GitLab
+
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.77.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.77.0-r1.ebuild
index 354195a6cc97..5a6e29e0ebbd 100644
--- a/kde-frameworks/kxmlgui/kxmlgui-5.77.0.ebuild
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.77.0-r1.ebuild
@@ -35,7 +35,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-no-kwindowsystem.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-no-kwindowsystem.patch
+	"${FILESDIR}"/${P}-fix-key-recording.patch
+)
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index cca18e71263d..075e49af2da0 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,7 +1,6 @@
-AUX syntax-highlighting-5.77.0-bashfix-1.patch 11883 BLAKE2B 3c467d6f4b7b81cee958ace44195b0dc42166f6cf0eb539049fef09939274766ac43db4e82c119ef986c651b397c2d7788f8b4741910c699cc4975070d5fc9eb SHA512 73419663940e30dd8d87fd4b63e448f9148c0f5ee7bcc2bf0adea8ebeef0c6f95b811b58d564607a20eff8d65ef11b21e20a5eb69708bec31392f5bf78dd7461
-AUX syntax-highlighting-5.77.0-bashfix-2.patch 2930 BLAKE2B 019b63b2983dd61cbbbc9864294473d77e069e743be1747c96458cef70c9980c514068dcbe90cfa94b4a88b37560c4539dedf6cb2190ba77febe22459a861430 SHA512 c904a9e12390313fe7f484dcf64a55ffdbec813b7b386662760f55d7d072eb349d0926d3485137262e7e835e7a0ad76edfcc75408b6d6ce02d1d8e5c9184d6bc
 DIST syntax-highlighting-5.74.0.tar.xz 2028848 BLAKE2B b4641cd116b851564650a59a1354590b1fcca551a28fd0ea4034b5c95369a39084d0de83370416f10e2f4e51f724ab4bce5f22e97259013358aab54b980ca5b1 SHA512 6dfc9540ca4ec2c76c9b96a864a24bba6923529d72605dcd36136809250be12c366f52bf3dda02564169744729172eec2f0d3f69137d374d81af826ec97bc3b7
+DIST syntax-highlighting-5.77.0-bash-zsh-fixes.patch.xz 91824 BLAKE2B 4d201e62aecc7126f11d52ef2d68c308e61f7e167312270baf093eab379a7d95efaa38fec604701ad0fc15e8e050191a00a4075dac488c957fabe4dc4994065f SHA512 598eb3ed82f2bd072750730e6f9492d821a63cc2ebb4877e83aa482597a6cfb50ac721945f5c176c45d75de970dfba3c79f0e048db9076d7451743e672512c97
 DIST syntax-highlighting-5.77.0.tar.xz 2145120 BLAKE2B de91836509fd6264fe0b79f1a7153c4d581913870ec207bd4d69ce24c5d00d92e49ebc70d147715a732626805cf68045be6490ff6ae7e199454c53a4c82ec2dd SHA512 057e9be24608cd856ee8aea355ddc63da9a11d50c388ae303e1f34cdf3a7ac99c592de51e0f04fa2254246ad796ced5029117b22ca71420b6089139d827a31b9
 EBUILD syntax-highlighting-5.74.0.ebuild 567 BLAKE2B c529a4a46062c8683fc8346f9d6466302d2d059208a2b5ffb654ce9a65ff5266f161d09b0d07d62471a0444b70e0de47e13e702d614cfb14800fe28fa9f6ec1c SHA512 071898b312f43b4f5e7f5b622cc74a2cba90cc799070f74ac900240b27ba017a29549b12e491c51cfc03b5d6e94bf3a71558d8e9ef98581cdb76101f84f5d56e
-EBUILD syntax-highlighting-5.77.0.ebuild 622 BLAKE2B 6421e2f4b598a6fc0fd42af59d0b2fbdcf10b3e472c22429037a1801a17dab5db1f13155d487421c4d43ddb3c788c3d523c99dbf30feaca88bc8d3669a742e19 SHA512 1a3d6182f528cc65bb8b5a5060f0d3e85dbb400f33ce239b50eb1f6ef39041494c28f24296687e755e0c53a6c0740b21832e7a11657a1e7530a33c23a3a20975
+EBUILD syntax-highlighting-5.77.0-r1.ebuild 705 BLAKE2B 877f84072b86d7ae017c28f8975363e5168195463469e2869ab846189c7a1b8cf83e168b42e105e3510ab9d6eb6cda3f50bc5a2063edf8decc59ca02d751a5aa SHA512 5b7d6071e36777038bea287618d65ef074c367a634690de80bb4864a0cfef9545bbe52ac1131bf646c128257cd892fd610b63889779a28df6b18cea0fbcff887
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bashfix-1.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bashfix-1.patch
deleted file mode 100644
index d9e71832c878..000000000000
--- a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bashfix-1.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From f6607c869cf0f5113d657f713fc35fd66a13b8f1 Mon Sep 17 00:00:00 2001
-From: Jonathan Poelen <jonathan.poelen@gmail.com>
-Date: Sun, 6 Dec 2020 16:25:16 +0000
-Subject: [PATCH] Bash: add (...), ||, && in [[ ... ]] ; add backquote in [ ...
- ] and [[ ... ]]
-
----
- data/syntax/bash.xml                  | 72 ++++++++++++++++++---------
- 6 files changed, 84 insertions(+), 23 deletions(-)
-
-diff --git a/data/syntax/bash.xml b/data/syntax/bash.xml
-index f76b008c..3b8824df 100644
---- a/data/syntax/bash.xml
-+++ b/data/syntax/bash.xml
-@@ -28,7 +28,7 @@
-         <!ENTITY heredocq "(?|&quot;([^&quot;]+)&quot;|'([^']+)'|\\(.[^&wordseps;&substseps;]*))">
- ]>
- 
--<language name="Bash" version="15" kateversion="5.62" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-+<language name="Bash" version="16" kateversion="5.62" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
- 
- <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
-     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
-@@ -495,7 +495,7 @@
-       </context>
-       <context attribute="Normal Text" lineEndContext="#pop" name="MaybeBracketExpression" fallthroughContext="#pop!Command">
-         <!-- start expression in double brackets -->
--        <RegExpr attribute="Keyword" context="ExprDblBracket" String="\[\[&eos;" beginRegion="expression"/>
-+        <RegExpr attribute="Keyword" context="ExprDblBracket" String="\[\[(?=$|[ &tab;(])" beginRegion="expression"/>
-         <!-- start expression in single brackets -->
-         <RegExpr attribute="Builtin" context="ExprBracket" String="\[&eos;" beginRegion="expression"/>
-       </context>
-@@ -642,6 +642,9 @@
-         <IncludeRules context="FindWord"/>
-         <DetectChar context="NormalMaybeBraceExpansion" char="{" lookAhead="1"/>
-         <IncludeRules context="FindPathThenPop"/>
-+        <IncludeRules context="FindNormalTextOption"/>
-+      </context>
-+      <context attribute="Normal Text" lineEndContext="#stay" name="FindNormalTextOption">
-         <RegExpr attribute="Normal Text" context="#stay" String="[^&wordseps;&substseps;]+"/>
-       </context>
-       <context attribute="Normal Text" lineEndContext="#pop" name="OptionMaybeBraceExpansion">
-@@ -1146,33 +1149,40 @@
- 
-       <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketNot" fallthroughContext="#pop!ExprBracketParam1">
-         <DetectSpaces attribute="Normal Text" context="#pop!ExprBracketParam1"/>
--        <DetectChar context="ExprBracketTestMaybeNot" char="!" lookAhead="1"/>
-+        <Detect2Chars attribute="Expression" context="ExprBracketTestMaybeNot" char="!" char1=" " lookAhead="1"/>
-+        <Detect2Chars attribute="Expression" context="ExprBracketTestMaybeNot" char="!" char1="&tab;" lookAhead="1"/>
-       </context>
--      <context attribute="Normal Text" lineEndContext="#pop" name="ExprBracketTestMaybeNot" fallthroughContext="#pop#pop!ExprBracketParam1">
--        <RegExpr attribute="Expression" context="#pop" String="!(?=[ &tab;])"/>
-+      <context attribute="Normal Text" lineEndContext="#pop" name="ExprBracketTestMaybeNot">
-+        <DetectChar attribute="Expression" context="#pop" char="!"/>
-       </context>
- 
--      <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketParam1" fallthroughContext="NormalOption">
-+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketParam1" fallthroughContext="ExprBracketValue">
-         <DetectSpaces attribute="Normal Text" context="#pop!ExprBracketParam2"/>
-         <DetectChar context="TestMaybeUnary" char="-" lookAhead="1"/>
-         <IncludeRules context="FindExprBracketEnd"/>
-+      </context>
-+
-+      <context attribute="Normal Text" lineEndContext="#pop" name="ExprBracketValue">
-         <AnyChar attribute="Error" context="#stay" String="&symbolseps;"/>
-+        <AnyChar context="#pop" String=" &tab;" lookAhead="1"/>
-+        <IncludeRules context="FindWord"/>
-+        <DetectChar context="NormalMaybeBraceExpansion" char="{" lookAhead="1"/>
-+        <IncludeRules context="FindPathThenPop"/>
-+        <IncludeRules context="FindNormalTextOption"/>
-       </context>
- 
--      <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketParam2" fallthroughContext="NormalOption">
-+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketParam2" fallthroughContext="ExprBracketValue">
-         <DetectSpaces attribute="Normal Text" context="#pop!ExprBracketParam3"/>
-         <AnyChar context="TestMaybeBinary" String="-=!" lookAhead="1"/>
-         <IncludeRules context="FindExprBracketEnd"/>
--        <AnyChar attribute="Error" context="#stay" String="&symbolseps;"/>
-       </context>
- 
--      <context attribute="Normal Text" lineEndContext="ExprBracketFinal" name="ExprBracketParam3" fallthroughContext="NormalOption">
-+      <context attribute="Normal Text" lineEndContext="ExprBracketFinal" name="ExprBracketParam3" fallthroughContext="ExprBracketValue">
-         <DetectSpaces attribute="Normal Text" context="#pop!ExprBracketFinal"/>
-         <IncludeRules context="FindExprBracketEnd"/>
--        <AnyChar attribute="Error" context="#stay" String="&symbolseps;"/>
-       </context>
- 
--      <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketFinal" fallthroughContext="NormalOption">
-+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketFinal" fallthroughContext="ExprBracketValue">
-         <DetectSpaces attribute="Normal Text" context="#stay"/>
-         <IncludeRules context="FindExprBracketEnd"/>
-         <RegExpr attribute="Error" context="#pop" String="(?:[^] &tab;]++|\][^ &tab;])++" endRegion="expression"/>
-@@ -1183,10 +1193,10 @@
-         <RegExpr attribute="Builtin" context="#pop" String="\](?=($|[ &tab;;|&amp;&lt;>]))" endRegion="expression"/>
-       </context>
- 
--      <context attribute="Normal Text" lineEndContext="#pop" name="TestMaybeUnary" fallthroughContext="#pop!NormalOption">
-+      <context attribute="Normal Text" lineEndContext="#pop" name="TestMaybeUnary" fallthroughContext="#pop!ExprBracketValue">
-         <RegExpr attribute="Expression" context="#pop" String="-[abcdefghkprstuwxGLNOSovRnz](?=[ &tab;])"/>
-       </context>
--      <context attribute="Normal Text" lineEndContext="#pop" name="TestMaybeBinary" fallthroughContext="#pop!NormalOption">
-+      <context attribute="Normal Text" lineEndContext="#pop" name="TestMaybeBinary" fallthroughContext="#pop!ExprBracketValue">
-         <RegExpr attribute="Expression" context="#pop" String="(?:-(?:e[fq]|[nolg]t|[nlg]e)|==?|!=)(?=[ &tab;])"/>
-       </context>
- 
-@@ -1202,40 +1212,56 @@
-         <DetectChar context="ExprDblBracketTestMaybeNot" char="!" lookAhead="1"/>
-       </context>
-       <context attribute="Normal Text" lineEndContext="#pop" name="ExprDblBracketTestMaybeNot" fallthroughContext="#pop#pop!ExprDblBracketParam1">
--        <IncludeRules context="ExprBracketTestMaybeNot"/>
-+        <RegExpr attribute="Expression" context="#pop" String="!(?=$|[ &tab;(])"/>
-       </context>
- 
--      <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketParam1" fallthroughContext="NormalOption">
-+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketParam1" fallthroughContext="ExprDblBracketValue">
-         <DetectSpaces attribute="Normal Text" context="#pop!ExprDblBracketParam2"/>
-         <DetectChar context="TestMaybeUnary" char="-" lookAhead="1"/>
-         <AnyChar attribute="Expression" context="#pop!ExprDblBracketParam3Spe" String="&lt;>"/>
-         <IncludeRules context="FindExprDblBracketEnd"/>
--        <AnyChar attribute="Error" context="#stay" String="&symbolseps;"/>
-       </context>
- 
--      <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketParam2" fallthroughContext="NormalOption">
-+      <context attribute="Normal Text" lineEndContext="#pop" name="ExprDblBracketValue">
-+        <Detect2Chars attribute="Keyword" context="ExprDblParen" char="(" char1="(" beginRegion="expression"/>
-+        <DetectChar context="ExprDblBracketSubValue" char="(" lookAhead="1"/>
-+        <DetectChar attribute="Operator" context="#pop#pop" char=")"/>
-+        <Detect2Chars attribute="Control" context="#pop#pop!ExprDblBracket" char="&amp;" char1="&amp;"/>
-+        <Detect2Chars attribute="Control" context="#pop#pop!ExprDblBracket" char="|" char1="|"/>
-+        <AnyChar attribute="Error" context="#stay" String="|&amp;;)"/>
-+        <AnyChar context="#pop" String=" &tab;&lt;>" lookAhead="1"/>
-+        <IncludeRules context="FindWord"/>
-+        <DetectChar context="NormalMaybeBraceExpansion" char="{" lookAhead="1"/>
-+        <IncludeRules context="FindPathThenPop"/>
-+        <IncludeRules context="FindNormalTextOption"/>
-+      </context>
-+      <context attribute="Normal Text" lineEndContext="#pop" name="ExprDblBracketSubValue" fallthroughContext="#pop">
-+        <DetectChar attribute="Operator" context="ExprDblBracketNot" char="("/>
-+        <Detect2Chars context="#pop#pop" char="]" char1="]" lookAhead="1"/>
-+      </context>
-+
-+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketParam2" fallthroughContext="ExprDblBracketValue">
-         <DetectSpaces attribute="Normal Text" context="#pop!ExprDblBracketParam3"/>
-         <AnyChar context="TestMaybeBinary2" String="-=!" lookAhead="1"/>
-         <AnyChar attribute="Expression" context="#pop!ExprDblBracketParam3Spe" String="&lt;>"/>
-         <IncludeRules context="FindExprDblBracketEnd"/>
--        <AnyChar attribute="Error" context="#stay" String="&symbolseps;"/>
-       </context>
--      <context attribute="Normal Text" lineEndContext="#pop" name="TestMaybeBinary2" fallthroughContext="#pop!NormalOption">
-+      <context attribute="Normal Text" lineEndContext="#pop" name="TestMaybeBinary2" fallthroughContext="#pop!ExprDblBracketValue">
-         <IncludeRules context="TestMaybeBinary"/>
--        <RegExpr attribute="Expression" context="#pop#pop!ExprDblBracketRegex" String="=~(?=[ &tab;])"/>
-+        <RegExpr attribute="Expression" context="#pop#pop!ExprDblBracketRegex" String="=~(?=[ &tab;(])"/>
-       </context>
- 
-       <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketParam3Spe" fallthroughContext="#pop!ExprDblBracketParam3">
-         <DetectSpaces attribute="Normal Text" context="#pop!ExprDblBracketParam3"/>
-       </context>
- 
--      <context attribute="Normal Text" lineEndContext="ExprDblBracketFinal" name="ExprDblBracketParam3" fallthroughContext="NormalOption">
-+      <context attribute="Normal Text" lineEndContext="ExprDblBracketFinal" name="ExprDblBracketParam3" fallthroughContext="ExprDblBracketValue">
-         <DetectSpaces attribute="Normal Text" context="#pop!ExprDblBracketFinal"/>
-         <IncludeRules context="FindExprDblBracketEnd"/>
--        <AnyChar attribute="Error" context="#stay" String="&symbolseps;"/>
-+        <AnyChar attribute="Error" context="#stay" String="&lt;>"/>
-       </context>
- 
--      <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketFinal" fallthroughContext="NormalOption">
-+      <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketFinal" fallthroughContext="ExprDblBracketValue">
-         <DetectSpaces attribute="Normal Text" context="#stay"/>
-         <IncludeRules context="FindExprDblBracketEnd"/>
-         <RegExpr attribute="Error" context="#pop" String="(?:[^] &tab;]++|\](?:[^]]|\][^ &tab;]))++" endRegion="expression"/>
--- 
-GitLab
diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bashfix-2.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bashfix-2.patch
deleted file mode 100644
index 3ff4bdc01315..000000000000
--- a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bashfix-2.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From b232881ed1ecc010b8a13c6aa295bbdddc87c70b Mon Sep 17 00:00:00 2001
-From: Jonathan Poelen <jonathan.poelen@gmail.com>
-Date: Thu, 10 Dec 2020 02:11:29 +0100
-Subject: [PATCH] fix && and || in a subcontext and fix function name pattern
-
----
- data/syntax/bash.xml                  | 10 ++++++----
- 6 files changed, 46 insertions(+), 4 deletions(-)
-
-diff --git a/data/syntax/bash.xml b/data/syntax/bash.xml
-index 3b8824df..70cee765 100644
---- a/data/syntax/bash.xml
-+++ b/data/syntax/bash.xml
-@@ -2,7 +2,7 @@
- <!DOCTYPE language SYSTEM "language.dtd"
- [
-         <!ENTITY tab      "&#009;">
--        <!ENTITY funcname "[A-Za-z_:][A-Za-z0-9_:#&#37;@-]*">
-+        <!ENTITY funcname "([^&_fragpathseps;{}=#$]|[+!@](?!\())([^&_fragpathseps;{}=$]*+([+!@](?!\())?+)*+">
-         <!ENTITY varname  "[A-Za-z_][A-Za-z0-9_]*">
-         <!ENTITY eos      "(?=$|[ &tab;])">                 <!-- eol or space following -->
-         <!ENTITY eoexpr   "(?=$|[ &tab;&lt;>|&amp;;])">
-@@ -28,7 +28,7 @@
-         <!ENTITY heredocq "(?|&quot;([^&quot;]+)&quot;|'([^']+)'|\\(.[^&wordseps;&substseps;]*))">
- ]>
- 
--<language name="Bash" version="16" kateversion="5.62" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-+<language name="Bash" version="17" kateversion="5.62" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;*.nix;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;APKBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
- 
- <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
-     Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
-@@ -471,8 +471,8 @@
-         <Detect2Chars attribute="Redirection" context="FdRedirection" char="&amp;" char1=">"/>
- 
-         <!-- handle branche conditions -->
--        <Detect2Chars attribute="Control" context="#pop" char="&amp;" char1="&amp;"/>
--        <Detect2Chars attribute="Control" context="#pop" char="|" char1="|"/>
-+        <Detect2Chars attribute="Control" context="#stay" char="&amp;" char1="&amp;"/>
-+        <Detect2Chars attribute="Control" context="#stay" char="|" char1="|"/>
- 
-         <!-- handle &, |, ; -->
-         <AnyChar attribute="Control" context="#stay" String="&amp;|;"/>
-@@ -1269,6 +1269,8 @@
- 
-       <context attribute="Normal Text" lineEndContext="#stay" name="FindExprDblBracketEnd">
-         <LineContinue attribute="Escape" context="#stay"/>
-+        <Detect2Chars attribute="Control" context="#pop!ExprDblBracket" char="&amp;" char1="&amp;"/>
-+        <Detect2Chars attribute="Control" context="#pop!ExprDblBracket" char="|" char1="|"/>
-         <RegExpr attribute="Keyword" context="#pop" String="\]\](?=($|[ &tab;;|&amp;]))" endRegion="expression"/>
-       </context>
- 
--- 
-GitLab
-
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r1.ebuild
index 947c290db845..536d033a9cfb 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r1.ebuild
@@ -8,6 +8,8 @@ QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Framework for syntax highlighting"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-bash-zsh-fixes.patch.xz"
+
 LICENSE="MIT"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="nls"
@@ -23,7 +25,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-bashfix-{1,2}.patch )
+PATCHES=( "${WORKDIR}"/${P}-bash-zsh-fixes.patch )
 
 src_install() {
 	ecm_src_install