1 |
commit: a09789a57128d368e19c70c5d5e63b20b849dce6 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Dec 31 15:08:04 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 31 15:38:41 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a09789a5 |
7 |
|
8 |
kde-frameworks/syntax-highlighting: Drop 5.77.0 (r0) |
9 |
|
10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
.../syntax-highlighting-5.77.0-bashfix-1.patch | 174 --------------------- |
14 |
.../syntax-highlighting-5.77.0-bashfix-2.patch | 54 ------- |
15 |
.../syntax-highlighting-5.77.0.ebuild | 31 ---- |
16 |
3 files changed, 259 deletions(-) |
17 |
|
18 |
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 |
19 |
deleted file mode 100644 |
20 |
index d9e71832c87..00000000000 |
21 |
--- a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bashfix-1.patch |
22 |
+++ /dev/null |
23 |
@@ -1,174 +0,0 @@ |
24 |
-From f6607c869cf0f5113d657f713fc35fd66a13b8f1 Mon Sep 17 00:00:00 2001 |
25 |
-From: Jonathan Poelen <jonathan.poelen@×××××.com> |
26 |
-Date: Sun, 6 Dec 2020 16:25:16 +0000 |
27 |
-Subject: [PATCH] Bash: add (...), ||, && in [[ ... ]] ; add backquote in [ ... |
28 |
- ] and [[ ... ]] |
29 |
- |
30 |
---- |
31 |
- data/syntax/bash.xml | 72 ++++++++++++++++++--------- |
32 |
- 6 files changed, 84 insertions(+), 23 deletions(-) |
33 |
- |
34 |
-diff --git a/data/syntax/bash.xml b/data/syntax/bash.xml |
35 |
-index f76b008c..3b8824df 100644 |
36 |
---- a/data/syntax/bash.xml |
37 |
-+++ b/data/syntax/bash.xml |
38 |
-@@ -28,7 +28,7 @@ |
39 |
- <!ENTITY heredocq "(?|"([^"]+)"|'([^']+)'|\\(.[^&wordseps;&substseps;]*))"> |
40 |
- ]> |
41 |
- |
42 |
--<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@×××.nl)" license="LGPL"> |
43 |
-+<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@×××.nl)" license="LGPL"> |
44 |
- |
45 |
- <!-- (c) 2004 by Wilbert Berendsen (wilbert@×××.nl) |
46 |
- Changes by Matthew Woehlke (mw_triad@×××××××××××××××××.net) |
47 |
-@@ -495,7 +495,7 @@ |
48 |
- </context> |
49 |
- <context attribute="Normal Text" lineEndContext="#pop" name="MaybeBracketExpression" fallthroughContext="#pop!Command"> |
50 |
- <!-- start expression in double brackets --> |
51 |
-- <RegExpr attribute="Keyword" context="ExprDblBracket" String="\[\[&eos;" beginRegion="expression"/> |
52 |
-+ <RegExpr attribute="Keyword" context="ExprDblBracket" String="\[\[(?=$|[ &tab;(])" beginRegion="expression"/> |
53 |
- <!-- start expression in single brackets --> |
54 |
- <RegExpr attribute="Builtin" context="ExprBracket" String="\[&eos;" beginRegion="expression"/> |
55 |
- </context> |
56 |
-@@ -642,6 +642,9 @@ |
57 |
- <IncludeRules context="FindWord"/> |
58 |
- <DetectChar context="NormalMaybeBraceExpansion" char="{" lookAhead="1"/> |
59 |
- <IncludeRules context="FindPathThenPop"/> |
60 |
-+ <IncludeRules context="FindNormalTextOption"/> |
61 |
-+ </context> |
62 |
-+ <context attribute="Normal Text" lineEndContext="#stay" name="FindNormalTextOption"> |
63 |
- <RegExpr attribute="Normal Text" context="#stay" String="[^&wordseps;&substseps;]+"/> |
64 |
- </context> |
65 |
- <context attribute="Normal Text" lineEndContext="#pop" name="OptionMaybeBraceExpansion"> |
66 |
-@@ -1146,33 +1149,40 @@ |
67 |
- |
68 |
- <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketNot" fallthroughContext="#pop!ExprBracketParam1"> |
69 |
- <DetectSpaces attribute="Normal Text" context="#pop!ExprBracketParam1"/> |
70 |
-- <DetectChar context="ExprBracketTestMaybeNot" char="!" lookAhead="1"/> |
71 |
-+ <Detect2Chars attribute="Expression" context="ExprBracketTestMaybeNot" char="!" char1=" " lookAhead="1"/> |
72 |
-+ <Detect2Chars attribute="Expression" context="ExprBracketTestMaybeNot" char="!" char1="&tab;" lookAhead="1"/> |
73 |
- </context> |
74 |
-- <context attribute="Normal Text" lineEndContext="#pop" name="ExprBracketTestMaybeNot" fallthroughContext="#pop#pop!ExprBracketParam1"> |
75 |
-- <RegExpr attribute="Expression" context="#pop" String="!(?=[ &tab;])"/> |
76 |
-+ <context attribute="Normal Text" lineEndContext="#pop" name="ExprBracketTestMaybeNot"> |
77 |
-+ <DetectChar attribute="Expression" context="#pop" char="!"/> |
78 |
- </context> |
79 |
- |
80 |
-- <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketParam1" fallthroughContext="NormalOption"> |
81 |
-+ <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketParam1" fallthroughContext="ExprBracketValue"> |
82 |
- <DetectSpaces attribute="Normal Text" context="#pop!ExprBracketParam2"/> |
83 |
- <DetectChar context="TestMaybeUnary" char="-" lookAhead="1"/> |
84 |
- <IncludeRules context="FindExprBracketEnd"/> |
85 |
-+ </context> |
86 |
-+ |
87 |
-+ <context attribute="Normal Text" lineEndContext="#pop" name="ExprBracketValue"> |
88 |
- <AnyChar attribute="Error" context="#stay" String="&symbolseps;"/> |
89 |
-+ <AnyChar context="#pop" String=" &tab;" lookAhead="1"/> |
90 |
-+ <IncludeRules context="FindWord"/> |
91 |
-+ <DetectChar context="NormalMaybeBraceExpansion" char="{" lookAhead="1"/> |
92 |
-+ <IncludeRules context="FindPathThenPop"/> |
93 |
-+ <IncludeRules context="FindNormalTextOption"/> |
94 |
- </context> |
95 |
- |
96 |
-- <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketParam2" fallthroughContext="NormalOption"> |
97 |
-+ <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketParam2" fallthroughContext="ExprBracketValue"> |
98 |
- <DetectSpaces attribute="Normal Text" context="#pop!ExprBracketParam3"/> |
99 |
- <AnyChar context="TestMaybeBinary" String="-=!" lookAhead="1"/> |
100 |
- <IncludeRules context="FindExprBracketEnd"/> |
101 |
-- <AnyChar attribute="Error" context="#stay" String="&symbolseps;"/> |
102 |
- </context> |
103 |
- |
104 |
-- <context attribute="Normal Text" lineEndContext="ExprBracketFinal" name="ExprBracketParam3" fallthroughContext="NormalOption"> |
105 |
-+ <context attribute="Normal Text" lineEndContext="ExprBracketFinal" name="ExprBracketParam3" fallthroughContext="ExprBracketValue"> |
106 |
- <DetectSpaces attribute="Normal Text" context="#pop!ExprBracketFinal"/> |
107 |
- <IncludeRules context="FindExprBracketEnd"/> |
108 |
-- <AnyChar attribute="Error" context="#stay" String="&symbolseps;"/> |
109 |
- </context> |
110 |
- |
111 |
-- <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketFinal" fallthroughContext="NormalOption"> |
112 |
-+ <context attribute="Normal Text" lineEndContext="#stay" name="ExprBracketFinal" fallthroughContext="ExprBracketValue"> |
113 |
- <DetectSpaces attribute="Normal Text" context="#stay"/> |
114 |
- <IncludeRules context="FindExprBracketEnd"/> |
115 |
- <RegExpr attribute="Error" context="#pop" String="(?:[^] &tab;]++|\][^ &tab;])++" endRegion="expression"/> |
116 |
-@@ -1183,10 +1193,10 @@ |
117 |
- <RegExpr attribute="Builtin" context="#pop" String="\](?=($|[ &tab;;|&<>]))" endRegion="expression"/> |
118 |
- </context> |
119 |
- |
120 |
-- <context attribute="Normal Text" lineEndContext="#pop" name="TestMaybeUnary" fallthroughContext="#pop!NormalOption"> |
121 |
-+ <context attribute="Normal Text" lineEndContext="#pop" name="TestMaybeUnary" fallthroughContext="#pop!ExprBracketValue"> |
122 |
- <RegExpr attribute="Expression" context="#pop" String="-[abcdefghkprstuwxGLNOSovRnz](?=[ &tab;])"/> |
123 |
- </context> |
124 |
-- <context attribute="Normal Text" lineEndContext="#pop" name="TestMaybeBinary" fallthroughContext="#pop!NormalOption"> |
125 |
-+ <context attribute="Normal Text" lineEndContext="#pop" name="TestMaybeBinary" fallthroughContext="#pop!ExprBracketValue"> |
126 |
- <RegExpr attribute="Expression" context="#pop" String="(?:-(?:e[fq]|[nolg]t|[nlg]e)|==?|!=)(?=[ &tab;])"/> |
127 |
- </context> |
128 |
- |
129 |
-@@ -1202,40 +1212,56 @@ |
130 |
- <DetectChar context="ExprDblBracketTestMaybeNot" char="!" lookAhead="1"/> |
131 |
- </context> |
132 |
- <context attribute="Normal Text" lineEndContext="#pop" name="ExprDblBracketTestMaybeNot" fallthroughContext="#pop#pop!ExprDblBracketParam1"> |
133 |
-- <IncludeRules context="ExprBracketTestMaybeNot"/> |
134 |
-+ <RegExpr attribute="Expression" context="#pop" String="!(?=$|[ &tab;(])"/> |
135 |
- </context> |
136 |
- |
137 |
-- <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketParam1" fallthroughContext="NormalOption"> |
138 |
-+ <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketParam1" fallthroughContext="ExprDblBracketValue"> |
139 |
- <DetectSpaces attribute="Normal Text" context="#pop!ExprDblBracketParam2"/> |
140 |
- <DetectChar context="TestMaybeUnary" char="-" lookAhead="1"/> |
141 |
- <AnyChar attribute="Expression" context="#pop!ExprDblBracketParam3Spe" String="<>"/> |
142 |
- <IncludeRules context="FindExprDblBracketEnd"/> |
143 |
-- <AnyChar attribute="Error" context="#stay" String="&symbolseps;"/> |
144 |
- </context> |
145 |
- |
146 |
-- <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketParam2" fallthroughContext="NormalOption"> |
147 |
-+ <context attribute="Normal Text" lineEndContext="#pop" name="ExprDblBracketValue"> |
148 |
-+ <Detect2Chars attribute="Keyword" context="ExprDblParen" char="(" char1="(" beginRegion="expression"/> |
149 |
-+ <DetectChar context="ExprDblBracketSubValue" char="(" lookAhead="1"/> |
150 |
-+ <DetectChar attribute="Operator" context="#pop#pop" char=")"/> |
151 |
-+ <Detect2Chars attribute="Control" context="#pop#pop!ExprDblBracket" char="&" char1="&"/> |
152 |
-+ <Detect2Chars attribute="Control" context="#pop#pop!ExprDblBracket" char="|" char1="|"/> |
153 |
-+ <AnyChar attribute="Error" context="#stay" String="|&;)"/> |
154 |
-+ <AnyChar context="#pop" String=" &tab;<>" lookAhead="1"/> |
155 |
-+ <IncludeRules context="FindWord"/> |
156 |
-+ <DetectChar context="NormalMaybeBraceExpansion" char="{" lookAhead="1"/> |
157 |
-+ <IncludeRules context="FindPathThenPop"/> |
158 |
-+ <IncludeRules context="FindNormalTextOption"/> |
159 |
-+ </context> |
160 |
-+ <context attribute="Normal Text" lineEndContext="#pop" name="ExprDblBracketSubValue" fallthroughContext="#pop"> |
161 |
-+ <DetectChar attribute="Operator" context="ExprDblBracketNot" char="("/> |
162 |
-+ <Detect2Chars context="#pop#pop" char="]" char1="]" lookAhead="1"/> |
163 |
-+ </context> |
164 |
-+ |
165 |
-+ <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketParam2" fallthroughContext="ExprDblBracketValue"> |
166 |
- <DetectSpaces attribute="Normal Text" context="#pop!ExprDblBracketParam3"/> |
167 |
- <AnyChar context="TestMaybeBinary2" String="-=!" lookAhead="1"/> |
168 |
- <AnyChar attribute="Expression" context="#pop!ExprDblBracketParam3Spe" String="<>"/> |
169 |
- <IncludeRules context="FindExprDblBracketEnd"/> |
170 |
-- <AnyChar attribute="Error" context="#stay" String="&symbolseps;"/> |
171 |
- </context> |
172 |
-- <context attribute="Normal Text" lineEndContext="#pop" name="TestMaybeBinary2" fallthroughContext="#pop!NormalOption"> |
173 |
-+ <context attribute="Normal Text" lineEndContext="#pop" name="TestMaybeBinary2" fallthroughContext="#pop!ExprDblBracketValue"> |
174 |
- <IncludeRules context="TestMaybeBinary"/> |
175 |
-- <RegExpr attribute="Expression" context="#pop#pop!ExprDblBracketRegex" String="=~(?=[ &tab;])"/> |
176 |
-+ <RegExpr attribute="Expression" context="#pop#pop!ExprDblBracketRegex" String="=~(?=[ &tab;(])"/> |
177 |
- </context> |
178 |
- |
179 |
- <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketParam3Spe" fallthroughContext="#pop!ExprDblBracketParam3"> |
180 |
- <DetectSpaces attribute="Normal Text" context="#pop!ExprDblBracketParam3"/> |
181 |
- </context> |
182 |
- |
183 |
-- <context attribute="Normal Text" lineEndContext="ExprDblBracketFinal" name="ExprDblBracketParam3" fallthroughContext="NormalOption"> |
184 |
-+ <context attribute="Normal Text" lineEndContext="ExprDblBracketFinal" name="ExprDblBracketParam3" fallthroughContext="ExprDblBracketValue"> |
185 |
- <DetectSpaces attribute="Normal Text" context="#pop!ExprDblBracketFinal"/> |
186 |
- <IncludeRules context="FindExprDblBracketEnd"/> |
187 |
-- <AnyChar attribute="Error" context="#stay" String="&symbolseps;"/> |
188 |
-+ <AnyChar attribute="Error" context="#stay" String="<>"/> |
189 |
- </context> |
190 |
- |
191 |
-- <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketFinal" fallthroughContext="NormalOption"> |
192 |
-+ <context attribute="Normal Text" lineEndContext="#stay" name="ExprDblBracketFinal" fallthroughContext="ExprDblBracketValue"> |
193 |
- <DetectSpaces attribute="Normal Text" context="#stay"/> |
194 |
- <IncludeRules context="FindExprDblBracketEnd"/> |
195 |
- <RegExpr attribute="Error" context="#pop" String="(?:[^] &tab;]++|\](?:[^]]|\][^ &tab;]))++" endRegion="expression"/> |
196 |
--- |
197 |
-GitLab |
198 |
|
199 |
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 |
200 |
deleted file mode 100644 |
201 |
index 3ff4bdc0131..00000000000 |
202 |
--- a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.77.0-bashfix-2.patch |
203 |
+++ /dev/null |
204 |
@@ -1,54 +0,0 @@ |
205 |
-From b232881ed1ecc010b8a13c6aa295bbdddc87c70b Mon Sep 17 00:00:00 2001 |
206 |
-From: Jonathan Poelen <jonathan.poelen@×××××.com> |
207 |
-Date: Thu, 10 Dec 2020 02:11:29 +0100 |
208 |
-Subject: [PATCH] fix && and || in a subcontext and fix function name pattern |
209 |
- |
210 |
---- |
211 |
- data/syntax/bash.xml | 10 ++++++---- |
212 |
- 6 files changed, 46 insertions(+), 4 deletions(-) |
213 |
- |
214 |
-diff --git a/data/syntax/bash.xml b/data/syntax/bash.xml |
215 |
-index 3b8824df..70cee765 100644 |
216 |
---- a/data/syntax/bash.xml |
217 |
-+++ b/data/syntax/bash.xml |
218 |
-@@ -2,7 +2,7 @@ |
219 |
- <!DOCTYPE language SYSTEM "language.dtd" |
220 |
- [ |
221 |
- <!ENTITY tab "	"> |
222 |
-- <!ENTITY funcname "[A-Za-z_:][A-Za-z0-9_:#%@-]*"> |
223 |
-+ <!ENTITY funcname "([^&_fragpathseps;{}=#$]|[+!@](?!\())([^&_fragpathseps;{}=$]*+([+!@](?!\())?+)*+"> |
224 |
- <!ENTITY varname "[A-Za-z_][A-Za-z0-9_]*"> |
225 |
- <!ENTITY eos "(?=$|[ &tab;])"> <!-- eol or space following --> |
226 |
- <!ENTITY eoexpr "(?=$|[ &tab;<>|&;])"> |
227 |
-@@ -28,7 +28,7 @@ |
228 |
- <!ENTITY heredocq "(?|"([^"]+)"|'([^']+)'|\\(.[^&wordseps;&substseps;]*))"> |
229 |
- ]> |
230 |
- |
231 |
--<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@×××.nl)" license="LGPL"> |
232 |
-+<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@×××.nl)" license="LGPL"> |
233 |
- |
234 |
- <!-- (c) 2004 by Wilbert Berendsen (wilbert@×××.nl) |
235 |
- Changes by Matthew Woehlke (mw_triad@×××××××××××××××××.net) |
236 |
-@@ -471,8 +471,8 @@ |
237 |
- <Detect2Chars attribute="Redirection" context="FdRedirection" char="&" char1=">"/> |
238 |
- |
239 |
- <!-- handle branche conditions --> |
240 |
-- <Detect2Chars attribute="Control" context="#pop" char="&" char1="&"/> |
241 |
-- <Detect2Chars attribute="Control" context="#pop" char="|" char1="|"/> |
242 |
-+ <Detect2Chars attribute="Control" context="#stay" char="&" char1="&"/> |
243 |
-+ <Detect2Chars attribute="Control" context="#stay" char="|" char1="|"/> |
244 |
- |
245 |
- <!-- handle &, |, ; --> |
246 |
- <AnyChar attribute="Control" context="#stay" String="&|;"/> |
247 |
-@@ -1269,6 +1269,8 @@ |
248 |
- |
249 |
- <context attribute="Normal Text" lineEndContext="#stay" name="FindExprDblBracketEnd"> |
250 |
- <LineContinue attribute="Escape" context="#stay"/> |
251 |
-+ <Detect2Chars attribute="Control" context="#pop!ExprDblBracket" char="&" char1="&"/> |
252 |
-+ <Detect2Chars attribute="Control" context="#pop!ExprDblBracket" char="|" char1="|"/> |
253 |
- <RegExpr attribute="Keyword" context="#pop" String="\]\](?=($|[ &tab;;|&]))" endRegion="expression"/> |
254 |
- </context> |
255 |
- |
256 |
--- |
257 |
-GitLab |
258 |
- |
259 |
|
260 |
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0.ebuild |
261 |
deleted file mode 100644 |
262 |
index 947c290db84..00000000000 |
263 |
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0.ebuild |
264 |
+++ /dev/null |
265 |
@@ -1,31 +0,0 @@ |
266 |
-# Copyright 1999-2020 Gentoo Authors |
267 |
-# Distributed under the terms of the GNU General Public License v2 |
268 |
- |
269 |
-EAPI=7 |
270 |
- |
271 |
-ECM_TEST="forceoptional" |
272 |
-QTMIN=5.15.1 |
273 |
-inherit ecm kde.org |
274 |
- |
275 |
-DESCRIPTION="Framework for syntax highlighting" |
276 |
-LICENSE="MIT" |
277 |
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
278 |
-IUSE="nls" |
279 |
- |
280 |
-BDEPEND=" |
281 |
- dev-lang/perl |
282 |
- nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) |
283 |
-" |
284 |
-DEPEND=" |
285 |
- >=dev-qt/qtgui-${QTMIN}:5 |
286 |
- >=dev-qt/qtnetwork-${QTMIN}:5 |
287 |
- >=dev-qt/qtxmlpatterns-${QTMIN}:5 |
288 |
-" |
289 |
-RDEPEND="${DEPEND}" |
290 |
- |
291 |
-PATCHES=( "${FILESDIR}"/${P}-bashfix-{1,2}.patch ) |
292 |
- |
293 |
-src_install() { |
294 |
- ecm_src_install |
295 |
- dobin "${BUILD_DIR}"/bin/katehighlightingindexer |
296 |
-} |