diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2024-03-11 11:25:09 +0100 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2024-03-11 11:27:34 +0100 |
commit | 3befb902c7b7db6ca70a2d144c0670814e6bc6f8 (patch) | |
tree | d69bbc3a976bc1a0b30d0e18ca9054e8b4e422b5 /kde-frameworks | |
parent | dev-lang/php: simplify opcache installation (diff) | |
download | gentoo-3befb902c7b7db6ca70a2d144c0670814e6bc6f8.tar.gz gentoo-3befb902c7b7db6ca70a2d144c0670814e6bc6f8.tar.bz2 gentoo-3befb902c7b7db6ca70a2d144c0670814e6bc6f8.zip |
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@gentoo.org>
Diffstat (limited to 'kde-frameworks')
-rw-r--r-- | kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.115.0-fix-tests.patch | 85 | ||||
-rw-r--r-- | kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0-r1.ebuild (renamed from kde-frameworks/syntax-highlighting/syntax-highlighting-5.115.0.ebuild) | 2 |
2 files changed, 87 insertions, 0 deletions
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 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 |