diff options
Diffstat (limited to 'kde-frameworks/syntax-highlighting')
| -rw-r--r-- | kde-frameworks/syntax-highlighting/Manifest | 3 | ||||
| -rw-r--r-- | kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-fix.patch | 122 | ||||
| -rw-r--r-- | kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-version.patch | 39 | ||||
| -rw-r--r-- | kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bashfix-1.patch | 174 | ||||
| -rw-r--r-- | kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bashfix-2.patch | 54 | ||||
| -rw-r--r-- | kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r1.ebuild (renamed from kde-frameworks/syntax-highlighting/syntax-highlighting-5.74.0.ebuild) | 8 | ||||
| -rw-r--r-- | kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r2.ebuild | 37 | ||||
| -rw-r--r-- | kde-frameworks/syntax-highlighting/syntax-highlighting-5.78.0-r1.ebuild (renamed from kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0.ebuild) | 6 |
8 files changed, 210 insertions, 233 deletions
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest index 2fc8c08a2dad..f04e8a1a33c3 100644 --- a/kde-frameworks/syntax-highlighting/Manifest +++ b/kde-frameworks/syntax-highlighting/Manifest @@ -1,2 +1,3 @@ -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 +DIST syntax-highlighting-5.78.0.tar.xz 2201352 BLAKE2B 6cd72e85d43d5061a490da6ff13f16c6e3ad2decd4efc65b8a5ec82f1815102bab0a546cd929a8ce82bccc163a809efb8cc5c82ecba98a410d0debef16b47884 SHA512 e9d47f69a14a890a4c5c0e9c33cce51fa6fef93d5c50b565b4d6e2d1978cddd8ffb4239534ddb02decf75190ec3b5446ca387901cda9f27f59088b6853c76843 diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-fix.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-fix.patch new file mode 100644 index 000000000000..2ec92edb9c8f --- /dev/null +++ b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-fix.patch @@ -0,0 +1,122 @@ +From ba9b3c5e0ed2fb33b9a896ec910590410978befe Mon Sep 17 00:00:00 2001 +From: Jonathan Poelen <jonathan.poelen@gmail.com> +Date: Mon, 11 Jan 2021 01:29:01 +0100 +Subject: [PATCH] Bash: fix #5: $ at the end of a double quoted string + +--- + autotests/folding/highlight.sh.fold | 1 + + autotests/html/highlight.sh.dark.html | 1 + + autotests/html/highlight.sh.html | 1 + + autotests/input/highlight.sh | 1 + + autotests/reference/highlight.sh.ref | 1 + + data/syntax/bash.xml | 5 +++-- + data/syntax/zsh.xml | 3 +-- + 7 files changed, 9 insertions(+), 4 deletions(-) + +diff --git a/autotests/folding/highlight.sh.fold b/autotests/folding/highlight.sh.fold +index 652fef8f..d7a6b210 100644 +--- a/autotests/folding/highlight.sh.fold ++++ b/autotests/folding/highlight.sh.fold +@@ -16,6 +16,7 @@ echo 'single quoted string' + echo "double quoted string" + echo $'string with esc\apes\x0din it' + echo $"string meant to be translated" ++echo "$" + + + # comments: +diff --git a/autotests/html/highlight.sh.dark.html b/autotests/html/highlight.sh.dark.html +index d1d4fb8a..8cbd0929 100644 +--- a/autotests/html/highlight.sh.dark.html ++++ b/autotests/html/highlight.sh.dark.html +@@ -22,6 +22,7 @@ + <span style="color:#7f8c8d;">echo</span> <span style="color:#f44f4f;">"double quoted string"</span> + <span style="color:#7f8c8d;">echo</span> <span style="color:#f44f4f;">$'string with esc</span><span style="color:#2980b9;">\a</span><span style="color:#f44f4f;">pes</span><span style="color:#2980b9;">\x0d</span><span style="color:#f44f4f;">in it'</span> + <span style="color:#7f8c8d;">echo</span> <span style="color:#f44f4f;">$"</span><span style="color:#f44f4f;">string meant to be translated"</span> ++<span style="color:#7f8c8d;">echo</span> <span style="color:#f44f4f;">"$"</span> + + + <span style="color:#7a7c7d;"># comments:</span> +diff --git a/autotests/html/highlight.sh.html b/autotests/html/highlight.sh.html +index 5d687d86..d176b1cb 100644 +--- a/autotests/html/highlight.sh.html ++++ b/autotests/html/highlight.sh.html +@@ -22,6 +22,7 @@ + <span style="color:#644a9b;font-weight:bold;">echo</span> <span style="color:#bf0303;">"double quoted string"</span> + <span style="color:#644a9b;font-weight:bold;">echo</span> <span style="color:#bf0303;">$'string with esc</span><span style="color:#0057ae;">\a</span><span style="color:#bf0303;">pes</span><span style="color:#0057ae;">\x0d</span><span style="color:#bf0303;">in it'</span> + <span style="color:#644a9b;font-weight:bold;">echo</span> <span style="color:#bf0303;">$"</span><span style="color:#bf0303;">string meant to be translated"</span> ++<span style="color:#644a9b;font-weight:bold;">echo</span> <span style="color:#bf0303;">"$"</span> + + + <span style="color:#898887;"># comments:</span> +diff --git a/autotests/input/highlight.sh b/autotests/input/highlight.sh +index 177e104f..5c2ae7b1 100644 +--- a/autotests/input/highlight.sh ++++ b/autotests/input/highlight.sh +@@ -16,6 +16,7 @@ echo 'single quoted string' + echo "double quoted string" + echo $'string with esc\apes\x0din it' + echo $"string meant to be translated" ++echo "$" + + + # comments: +diff --git a/autotests/reference/highlight.sh.ref b/autotests/reference/highlight.sh.ref +index 181c36af..edaf18ab 100644 +--- a/autotests/reference/highlight.sh.ref ++++ b/autotests/reference/highlight.sh.ref +@@ -16,6 +16,7 @@ + <Builtin>echo</Builtin><Normal Text> </Normal Text><String DoubleQ>"double quoted string"</String DoubleQ><br/> + <Builtin>echo</Builtin><Normal Text> </Normal Text><String SingleQ>$'string with esc</String SingleQ><String Escape>\a</String Escape><String SingleQ>pes</String SingleQ><String Escape>\x0d</String Escape><String SingleQ>in it'</String SingleQ><br/> + <Builtin>echo</Builtin><Normal Text> </Normal Text><String Transl.>$"</String Transl.><String DoubleQ>string meant to be translated"</String DoubleQ><br/> ++<Builtin>echo</Builtin><Normal Text> </Normal Text><String DoubleQ>"$"</String DoubleQ><br/> + <Normal Text></Normal Text><br/> + <Normal Text></Normal Text><br/> + <Comment># comments:</Comment><br/> +diff --git a/data/syntax/bash.xml b/data/syntax/bash.xml +index 3171247b..3b804f90 100644 +--- a/data/syntax/bash.xml ++++ b/data/syntax/bash.xml +@@ -30,7 +30,7 @@ + <!ENTITY heredocq "(?|"([^"]+)"|'([^']+)'|\\(.[^&wordseps;&substseps;]*))"> + ]> + +-<language name="Bash" version="20" 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="21" 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) +@@ -943,7 +943,8 @@ + <DetectChar attribute="Backquote" context="RegularBackq" char="`"/> + </context> + <context attribute="String DoubleQ" lineEndContext="#stay" name="StringDQDispatchVariables"> +- <IncludeRules context="DispatchVariables"/> ++ <IncludeRules context="DispatchSubstVariables"/> ++ <IncludeRules context="DispatchVarnameVariables"/> + <DetectChar attribute="String DoubleQ" context="#pop" char="$"/> + </context> + <context attribute="String DoubleQ" lineEndContext="#pop" name="StringDQEscape"> +diff --git a/data/syntax/zsh.xml b/data/syntax/zsh.xml +index ada258c8..5aa83290 100644 +--- a/data/syntax/zsh.xml ++++ b/data/syntax/zsh.xml +@@ -55,7 +55,7 @@ + <!ENTITY int "(?:[0-9]++(_++[0-9]++)*+)"> + <!ENTITY exp "(?:[eE][-+]?∫)"> + ]> +-<language name="Zsh" version="12" kateversion="5.62" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Poelen (jonathan.poelen@gmail.com)" license="MIT"> ++<language name="Zsh" version="13" kateversion="5.62" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Poelen (jonathan.poelen@gmail.com)" license="MIT"> + + <highlighting> + <list name="keywords"> +@@ -893,7 +893,6 @@ + </context> + <context attribute="String DoubleQ" lineEndContext="#stay" name="StringDQDispatchVariables"> + <IncludeRules context="DispatchSubstVariables"/> +- <Detect2Chars attribute="String SingleQ" context="#pop!StringEsc" char="$" char1="'"/> + <IncludeRules context="DispatchVarNameVariables"/> + <DetectChar attribute="String DoubleQ" context="#pop" char="$"/> + </context> +-- +GitLab + diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-version.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-version.patch new file mode 100644 index 000000000000..2a7f2684bfb8 --- /dev/null +++ b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-version.patch @@ -0,0 +1,39 @@ +From 70b56cf8b3d1a85e15d1e09aa8490e5183967de0 Mon Sep 17 00:00:00 2001 +From: Christoph Cullmann <cullmann@kde.org> +Date: Wed, 30 Dec 2020 17:35:48 +0100 +Subject: [PATCH] increment version + +--- + data/syntax/bash.xml | 2 +- + data/syntax/zsh.xml | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/syntax/bash.xml b/data/syntax/bash.xml +index 676b630d..3171247b 100644 +--- a/data/syntax/bash.xml ++++ b/data/syntax/bash.xml +@@ -30,7 +30,7 @@ + <!ENTITY heredocq "(?|"([^"]+)"|'([^']+)'|\\(.[^&wordseps;&substseps;]*))"> + ]> + +-<language name="Bash" version="19" 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="20" 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) +diff --git a/data/syntax/zsh.xml b/data/syntax/zsh.xml +index 120b345e..ada258c8 100644 +--- a/data/syntax/zsh.xml ++++ b/data/syntax/zsh.xml +@@ -55,7 +55,7 @@ + <!ENTITY int "(?:[0-9]++(_++[0-9]++)*+)"> + <!ENTITY exp "(?:[eE][-+]?∫)"> + ]> +-<language name="Zsh" version="11" kateversion="5.62" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Poelen (jonathan.poelen@gmail.com)" license="MIT"> ++<language name="Zsh" version="12" kateversion="5.62" section="Scripts" extensions="*.sh;*.zsh;.zshrc;.zprofile;.zlogin;.zlogout;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Jonathan Poelen (jonathan.poelen@gmail.com)" license="MIT"> + + <highlighting> + <list name="keywords"> +-- +2.30.0 + 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 "(?|"([^"]+)"|'([^']+)'|\\(.[^&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;;|&<>]))" 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="<>"/> - <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="&" char1="&"/> -+ <Detect2Chars attribute="Control" context="#pop#pop!ExprDblBracket" char="|" char1="|"/> -+ <AnyChar attribute="Error" context="#stay" String="|&;)"/> -+ <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="#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="<>"/> - <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="<>"/> - </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 "	"> -- <!ENTITY funcname "[A-Za-z_:][A-Za-z0-9_:#%@-]*"> -+ <!ENTITY funcname "([^&_fragpathseps;{}=#$]|[+!@](?!\())([^&_fragpathseps;{}=$]*+([+!@](?!\())?+)*+"> - <!ENTITY varname "[A-Za-z_][A-Za-z0-9_]*"> - <!ENTITY eos "(?=$|[ &tab;])"> <!-- eol or space following --> - <!ENTITY eoexpr "(?=$|[ &tab;<>|&;])"> -@@ -28,7 +28,7 @@ - <!ENTITY heredocq "(?|"([^"]+)"|'([^']+)'|\\(.[^&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="&" char1=">"/> - - <!-- handle branche conditions --> -- <Detect2Chars attribute="Control" context="#pop" char="&" char1="&"/> -- <Detect2Chars attribute="Control" context="#pop" char="|" char1="|"/> -+ <Detect2Chars attribute="Control" context="#stay" char="&" char1="&"/> -+ <Detect2Chars attribute="Control" context="#stay" char="|" char1="|"/> - - <!-- handle &, |, ; --> - <AnyChar attribute="Control" context="#stay" String="&|;"/> -@@ -1269,6 +1269,8 @@ - - <context attribute="Normal Text" lineEndContext="#stay" name="FindExprDblBracketEnd"> - <LineContinue attribute="Escape" context="#stay"/> -+ <Detect2Chars attribute="Control" context="#pop!ExprDblBracket" char="&" char1="&"/> -+ <Detect2Chars attribute="Control" context="#pop!ExprDblBracket" char="|" char1="|"/> - <RegExpr attribute="Keyword" context="#pop" String="\]\](?=($|[ &tab;;|&]))" endRegion="expression"/> - </context> - --- -GitLab - diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.74.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r1.ebuild index 0103a86f2ae5..64899ef1ca10 100644 --- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.74.0.ebuild +++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r1.ebuild @@ -1,13 +1,15 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 ECM_TEST="forceoptional" -QTMIN=5.14.2 +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,6 +25,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${WORKDIR}"/${P}-bash-zsh-fixes.patch ) + src_install() { ecm_src_install dobin "${BUILD_DIR}"/bin/katehighlightingindexer diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r2.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r2.ebuild new file mode 100644 index 000000000000..3d8083137a2b --- /dev/null +++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="forceoptional" +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" + +BDEPEND=" + dev-lang/perl + nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) +" +DEPEND=" + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtxmlpatterns-${QTMIN}:5 +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${WORKDIR}"/${P}-bash-zsh-fixes.patch + "${FILESDIR}"/${PN}-5.77.0-bash-zsh-version.patch + "${FILESDIR}"/${PN}-5.77.0-bash-zsh-fix.patch +) + +src_install() { + ecm_src_install + dobin "${BUILD_DIR}"/bin/katehighlightingindexer +} diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.78.0-r1.ebuild index 947c290db845..4dabf263ae74 100644 --- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0.ebuild +++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.78.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,7 +23,9 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}"/${P}-bashfix-{1,2}.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-5.77.0-bash-zsh-fix.patch +) src_install() { ecm_src_install |