diff options
Diffstat (limited to 'kde-frameworks/syntax-highlighting')
| -rw-r--r-- | kde-frameworks/syntax-highlighting/Manifest | 3 | ||||
| -rw-r--r-- | kde-frameworks/syntax-highlighting/files/syntax-highlighting-5.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 |
3 files changed, 89 insertions, 1 deletions
diff --git a/kde-frameworks/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest index 8ba9840a1756..68b7fa776185 100644 --- a/kde-frameworks/syntax-highlighting/Manifest +++ b/kde-frameworks/syntax-highlighting/Manifest @@ -1,5 +1,6 @@ +AUX syntax-highlighting-5.115.0-fix-tests.patch 6566 BLAKE2B bc058bc6ff12c7820abf9eb6a3cd0f5d441a7ae5973a7d521e1a8091fd769d8c65ef0eb79fa283c31774170d487d97fbde25d4775c4d2ef9c5bdff0b103cd910 SHA512 0663640b91a5770dbf5bf2b083d72102af6019f471f0bdc84e19c71b13424cf12b83188dacbe4d9fb34398461f4a9f00a319f1125321974ca213dd422a9ae0e3 DIST syntax-highlighting-5.115.0.tar.xz 3432708 BLAKE2B 3ecfda27588509e5b791f3a78806c6fc3d898807157edef9e574c73f26069b1d92093d8c760da785cc9d769504a13f261c340fa4829857f37e158ade81a96dee SHA512 6a25a6c3be6258e956663065864ec177d05d91c817e79922ba599e45d4738813746a7c751c5043135d2c7255d341a60a6152e1d02ad90136e00a97ecb2ecd479 DIST syntax-highlighting-6.0.0.tar.xz 3527420 BLAKE2B 85ec002cd204c78f9ae97f75846211a40b32fafbc8683736b55f2bbfd559bff4d312c21c82a354670dd83457257500389912b94844e8800303c5430705916a01 SHA512 864117cbf00599276fbb7b7efe7419379b7b1448b966a2d9108a0ea2646ce64626fba10f43a14a16a34076347143311a699aea797d88bd91a4be636c330cbcfa -EBUILD syntax-highlighting-5.115.0.ebuild 531 BLAKE2B 8074e3125c0c96496ed46b1498a86a55792fbfb0b07bb83652d478a6219a6dc03fa36e7b16fe8028463ec49f749dcba844bfb4ce04932a2a36a01168e74f621f SHA512 393a18ee6cb0e612700be94e50e19d900969ab79231afa058f3250b6f2e2ae06c419b7adef596c4aeec752dc54574a2faa307767944ef93e81696cd4f683cf77 +EBUILD syntax-highlighting-5.115.0-r1.ebuild 592 BLAKE2B b1bc3ae5b2a835a234304c5e930125b71e53f692375f32916aae56df6f7bcc0566455a9c41032be4bf65d081b728079411e602fbfb8898fa27563b627d2cdbd0 SHA512 05c9298183aa42f454b15242700a29fe1aa08e9e0fe0c4f55337b7693b0f1bc2d4c62abeaa237f80fed1b4ba30cce4e25f29b2fd03a3817f1d447dccdbca02a0 EBUILD syntax-highlighting-6.0.0.ebuild 514 BLAKE2B da8106c61cff37b1ba3c1e37452c0f17374980e0bbf60495f9e048b88e5f637f1eeffed849b7a18bebdf2662f33ab07b9e175c9aba9f66442e966709fe9468af SHA512 22b92adc36761ce83221c8ba35549045c71bda420318122dfcd2a43cbd1f7d58ef24256abfd33f039cb0c41641c7dce165e9961fbf342e8a451e8334cd16d3e8 MISC metadata.xml 456 BLAKE2B 4392b1cc6f304778d71236d5eb557dfbbd530143eea5cad9a3c3034e3e8b22c835f6c7f980124a21cefd35a2dd1efd5110adc0a5342170f88dfd7418b12bee99 SHA512 7ba65331cad434e2dceee012a5458d268eb2a04e0f7276b265c15644e6db5209bc7eee7d9695aa0038c435711e0f6f0dc53c7bae9d773b48f01e22a22e4dbb80 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 |