* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/syntax-highlighting/, kde-frameworks/syntax-highlighting/files/
@ 2020-12-31 15:40 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-12-31 15:40 UTC (permalink / raw
To: gentoo-commits
commit: a09789a57128d368e19c70c5d5e63b20b849dce6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 31 15:08:04 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 31 15:38:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a09789a5
kde-frameworks/syntax-highlighting: Drop 5.77.0 (r0)
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../syntax-highlighting-5.77.0-bashfix-1.patch | 174 ---------------------
.../syntax-highlighting-5.77.0-bashfix-2.patch | 54 -------
.../syntax-highlighting-5.77.0.ebuild | 31 ----
3 files changed, 259 deletions(-)
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 d9e71832c87..00000000000
--- 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 3ff4bdc0131..00000000000
--- 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.77.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0.ebuild
deleted file mode 100644
index 947c290db84..00000000000
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.77.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 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}"/${P}-bashfix-{1,2}.patch )
-
-src_install() {
- ecm_src_install
- dobin "${BUILD_DIR}"/bin/katehighlightingindexer
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/syntax-highlighting/, kde-frameworks/syntax-highlighting/files/
@ 2021-09-04 21:01 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2021-09-04 21:01 UTC (permalink / raw
To: gentoo-commits
commit: 820d68cfd42e353f188f9c0c2f4cfaf4fcb23c1a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 4 11:03:50 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 4 20:58:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=820d68cf
kde-frameworks/syntax-highlighting: Python: Add "yield from" keyword
Upstream commit 439f8cbfe0b5d1f931c2233d1790e1280170c24c
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=441540
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...ting-5.85.0-python-add-yield-from-keyword.patch | 170 +++++++++++++++++++++
.../syntax-highlighting-5.85.0-r1.ebuild | 33 ++++
2 files changed, 203 insertions(+)
diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.85.0-python-add-yield-from-keyword.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.85.0-python-add-yield-from-keyword.patch
new file mode 100644
index 00000000000..ba1ae38355e
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.85.0-python-add-yield-from-keyword.patch
@@ -0,0 +1,170 @@
+From 439f8cbfe0b5d1f931c2233d1790e1280170c24c Mon Sep 17 00:00:00 2001
+From: Jan Paul Batrina <jpmbatrina01@gmail.com>
+Date: Sat, 28 Aug 2021 21:27:41 +0800
+Subject: [PATCH] Python: Add "yield from" keyword
+
+BUG: 441540
+---
+ autotests/folding/test.py.fold | 9 +++++++++
+ autotests/html/test.py.dark.html | 9 +++++++++
+ autotests/html/test.py.html | 9 +++++++++
+ autotests/input/test.py | 9 +++++++++
+ autotests/reference/test.py.ref | 9 +++++++++
+ data/syntax/python.xml | 17 +++++++++++++++--
+ 6 files changed, 60 insertions(+), 2 deletions(-)
+
+diff --git a/autotests/folding/test.py.fold b/autotests/folding/test.py.fold
+index 7bbf054c..5e7a3ba8 100644
+--- a/autotests/folding/test.py.fold
++++ b/autotests/folding/test.py.fold
+@@ -118,6 +118,15 @@ match<beginfold id='2'>(</beginfold id='2'>command.split<beginfold id='2'>(</beg
+ case <beginfold id='5'>[</beginfold id='5'>"quit"<endfold id='5'>]</endfold id='5'>:
+ print<beginfold id='2'>(</beginfold id='2'>"Goodbye!"<endfold id='2'>)</endfold id='2'>
+
++def func1<beginfold id='2'>(</beginfold id='2'><endfold id='2'>)</endfold id='2'>:
++ yield 1
++ yield from <beginfold id='5'>[</beginfold id='5'>func<beginfold id='2'>(</beginfold id='2'><endfold id='2'>)</endfold id='2'>, 1, 2, "3"<endfold id='5'>]</endfold id='5'>
++ # invalid, "from" no longer part of "yield from"
++ yield, from 1
++
++async def func2<beginfold id='2'>(</beginfold id='2'><endfold id='2'>)</endfold id='2'>:
++ await asyncio.sleep<beginfold id='2'>(</beginfold id='2'>1<endfold id='2'>)</endfold id='2'>
++
+ "\\\\\\\\\\ENSURE THAT THIS AND THE FOLLOWING LINES ARE AT THE <endfold id='6'>END</endfold id='6'> OF THE FILE\\\\\\\\\\ \
+ "
+ </indentfold>a = 'otherwise all succeeding lines will be
+diff --git a/autotests/html/test.py.dark.html b/autotests/html/test.py.dark.html
+index 23718b11..1d6c1dd2 100644
+--- a/autotests/html/test.py.dark.html
++++ b/autotests/html/test.py.dark.html
+@@ -124,6 +124,15 @@ match(command.split())
+ <span style="color:#fdbc4b;font-weight:bold;">case</span> [<span style="color:#f44f4f;">"quit"</span>]:
+ <span style="color:#7f8c8d;">print</span>(<span style="color:#f44f4f;">"Goodbye!"</span>)
+
++<span style="font-weight:bold;">def</span> func1():
++ <span style="color:#fdbc4b;font-weight:bold;">yield</span> <span style="color:#f67400;">1</span>
++ <span style="color:#fdbc4b;font-weight:bold;">yield</span> <span style="color:#fdbc4b;font-weight:bold;">from</span> [func(), <span style="color:#f67400;">1</span>, <span style="color:#f67400;">2</span>, <span style="color:#f44f4f;">"3"</span>]
++ <span style="color:#7a7c7d;"># invalid, "from" no longer part of "yield from"</span>
++ <span style="color:#fdbc4b;font-weight:bold;">yield</span>, <span style="color:#27ae60;">from</span> <span style="color:#f67400;">1</span>
++
++<span style="color:#fdbc4b;font-weight:bold;">async</span> <span style="font-weight:bold;">def</span> func2():
++ <span style="color:#fdbc4b;font-weight:bold;">await</span> asyncio.sleep(<span style="color:#f67400;">1</span>)
++
+ <span style="color:#7a7c7d;">"</span><span style="color:#3daee9;">\\\\\\\\\\</span><span style="color:#7a7c7d;">ENSURE THAT THIS AND THE FOLLOWING LINES ARE AT THE </span><span style="color:#2980b9;background-color:#153042;">END</span><span style="color:#7a7c7d;"> OF THE FILE</span><span style="color:#3daee9;">\\\\\\\\\\</span><span style="color:#7a7c7d;"> </span><span style="color:#3daee9;">\</span>
+ <span style="color:#7a7c7d;">"</span>
+ a <span style="color:#3f8058;">=</span> <span style="color:#f44f4f;">'otherwise all succeeding lines will be</span>
+diff --git a/autotests/html/test.py.html b/autotests/html/test.py.html
+index 55cfefb0..4d7a2709 100644
+--- a/autotests/html/test.py.html
++++ b/autotests/html/test.py.html
+@@ -124,6 +124,15 @@ match(command.split())
+ <span style="font-weight:bold;">case</span> [<span style="color:#bf0303;">"quit"</span>]:
+ <span style="color:#644a9b;font-weight:bold;">print</span>(<span style="color:#bf0303;">"Goodbye!"</span>)
+
++<span style="font-weight:bold;">def</span> func1():
++ <span style="font-weight:bold;">yield</span> <span style="color:#b08000;">1</span>
++ <span style="font-weight:bold;">yield</span> <span style="font-weight:bold;">from</span> [func(), <span style="color:#b08000;">1</span>, <span style="color:#b08000;">2</span>, <span style="color:#bf0303;">"3"</span>]
++ <span style="color:#898887;"># invalid, "from" no longer part of "yield from"</span>
++ <span style="font-weight:bold;">yield</span>, <span style="color:#ff5500;">from</span> <span style="color:#b08000;">1</span>
++
++<span style="font-weight:bold;">async</span> <span style="font-weight:bold;">def</span> func2():
++ <span style="font-weight:bold;">await</span> asyncio.sleep(<span style="color:#b08000;">1</span>)
++
+ <span style="color:#898887;">"</span><span style="color:#924c9d;">\\\\\\\\\\</span><span style="color:#898887;">ENSURE THAT THIS AND THE FOLLOWING LINES ARE AT THE </span><span style="color:#0057ae;background-color:#e0e9f8;">END</span><span style="color:#898887;"> OF THE FILE</span><span style="color:#924c9d;">\\\\\\\\\\</span><span style="color:#898887;"> </span><span style="color:#924c9d;">\</span>
+ <span style="color:#898887;">"</span>
+ a <span style="color:#ca60ca;">=</span> <span style="color:#bf0303;">'otherwise all succeeding lines will be</span>
+diff --git a/autotests/input/test.py b/autotests/input/test.py
+index 3eb8378d..d91db578 100644
+--- a/autotests/input/test.py
++++ b/autotests/input/test.py
+@@ -118,6 +118,15 @@ match(command.split()):
+ case ["quit"]:
+ print("Goodbye!")
+
++def func1():
++ yield 1
++ yield from [func(), 1, 2, "3"]
++ # invalid, "from" no longer part of "yield from"
++ yield, from 1
++
++async def func2():
++ await asyncio.sleep(1)
++
+ "\\\\\\\\\\ENSURE THAT THIS AND THE FOLLOWING LINES ARE AT THE END OF THE FILE\\\\\\\\\\ \
+ "
+ a = 'otherwise all succeeding lines will be
+diff --git a/autotests/reference/test.py.ref b/autotests/reference/test.py.ref
+index 9c5bdb54..1742da2b 100644
+--- a/autotests/reference/test.py.ref
++++ b/autotests/reference/test.py.ref
+@@ -118,6 +118,15 @@
+ <Normal Text> </Normal Text><Flow Control Keyword>case</Flow Control Keyword><Normal Text> [</Normal Text><String>"quit"</String><Normal Text>]:</Normal Text><br/>
+ <Normal Text> </Normal Text><Builtin Function>print</Builtin Function><Normal Text>(</Normal Text><String>"Goodbye!"</String><Normal Text>)</Normal Text><br/>
+ <Normal Text></Normal Text><br/>
++<Definition Keyword>def</Definition Keyword><Normal Text> func1():</Normal Text><br/>
++<Normal Text> </Normal Text><Flow Control Keyword>yield</Flow Control Keyword><Normal Text> </Normal Text><Int>1</Int><br/>
++<Normal Text> </Normal Text><Flow Control Keyword>yield</Flow Control Keyword><Normal Text> </Normal Text><Flow Control Keyword>from</Flow Control Keyword><Normal Text> [func(), </Normal Text><Int>1</Int><Normal Text>, </Normal Text><Int>2</Int><Normal Text>, </Normal Text><String>"3"</String><Normal Text>]</Normal Text><br/>
++<Normal Text> </Normal Text><Comment># invalid, "from" no longer part of "yield from"</Comment><br/>
++<Normal Text> </Normal Text><Flow Control Keyword>yield</Flow Control Keyword><Normal Text>, </Normal Text><Import>from</Import><Normal Text> </Normal Text><Int>1</Int><br/>
++<Normal Text></Normal Text><br/>
++<Flow Control Keyword>async</Flow Control Keyword><Normal Text> </Normal Text><Definition Keyword>def</Definition Keyword><Normal Text> func2():</Normal Text><br/>
++<Normal Text> </Normal Text><Flow Control Keyword>await</Flow Control Keyword><Normal Text> asyncio.sleep(</Normal Text><Int>1</Int><Normal Text>)</Normal Text><br/>
++<Normal Text></Normal Text><br/>
+ <Comment>"</Comment><String Char>\\\\\\\\\\</String Char><Comment>ENSURE THAT THIS AND THE FOLLOWING LINES ARE AT THE </Comment><Region Marker>END</Region Marker><Comment> OF THE FILE</Comment><String Char>\\\\\\\\\\</String Char><Comment> </Comment><String Char>\</String Char><br/>
+ <Comment>"</Comment><br/>
+ <Normal Text>a </Normal Text><Operator>=</Operator><Normal Text> </Normal Text><String>'otherwise all succeeding lines will be</String><br/>
+diff --git a/data/syntax/python.xml b/data/syntax/python.xml
+index 7143bf30..676872f0 100644
+--- a/data/syntax/python.xml
++++ b/data/syntax/python.xml
+@@ -52,7 +52,7 @@
+ <!-- v2.07 add support for %prog and co, see bug 142832 -->
+ <!-- v2.08 add missing overloaders, new Python 3 statements, builtins, and keywords -->
+ <!-- v2.29 recognize escape sequenzes correctly -->
+-<language name="Python" version="21" style="python" indenter="python" kateversion="5.0" section="Scripts" extensions="*.py;*.pyw;SConstruct;SConscript;*.FCMacro" mimetype="application/x-python;text/x-python;text/x-python3" casesensitive="1" author="Michael Bueker" license="">
++<language name="Python" version="22" style="python" indenter="python" kateversion="5.0" section="Scripts" extensions="*.py;*.pyw;SConstruct;SConscript;*.FCMacro" mimetype="application/x-python;text/x-python;text/x-python3" casesensitive="1" author="Michael Bueker" license="">
+ <highlighting>
+ <list name="import">
+ <item>import</item>
+@@ -90,10 +90,17 @@
+ <item>try</item>
+ <item>while</item>
+ <item>with</item>
+- <item>yield</item>
+ <item>async</item>
+ <item>await</item>
+ </list>
++ <list name="flow_yield">
++ <item>yield</item>
++ <!--
++ "yield from" added here as a keyword for autocompletion. The actual handling
++ is in context="yield" so that we won't need to add space as a weakDeliminator.
++ -->
++ <item>yield from</item>
++ </list>
+ <list name="patternmatching">
+ <item>match</item>
+ <item>case</item>
+@@ -380,6 +387,7 @@
+ <keyword attribute="Definition Keyword" String="defs" context="#stay"/>
+ <keyword attribute="Operator Keyword" String="operators" context="#stay"/>
+ <keyword attribute="Flow Control Keyword" String="flow" context="#stay"/>
++ <keyword attribute="Flow Control Keyword" String="flow_yield" context="yield"/>
+ <keyword attribute="Flow Control Keyword" String="patternmatching" context="Pattern Matching" lookAhead="1" firstNonSpace="1"/>
+ <keyword attribute="Builtin Function" String="builtinfuncs" context="#stay"/>
+ <keyword attribute="Special Variable" String="specialvars" context="#stay"/>
+@@ -428,6 +436,11 @@
+ <RegExpr attribute="Error" String="[\w\d]+" context="#pop#pop"/>
+ </context>
+
++ <context name="yield" attribute="Flow Control Keyword" lineEndContext="#pop" fallthrough="1" fallthroughContext="#pop">
++ <DetectSpaces attribute="Normal Text" context="#stay"/>
++ <WordDetect attribute="Flow Control Keyword" context="#pop" String="from"/>
++ </context>
++
+ <context name="Pattern Matching" attribute="Flow Control Keyword" lineEndContext="#pop">
+ <!--
+ Python 3.10: https://docs.python.org/3.10/reference/compound_stmts.html#the-match-statement
+--
+GitLab
+
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.85.0-r1.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.85.0-r1.ebuild
new file mode 100644
index 00000000000..d96c9b50f24
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.85.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.2
+inherit ecm kde.org
+
+DESCRIPTION="Framework for syntax highlighting"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~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}"/${P}-python-add-yield-from-keyword.patch # KDE-bug 441540
+)
+
+src_install() {
+ ecm_src_install
+ dobin "${BUILD_DIR}"/bin/katehighlightingindexer
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/syntax-highlighting/, kde-frameworks/syntax-highlighting/files/
@ 2024-03-11 10:28 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2024-03-11 10:28 UTC (permalink / raw
To: gentoo-commits
commit: 3befb902c7b7db6ca70a2d144c0670814e6bc6f8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 10:25:09 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 10:27:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3befb902
kde-frameworks/syntax-highlighting: use (?:sub){0,2}
... to work with all pcre versions
See also:
https://mail.kde.org/pipermail/kde-frameworks-devel/2024-March/123463.html
Closes: https://bugs.gentoo.org/924756
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../syntax-highlighting-5.115.0-fix-tests.patch | 85 ++++++++++++++++++++++
...build => syntax-highlighting-5.115.0-r1.ebuild} | 2 +
2 files changed, 87 insertions(+)
diff --git a/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.115.0-fix-tests.patch b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.115.0-fix-tests.patch
new file mode 100644
index 000000000000..8ab49e752f2a
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.115.0-fix-tests.patch
@@ -0,0 +1,85 @@
+From aaede4eff4f9aa160be767c7b1aee0cf27cbb0e8 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Sun, 3 Mar 2024 18:01:38 +0100
+Subject: [PATCH] use (?:sub){0,2} to work with all pcre versions
+
+---
+ autotests/html/highlight.ly.dark.html | 2 +-
+ autotests/html/highlight.ly.html | 2 +-
+ autotests/reference/highlight.ly.ref | 2 +-
+ data/syntax/lilypond.xml | 6 +++---
+ 4 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/autotests/html/highlight.ly.dark.html b/autotests/html/highlight.ly.dark.html
+index 8a8466174..441a16839 100644
+--- a/autotests/html/highlight.ly.dark.html
++++ b/autotests/html/highlight.ly.dark.html
+@@ -15,7 +15,7 @@
+ <span style="color:#7a7c7d;">%}</span>
+
+ <span style="font-weight:bold;">\header {</span>
+- title = <span style="color:#f44f4f;">"Katepart Lilypond syntax highlighting test file"</span>
++ <span style="color:#2980b9;">title</span> = <span style="color:#f44f4f;">"Katepart Lilypond syntax highlighting test file"</span>
+ <span style="color:#2980b9;">composer</span> = <span style="color:#7a7c7d;">%{"Wilbert Berendsen"%}</span> <span style="color:#f44f4f;">"Anonymus"</span>
+ <span style="color:#2980b9;">poet</span> = <span style="color:#f44f4f;">"The KDE team"</span>
+ <span style="color:#2980b9;">opus</span> = <span style="color:#f44f4f;">"1"</span>
+diff --git a/autotests/html/highlight.ly.html b/autotests/html/highlight.ly.html
+index 8bc714646..1081ed38c 100644
+--- a/autotests/html/highlight.ly.html
++++ b/autotests/html/highlight.ly.html
+@@ -15,7 +15,7 @@
+ <span style="color:#898887;">%}</span>
+
+ <span style="font-weight:bold;">\header {</span>
+- title = <span style="color:#bf0303;">"Katepart Lilypond syntax highlighting test file"</span>
++ <span style="color:#0057ae;">title</span> = <span style="color:#bf0303;">"Katepart Lilypond syntax highlighting test file"</span>
+ <span style="color:#0057ae;">composer</span> = <span style="color:#898887;">%{"Wilbert Berendsen"%}</span> <span style="color:#bf0303;">"Anonymus"</span>
+ <span style="color:#0057ae;">poet</span> = <span style="color:#bf0303;">"The KDE team"</span>
+ <span style="color:#0057ae;">opus</span> = <span style="color:#bf0303;">"1"</span>
+diff --git a/autotests/reference/highlight.ly.ref b/autotests/reference/highlight.ly.ref
+index f11654d43..9b7afdb3c 100644
+--- a/autotests/reference/highlight.ly.ref
++++ b/autotests/reference/highlight.ly.ref
+@@ -9,7 +9,7 @@
+ <Comment>%}</Comment><br/>
+ <Normal Text></Normal Text><br/>
+ <Keyword>\header {</Keyword><br/>
+-<Normal Text> title = </Normal Text><Quoted Text>"Katepart Lilypond syntax highlighting test file"</Quoted Text><br/>
++<Normal Text> </Normal Text><Variable>title</Variable><Normal Text> = </Normal Text><Quoted Text>"Katepart Lilypond syntax highlighting test file"</Quoted Text><br/>
+ <Normal Text> </Normal Text><Variable>composer</Variable><Normal Text> = </Normal Text><Comment>%{"Wilbert Berendsen"%}</Comment><Normal Text> </Normal Text><Quoted Text>"Anonymus"</Quoted Text><br/>
+ <Normal Text> </Normal Text><Variable>poet</Variable><Normal Text> = </Normal Text><Quoted Text>"The KDE team"</Quoted Text><br/>
+ <Normal Text> </Normal Text><Variable>opus</Variable><Normal Text> = </Normal Text><Quoted Text>"1"</Quoted Text><br/>
+diff --git a/data/syntax/lilypond.xml b/data/syntax/lilypond.xml
+index 58a4459db..1894d4063 100644
+--- a/data/syntax/lilypond.xml
++++ b/data/syntax/lilypond.xml
+@@ -23,7 +23,7 @@
+ <!ENTITY markupnotextargs "arrow-head|beam|char|(semi|sesqui|double)?(flat|sharp)|draw-(circle|line)|epsfile|eyeglasses|filled-box|fret-diagram(-terse|-verbose)?|fromproperty|harp-pedal|(justify|wordwrap)-(field|string)|left-brace|lookup|markalphabet|markletter|musicglyph|natural|note-by-number|note|null|path|right-brace|simple|(back)?slashed-digit|stencil|strut|tied-lyric|triangle|verbatim-file">
+ <!ENTITY markupwithtextargs "markup|bold|(rounded-)?box|bracket|caps|(center|general|left|right)-align|circle|((center|dir|left|right)-)?column|combine|concat|dynamic|fill-line|finger|fontCaps|(abs-)?fontsize|fraction|halign|hbracket|hcenter-in|hcenter|hspace|huge|italic|justify|larger?|line|lower|magnify|medium|normal-size-(sub|super)|normal-text|normalsize|number|on-the-fly|override|pad-(around|markup|to-box|x)|page-ref|postscript|put-adjacent|raise|roman|rotate|sans|small(er)?|smallCaps|sub|super|teeny|text|tiny|translate(-scaled)?|transparent|typewriter|underline|upright|vcenter|whiteout|with-(color|dimensions|url)|wordwrap|(markup|column-|justified-|override-|wordwrap-)lines|wordwrap-(string-)?internal">
+ <!ENTITY deprecatedmarkup "bigger|h?center">
+- <!ENTITY headervars "dedication|(sub){,2}title|poet|composer|meter|opus|arranger|instrument|piece|breakbefore|copyright|tagline|mutopia(title|composer|poet|opus|instrument)|date|enteredby|source|style|maintainer(Email|Web)?|moreInfo|lastupdated|texidoc|footer">
++ <!ENTITY headervars "dedication|(?:sub){0,2}title|poet|composer|meter|opus|arranger|instrument|piece|breakbefore|copyright|tagline|mutopia(title|composer|poet|opus|instrument)|date|enteredby|source|style|maintainer(Email|Web)?|moreInfo|lastupdated|texidoc|footer">
+
+ <!-- The '-new' entities are for for LilyPond 2.13.4 and higher, and '-old' for LilyPond up to 2.12 -->
+ <!ENTITY paper-margin "(top|bottom|left|right)-margin|(foot|head)-separation|indent|short-indent|paper-(height|width)|horizontal-shift|line-width">
+@@ -56,7 +56,7 @@
+ ]>
+ <language name="LilyPond" section="Other"
+ style="lilypond" indenter="lilypond"
+- version="10" kateversion="5.0"
++ version="11" kateversion="5.0"
+ extensions="*.ly;*.LY;*.ily;*.ILY;*.lyi;*.LYI"
+ mimetype="text/x-lilypond"
+ author="Wilbert Berendsen (info@wilbertberendsen.nl)" license="LGPL">
+@@ -1076,7 +1076,7 @@
+ <RegExpr String="("?)\b(?:&engravers00;|&engravers01;|&engravers02;|&engravers1;|&engravers2;)\b\1" attribute="Engraver"/>
+ <keyword String="layoutobjects" attribute="Layout Object"/>
+ <keyword String="properties" attribute="Property"/>
+- <RegExpr String="\b(&headervars;|&papervars;|&layoutvars;)\b" attribute="Variable"/>
++ <RegExpr String="\b(?:&headervars;|&papervars;|&layoutvars;)\b" attribute="Variable"/>
+ <keyword String="deprecatedproperties" attribute="Deprecated Property"/>
+ <IncludeRules context="default"/>
+ </context>
+--
+GitLab
+
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0-r1.ebuild
similarity index 89%
rename from kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0.ebuild
rename to kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0-r1.ebuild
index 76cb7343b311..93a2dfd1f115 100644
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0.ebuild
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0-r1.ebuild
@@ -24,3 +24,5 @@ BDEPEND="
dev-lang/perl
>=dev-qt/linguist-tools-${QTMIN}:5
"
+
+PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" ) # bug 924756
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-11 10:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-04 21:01 [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/syntax-highlighting/, kde-frameworks/syntax-highlighting/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-03-11 10:28 Andreas Sturmlechner
2020-12-31 15:40 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox