[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/syntax-highlighting/files/, kde-frameworks/syntax-highlighting/

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/syntax-highlighting/files/, kde-frameworks/syntax-highlighting/

[Andreas Sturmlechner]

commit:     9fb0fb0616581cd4388c2d981a9802b1c582c015
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 10 20:35:22 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 10 20:35:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fb0fb06

kde-frameworks/syntax-highlighting: Fix tests

Reported-by: Kent Fredric <kentnl <AT> gentoo.org>
Gentoo-bug: 624438

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 .../files/syntax-highlighting-5.36.0-tests.patch   | 335 +++++++++++++++++++++
 .../syntax-highlighting-5.36.0.ebuild              |   2 +
 2 files changed, 337 insertions(+)

diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.36.0-tests.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.36.0-tests.patch
new file mode 100644
index 00000000000..f9656247198
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.36.0-tests.patch
@@ -0,0 +1,335 @@
+From 7c861d948f766f9624a13d0ee7af03ba9d4cef48 Mon Sep 17 00:00:00 2001
+From: Dominik Haumann <dhaumann@kde.org>
+Date: Mon, 10 Jul 2017 22:01:42 +0200
+Subject: Haskell: fix unit tests
+
+BUG: 382169
+---
+ autotests/folding/highlight.hs.fold  |  10 ++
+ autotests/html/highlight.hs.html     |  10 ++
+ autotests/reference/highlight.hs.ref |   4 +-
+ data/syntax/haskell.xml              | 198 +++++++++++++++++------------------
+ 4 files changed, 121 insertions(+), 101 deletions(-)
+
+diff --git a/autotests/folding/highlight.hs.fold b/autotests/folding/highlight.hs.fold
+index 4aa90e2..9b41478 100644
+--- a/autotests/folding/highlight.hs.fold
++++ b/autotests/folding/highlight.hs.fold
+@@ -122,3 +122,13 @@ RealFrac, Real, Show
+ -- data constructors
+ 
+ EQ, False, GT, Just, LT, Left, Nothing, Right, True
++
++-- pragma with compiler flags
++
++{-# OPTIONS_GHC -fno-warn-orphans #-}
++
++-- multiline pragma with language extensions
++
++{-# LANGUAGE OverlappingInstances,
++             BangPatterns
++#-}
+diff --git a/autotests/html/highlight.hs.html b/autotests/html/highlight.hs.html
+index 0551dc0..664d9f4 100644
+--- a/autotests/html/highlight.hs.html
++++ b/autotests/html/highlight.hs.html
+@@ -128,4 +128,14 @@ justtesting''	<span style="color:#b08000;">9</span>	<span style="color:#644a9b;"
+ <span style="color:#898887;">-- data constructors</span>
+ 
+ <span style="font-weight:bold;">EQ</span>, <span style="font-weight:bold;">False</span>, <span style="font-weight:bold;">GT</span>, <span style="font-weight:bold;">Just</span>, <span style="font-weight:bold;">LT</span>, <span style="font-weight:bold;">Left</span>, <span style="font-weight:bold;">Nothing</span>, <span style="font-weight:bold;">Right</span>, <span style="font-weight:bold;">True</span>
++
++<span style="color:#898887;">-- pragma with compiler flags</span>
++
++<span style="color:#006e28;">{-# OPTIONS_GHC -fno-warn-orphans #-}</span>
++
++<span style="color:#898887;">-- multiline pragma with language extensions</span>
++
++<span style="color:#006e28;">{-# LANGUAGE OverlappingInstances,</span>
++             <span style="color:#0057ae;">BangPatterns</span>
++<span style="color:#006e28;">#-}</span>
+ </pre></body></html>
+diff --git a/autotests/reference/highlight.hs.ref b/autotests/reference/highlight.hs.ref
+index cc05ebf..5b9a108 100644
+--- a/autotests/reference/highlight.hs.ref
++++ b/autotests/reference/highlight.hs.ref
+@@ -130,5 +130,5 @@
+ <Comment>-- multiline pragma with language extensions</Comment><br/>
+ <dsNormal></dsNormal><br/>
+ <Pragma>{-# LANGUAGE OverlappingInstances,</Pragma><br/>
+-<Pragma>             BangPatterns</Pragma><br/>
+-<Pragma>#-}</Pragma><br/>
++<Normal>             </Normal><Type>BangPatterns</Type><br/>
++<C Preprocessor>#-}</C Preprocessor><br/>
+diff --git a/data/syntax/haskell.xml b/data/syntax/haskell.xml
+index d0fa213..e5d54bd 100644
+--- a/data/syntax/haskell.xml
++++ b/data/syntax/haskell.xml
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="Haskell" version="6" kateversion="3.4" section="Sources" extensions="*.hs;*.chs" mimetype="text/x-haskell" author="Nicolas Wu (zenzike@gmail.com)" license="LGPL" indenter="haskell" style="haskell">
++<language name="Haskell" version="7" kateversion="3.4" section="Sources" extensions="*.hs;*.chs" mimetype="text/x-haskell" author="Nicolas Wu (zenzike@gmail.com)" license="LGPL" indenter="haskell" style="haskell">
+   <highlighting>
+   <list name="keywords">
+     <item> case </item>
+@@ -335,124 +335,124 @@
+     <item> hiding </item>
+   </list>
+   <list name="language_pragmas">
+-    <item> OverlappingInstances </item>
+-    <item> UndecidableInstances </item>
+-    <item> IncoherentInstances </item>
++    <item> AllowAmbiguousTypes </item>
++    <item> ApplicativeDo </item>
++    <item> Arrows </item>
++    <item> AutoDeriveTypeable </item>
++    <item> BangPatterns </item>
++    <item> BinaryLiterals </item>
++    <item> CApiFFI </item>
++    <item> CPP </item>
++    <item> ConstrainedClassMethods </item>
++    <item> ConstraintKinds </item>
++    <item> DataKinds </item>
++    <item> DatatypeContexts </item>
++    <item> DefaultSignatures </item>
++    <item> DeriveAnyClass </item>
++    <item> DeriveDataTypeable </item>
++    <item> DeriveFoldable </item>
++    <item> DeriveFunctor </item>
++    <item> DeriveGeneric </item>
++    <item> DeriveLift </item>
++    <item> DeriveTraversable </item>
++    <item> DisambiguateRecordFields </item>
++    <item> DoAndIfThenElse </item>
+     <item> DoRec </item>
+-    <item> RecursiveDo </item>
+-    <item> ParallelListComp </item>
+-    <item> MultiParamTypeClasses </item>
+-    <item> MonomorphismRestriction </item>
+-    <item> FunctionalDependencies </item>
+-    <item> Rank2Types </item>
+-    <item> RankNTypes </item>
+-    <item> PolymorphicComponents </item>
++    <item> DuplicateRecordFields </item>
++    <item> EmptyCase </item>
++    <item> EmptyDataDecls </item>
+     <item> ExistentialQuantification </item>
+-    <item> ScopedTypeVariables </item>
+-    <item> PatternSignatures </item>
+-    <item> ImplicitParams </item>
++    <item> ExplicitForAll </item>
++    <item> ExplicitNamespaces </item>
++    <item> ExtendedDefaultRules </item>
++    <item> ExtensibleRecords </item>
+     <item> FlexibleContexts </item>
+     <item> FlexibleInstances </item>
+-    <item> EmptyDataDecls </item>
+-    <item> CPP </item>
+-    <item> KindSignatures </item>
+-    <item> BangPatterns </item>
+-    <item> TypeSynonymInstances </item>
+-    <item> TemplateHaskell </item>
+     <item> ForeignFunctionInterface </item>
+-    <item> Arrows </item>
+-    <item> Generics </item>
+-    <item> ImplicitPrelude </item>
+-    <item> NamedFieldPuns </item>
+-    <item> PatternGuards </item>
++    <item> FunctionalDependencies </item>
++    <item> GADTSyntax </item>
++    <item> GADTs </item>
++    <item> GHCForeignImportPrim </item>
+     <item> GeneralizedNewtypeDeriving </item>
+-    <item> ExtensibleRecords </item>
+-    <item> RestrictedTypeSynonyms </item>
++    <item> Generics </item>
+     <item> HereDocuments </item>
+-    <item> MagicHash </item>
+-    <item> TypeFamilies </item>
+-    <item> StandaloneDeriving </item>
+-    <item> UnicodeSyntax </item>
+-    <item> UnliftedFFITypes </item>
++    <item> ImplicitParams </item>
++    <item> ImplicitPrelude </item>
++    <item> ImpredicativeTypes </item>
++    <item> IncoherentInstances </item>
++    <item> InstanceSigs </item>
+     <item> InterruptibleFFI </item>
+-    <item> CApiFFI </item>
++    <item> JavaScriptFFI </item>
++    <item> KindSignatures </item>
++    <item> LambdaCase </item>
+     <item> LiberalTypeSynonyms </item>
+-    <item> TypeOperators </item>
+-    <item> RecordWildCards </item>
+-    <item> RecordPuns </item>
+-    <item> DisambiguateRecordFields </item>
+-    <item> TraditionalRecordSyntax </item>
+-    <item> OverloadedStrings </item>
+-    <item> GADTs </item>
+-    <item> GADTSyntax </item>
++    <item> MagicHash </item>
++    <item> MonadComprehensions </item>
++    <item> MonadFailDesugaring </item>
++    <item> MonoLocalBinds </item>
+     <item> MonoPatBinds </item>
+-    <item> RelaxedPolyRec </item>
+-    <item> ExtendedDefaultRules </item>
+-    <item> UnboxedTuples </item>
+-    <item> DeriveDataTypeable </item>
+-    <item> DeriveGeneric </item>
+-    <item> DefaultSignatures </item>
+-    <item> InstanceSigs </item>
+-    <item> ConstrainedClassMethods </item>
+-    <item> PackageImports </item>
+-    <item> ImpredicativeTypes </item>
++    <item> MonomorphismRestriction </item>
++    <item> MultiParamTypeClasses </item>
++    <item> MultiWayIf </item>
++    <item> NPlusKPatterns </item>
++    <item> NamedFieldPuns </item>
++    <item> NamedWildCards </item>
++    <item> NegativeLiterals </item>
+     <item> NewQualifiedOperators </item>
++    <item> NondecreasingIndentation </item>
++    <item> NullaryTypeClasses </item>
++    <item> NumDecimals </item>
++    <item> OverlappingInstances </item>
++    <item> OverloadedLabels </item>
++    <item> OverloadedLists </item>
++    <item> OverloadedStrings </item>
++    <item> PackageImports </item>
++    <item> ParallelArrays </item>
++    <item> ParallelListComp </item>
++    <item> PartialTypeSignatures </item>
++    <item> PatternGuards </item>
++    <item> PatternSignatures </item>
++    <item> PatternSynonyms </item>
++    <item> PolyKinds </item>
++    <item> PolymorphicComponents </item>
+     <item> PostfixOperators </item>
+     <item> QuasiQuotes </item>
+-    <item> TransformListComp </item>
+-    <item> MonadComprehensions </item>
+-    <item> ViewPatterns </item>
+-    <item> XmlSyntax </item>
+-    <item> RegularPatterns </item>
+-    <item> TupleSections </item>
+-    <item> GHCForeignImportPrim </item>
+-    <item> NPlusKPatterns </item>
+-    <item> DoAndIfThenElse </item>
+-    <item> MultiWayIf </item>
+-    <item> LambdaCase </item>
++    <item> Rank2Types </item>
++    <item> RankNTypes </item>
+     <item> RebindableSyntax </item>
+-    <item> ExplicitForAll </item>
+-    <item> DatatypeContexts </item>
+-    <item> MonoLocalBinds </item>
+-    <item> DeriveFunctor </item>
+-    <item> DeriveTraversable </item>
+-    <item> DeriveFoldable </item>
+-    <item> NondecreasingIndentation </item>
+-    <item> SafeImports </item>
+-    <item> Safe </item>
+-    <item> Trustworthy </item>
+-    <item> Unsafe </item>
+-    <item> ConstraintKinds </item>
+-    <item> PolyKinds </item>
+-    <item> DataKinds </item>
+-    <item> ParallelArrays </item>
++    <item> RecordPuns </item>
++    <item> RecordWildCards </item>
++    <item> RecursiveDo </item>
++    <item> RegularPatterns </item>
++    <item> RelaxedPolyRec </item>
++    <item> RestrictedTypeSynonyms </item>
+     <item> RoleAnnotations </item>
+-    <item> OverloadedLists </item>
+-    <item> EmptyCase </item>
+-    <item> AutoDeriveTypeable </item>
+-    <item> NegativeLiterals </item>
+-    <item> BinaryLiterals </item>
+-    <item> NumDecimals </item>
+-    <item> NullaryTypeClasses </item>
+-    <item> ExplicitNamespaces </item>
+-    <item> AllowAmbiguousTypes </item>
+-    <item> JavaScriptFFI </item>
+-    <item> PatternSynonyms </item>
+-    <item> PartialTypeSignatures </item>
+-    <item> NamedWildCards </item>
+-    <item> DeriveAnyClass </item>
+-    <item> DeriveLift </item>
++    <item> Safe </item>
++    <item> SafeImports </item>
++    <item> ScopedTypeVariables </item>
++    <item> StandaloneDeriving </item>
+     <item> StaticPointers </item>
+-    <item> StrictData </item>
+     <item> Strict </item>
+-    <item> ApplicativeDo </item>
+-    <item> DuplicateRecordFields </item>
++    <item> StrictData </item>
++    <item> TemplateHaskell </item>
++    <item> TemplateHaskellQuotes </item>
++    <item> TraditionalRecordSyntax </item>
++    <item> TransformListComp </item>
++    <item> Trustworthy </item>
++    <item> TupleSections </item>
+     <item> TypeApplications </item>
++    <item> TypeFamilies </item>
+     <item> TypeInType </item>
++    <item> TypeOperators </item>
++    <item> TypeSynonymInstances </item>
++    <item> UnboxedTuples </item>
++    <item> UndecidableInstances </item>
+     <item> UndecidableSuperClasses </item>
+-    <item> MonadFailDesugaring </item>
+-    <item> TemplateHaskellQuotes </item>
+-    <item> OverloadedLabels </item>
++    <item> UnicodeSyntax </item>
++    <item> UnliftedFFITypes </item>
++    <item> Unsafe </item>
++    <item> ViewPatterns </item>
++    <item> XmlSyntax </item>
+   </list>
+   <contexts>
+     <context attribute="Normal" lineEndContext="#stay" name="code">
+-- 
+cgit v0.11.2
+From efd1968c4a82f5a27dacf2147d555e68beee3c23 Mon Sep 17 00:00:00 2001
+From: Dominik Haumann <dhaumann@kde.org>
+Date: Mon, 10 Jul 2017 22:10:44 +0200
+Subject: Haskell: next attempt to fix unit tests
+
+---
+ autotests/html/highlight.hs.html     | 2 +-
+ autotests/reference/highlight.hs.ref | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/autotests/html/highlight.hs.html b/autotests/html/highlight.hs.html
+index 664d9f4..d38d237 100644
+--- a/autotests/html/highlight.hs.html
++++ b/autotests/html/highlight.hs.html
+@@ -136,6 +136,6 @@ justtesting''	<span style="color:#b08000;">9</span>	<span style="color:#644a9b;"
+ <span style="color:#898887;">-- multiline pragma with language extensions</span>
+ 
+ <span style="color:#006e28;">{-# LANGUAGE OverlappingInstances,</span>
+-             <span style="color:#0057ae;">BangPatterns</span>
++<span style="color:#006e28;">             BangPatterns</span>
+ <span style="color:#006e28;">#-}</span>
+ </pre></body></html>
+diff --git a/autotests/reference/highlight.hs.ref b/autotests/reference/highlight.hs.ref
+index 5b9a108..cc05ebf 100644
+--- a/autotests/reference/highlight.hs.ref
++++ b/autotests/reference/highlight.hs.ref
+@@ -130,5 +130,5 @@
+ <Comment>-- multiline pragma with language extensions</Comment><br/>
+ <dsNormal></dsNormal><br/>
+ <Pragma>{-# LANGUAGE OverlappingInstances,</Pragma><br/>
+-<Normal>             </Normal><Type>BangPatterns</Type><br/>
+-<C Preprocessor>#-}</C Preprocessor><br/>
++<Pragma>             BangPatterns</Pragma><br/>
++<Pragma>#-}</Pragma><br/>
+-- 
+cgit v0.11.2

diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.36.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.36.0.ebuild
index d8e1b700f08..5c96bc1c51c 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.36.0.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.36.0.ebuild
@@ -21,6 +21,8 @@ DEPEND="${RDEPEND}
 	nls? ( $(add_qt_dep linguist-tools) )
 "
 
+PATCHES=( "${FILESDIR}/${P}-tests.patch" )
+
 src_install() {
 	kde5_src_install
 	dobin "${BUILD_DIR}"/src/indexer/katehighlightingindexer

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/syntax-highlighting/files/, kde-frameworks/syntax-highlighting/

[Andreas Sturmlechner]

commit:     8e7ac3383dbcc492e23b26d9c70db7724eb011ff
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 23 18:53:58 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 23 19:30:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7ac338

kde-frameworks/syntax-highlighting: Fix build and plaintext highlighting

KDE-bug: 383848, 383632
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../syntax-highlighting-5.37.0-powershell.patch    | 40 ++++++++++
 .../files/syntax-highlighting-5.37.0-regexp.patch  | 86 ++++++++++++++++++++++
 .../syntax-highlighting-5.37.0-r1.ebuild           | 32 ++++++++
 3 files changed, 158 insertions(+)

diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-powershell.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-powershell.patch
new file mode 100644
index 00000000000..5da7999dffb
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-powershell.patch
@@ -0,0 +1,40 @@
+From 26daf7ee5b4a4534d918ed7d9e66d64cb30b0c26 Mon Sep 17 00:00:00 2001
+From: Till Schfer <till2.schaefer@tu-dortmund.de>
+Date: Tue, 22 Aug 2017 18:47:04 +0200
+Subject: fix: plaintext is highlighted as powershell
+
+Summary: see [[ https://bugs.kde.org/show_bug.cgi?id=383848 | Bug 383848 ]]
+
+Reviewers: #framework_syntax_hightlighting, vkrause
+
+Reviewed By: #framework_syntax_hightlighting, vkrause
+
+Subscribers: dhaumann, #framework_syntax_hightlighting
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D7464
+---
+ data/syntax/powershell.xml | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/data/syntax/powershell.xml b/data/syntax/powershell.xml
+index 3a38846..2b73cfe 100644
+--- a/data/syntax/powershell.xml
++++ b/data/syntax/powershell.xml
+@@ -1,11 +1,10 @@
+ <!DOCTYPE language SYSTEM "language.dtd">
+ <language
+   name="PowerShell"
+-  version="1"
++  version="2"
+   kateversion="5.0"
+   extensions="*.ps1;*.ps1m;*.ps1d"
+   section="Scripts"
+-  mimetype="text/plain"
+   author="Motoki Kashihara (motoki8791@gmail.com); Michael Lombardi (Michael.T.Lombardi@outlook.com)"
+   casesensitive="0"
+   license="LGPLv2+">
+-- 
+cgit v0.11.2
+

diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-regexp.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-regexp.patch
new file mode 100644
index 00000000000..f0a87e6d76d
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.37.0-regexp.patch
@@ -0,0 +1,86 @@
+From ad077e4045e650e1708b6c81d33a14f4a9c99a5d Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Wed, 23 Aug 2017 12:28:52 +0200
+Subject: Escape hyphen in rest.xml regular expressions
+
+Summary:
+The unescaped hyphen caused a build failure with pcre2-10.30 due to a broken
+regex: 'syntax-highlighting/data/syntax/rest.xml" line 27 broken regex:
+"^\\s*\\.\\. [w-_\\.]+::(\\s|$)" problem: "range out of order in character
+class" at offset 12'.
+
+The pcre2pattern documentation says this:
+
+"Perl treats a hyphen as a literal if it appears before or after a POSIX class
+(see below) or before or after a character type escape such as as \d or \H.
+However, unless the hyphen is the last character in the class, Perl outputs a
+warning in its warning mode, as this is most likely a user error. As PCRE2 has
+no facility for warning, an error is given in these cases."
+
+Test Plan:
+cmake && make && make test works fine pcre2-10.30, quick look at
+http://docutils.sourceforge.net/FAQ.txt in kate seems fine.
+
+Reviewers: #framework_syntax_hightlighting, kfunk
+
+Subscribers: #frameworks
+
+Tags: #frameworks
+
+BUG: 383632
+
+Differential Revision: https://phabricator.kde.org/D7478
+---
+ data/syntax/rest.xml | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/data/syntax/rest.xml b/data/syntax/rest.xml
+index 1363965..ccfd08a 100644
+--- a/data/syntax/rest.xml
++++ b/data/syntax/rest.xml
+@@ -11,7 +11,7 @@
+   Copyright 2010 Matt Williams (matt@milliams.com)
+   Copyright 2014 Matthew Woehlke (mw_triad@users.sourceforge.net)
+   -->
+-<language name="reStructuredText" extensions="*.rst" section="Markup" mimetype="text/x-rst" version="2" kateversion="2.4" casesensitive="1">
++<language name="reStructuredText" extensions="*.rst" section="Markup" mimetype="text/x-rst" version="3" kateversion="2.4" casesensitive="1">
+ 
+   <highlighting>
+ 
+@@ -24,11 +24,11 @@
+         <RegExpr attribute="Citation" context="#stay" String="^\s*\.\. \[[&SimpleReferenceNameChars;]+\]\s" minimal="true" column="0"/>
+         <RegExpr attribute="HyperlinkTarget" context="#stay" String="^\s*(\.\. (__:|_[&SimpleReferenceNameChars; ]+:(\s|$))|__ )" minimal="true" column="0"/>
+         <RegExpr attribute="Code" String="^\s*\.\. code-block::" context="CodeBlock" column="0"/>
+-        <RegExpr attribute="Directive" context="#stay" String="^\s*\.\. [\w-_\.]+::(\s|$)" minimal="true" column="0"/>
++        <RegExpr attribute="Directive" context="#stay" String="^\s*\.\. [\w\-_\.]+::(\s|$)" minimal="true" column="0"/>
+         <RegExpr attribute="Code" String="::$" context="CodeBlock" />
+         <RegExpr attribute="SubstitutionDefinition" context="#stay" String="^\s*\.\. \|[&SimpleReferenceNameChars; ]+\|\s+[&SimpleReferenceNameChars;]+::\s" minimal="true" column="0"/>
+         <RegExpr attribute="Field" String=":(?=([^:]*\\:)*[^:]*:(\s|$))" context="Field" firstNonSpace="true"/>
+-        <RegExpr attribute="Comment" context="Comment" String="^(\s*)\.\.\s(?![\w-_\.]+::(\s|$))" column="0"/>
++        <RegExpr attribute="Comment" context="Comment" String="^(\s*)\.\.\s(?![\w\-_\.]+::(\s|$))" column="0"/>
+       </context>
+ 
+       <context name="InlineMarkup" attribute="Normal" lineEndContext="#stay">
+@@ -38,8 +38,8 @@
+         <RegExpr attribute="FootnoteReference" context="#stay" String="&inlinestart;\[[&SimpleReferenceNameChars;]+\]_&inlineend;" minimal="true"/>
+         <RegExpr attribute="HyperlinkReference" context="#stay" String="&inlinestart;`[^\s].*`_&inlineend;" minimal="true"/>
+         <RegExpr attribute="HyperlinkReference" context="#stay" String="&inlinestart;\w+_&inlineend;" minimal="true"/>
+-        <RegExpr attribute="InterpretedText" context="TrailingRole" String="&inlinestart;`[^\s].*`(?=:[\w-_\.\+]+:)" minimal="true"/>
+-        <RegExpr attribute="Role" String=":[\w-_\.\+]+:(?=`)" context="Role"/>
++        <RegExpr attribute="InterpretedText" context="TrailingRole" String="&inlinestart;`[^\s].*`(?=:[\w\-_\.\+]+:)" minimal="true"/>
++        <RegExpr attribute="Role" String=":[\w\-_\.\+]+:(?=`)" context="Role"/>
+       </context>
+ 
+       <context name="Field" attribute="Field" lineEndContext="#stay">
+@@ -56,7 +56,7 @@
+         <DetectChar attribute="InterpretedText" char="`" context="#pop!InterpretedText" />
+       </context>
+       <context name="TrailingRole" attribute="Role" lineEndContext="#pop">
+-        <RegExpr attribute="Role" String=":[\w-_\.\+]+:" context="#pop"/>
++        <RegExpr attribute="Role" String=":[\w\-_\.\+]+:" context="#pop"/>
+       </context>
+       <context name="Comment" attribute="Comment" lineEndContext="#stay" dynamic="true">
+         <RegExpr attribute="Code" String="^%1   " context="#stay" column="0" dynamic="true"/>
+-- 
+cgit v0.11.2
+

diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.37.0-r1.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.37.0-r1.ebuild
new file mode 100644
index 00000000000..f97fb595e7c
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.37.0-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Framework for syntax highlighting"
+LICENSE="LGPL-2+ LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtxmlpatterns)
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-powershell.patch"
+	"${FILESDIR}/${P}-regexp.patch"
+)
+
+src_install() {
+	kde5_src_install
+	dobin "${BUILD_DIR}"/src/indexer/katehighlightingindexer
+}

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/syntax-highlighting/files/, kde-frameworks/syntax-highlighting/

[Andreas Sturmlechner]

commit:     bf5e888dc8750035086b4e51358335f1d4ade924
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 14 01:21:10 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jan 14 01:23:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5e888d

kde-frameworks/syntax-highlighting: Fix another bash/zsh syntax bug

See also: https://invent.kde.org/frameworks/syntax-highlighting/-/issues/5

Reported-by: Toralf Förster <toralf <AT> gentoo.org>
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../syntax-highlighting-5.77.0-bash-zsh-fix.patch  | 122 +++++++++++++++++++++
 ...ntax-highlighting-5.77.0-bash-zsh-version.patch |  39 +++++++
 .../syntax-highlighting-5.77.0-r2.ebuild           |  37 +++++++
 .../syntax-highlighting-5.78.0-r1.ebuild           |  33 ++++++
 4 files changed, 231 insertions(+)

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 00000000000..2ec92edb9c8
--- /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;">&quot;double quoted string&quot;</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;">$&quot;</span><span style="color:#f44f4f;">string meant to be translated&quot;</span>
++<span style="color:#7f8c8d;">echo</span> <span style="color:#f44f4f;">&quot;$&quot;</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;">&quot;double quoted string&quot;</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;">$&quot;</span><span style="color:#bf0303;">string meant to be translated&quot;</span>
++<span style="color:#644a9b;font-weight:bold;">echo</span> <span style="color:#bf0303;">&quot;$&quot;</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 "(?|&quot;([^&quot;]+)&quot;|'([^']+)'|\\(.[^&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][-+]?&int;)">
+ ]>
+-<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 00000000000..2a7f2684bfb
--- /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 "(?|&quot;([^&quot;]+)&quot;|'([^']+)'|\\(.[^&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][-+]?&int;)">
+ ]>
+-<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/syntax-highlighting-5.77.0-r2.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r2.ebuild
new file mode 100644
index 00000000000..3d8083137a2
--- /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.78.0-r1.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.78.0-r1.ebuild
new file mode 100644
index 00000000000..4dabf263ae7
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.78.0-r1.ebuild
@@ -0,0 +1,33 @@
+# 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"
+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=(
+	"${FILESDIR}"/${PN}-5.77.0-bash-zsh-fix.patch
+)
+
+src_install() {
+	ecm_src_install
+	dobin "${BUILD_DIR}"/bin/katehighlightingindexer
+}

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/syntax-highlighting/files/, kde-frameworks/syntax-highlighting/

[Andreas Sturmlechner]

commit:     4230dca33a11857c158993079bf0a87a22c1c2c2
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 09:18:46 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 12:57:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4230dca3

kde-frameworks/syntax-highlighting: Drop 5.77.0-r2

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../syntax-highlighting-5.77.0-bash-zsh-fix.patch  | 122 ---------------------
 ...ntax-highlighting-5.77.0-bash-zsh-version.patch |  39 -------
 .../syntax-highlighting-5.77.0-r2.ebuild           |  37 -------
 3 files changed, 198 deletions(-)

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
deleted file mode 100644
index 2ec92edb9c8..00000000000
--- a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-fix.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-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;">&quot;double quoted string&quot;</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;">$&quot;</span><span style="color:#f44f4f;">string meant to be translated&quot;</span>
-+<span style="color:#7f8c8d;">echo</span> <span style="color:#f44f4f;">&quot;$&quot;</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;">&quot;double quoted string&quot;</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;">$&quot;</span><span style="color:#bf0303;">string meant to be translated&quot;</span>
-+<span style="color:#644a9b;font-weight:bold;">echo</span> <span style="color:#bf0303;">&quot;$&quot;</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 "(?|&quot;([^&quot;]+)&quot;|'([^']+)'|\\(.[^&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][-+]?&int;)">
- ]>
--<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
deleted file mode 100644
index 2a7f2684bfb..00000000000
--- a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bash-zsh-version.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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 "(?|&quot;([^&quot;]+)&quot;|'([^']+)'|\\(.[^&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][-+]?&int;)">
- ]>
--<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/syntax-highlighting-5.77.0-r2.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r2.ebuild
deleted file mode 100644
index 24d0f786f3e..00000000000
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0-r2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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
-}