From 6eca64ba08c0ff08224dd9bfa4ce7b4d19de1c887b8c118b1772ad3b571bb71a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Wed, 2 Dec 2020 15:03:34 +0000 Subject: [PATCH 1/4] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-skylighting-core revision:15, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting-core?expand=0&rev=47 --- ghc-skylighting-core.changes | 35 ++++++++++++++++++++++++++++++++ ghc-skylighting-core.spec | 2 +- skylighting-core-0.10.0.3.tar.gz | 3 --- skylighting-core-0.10.1.tar.gz | 3 +++ 4 files changed, 39 insertions(+), 4 deletions(-) delete mode 100644 skylighting-core-0.10.0.3.tar.gz create mode 100644 skylighting-core-0.10.1.tar.gz diff --git a/ghc-skylighting-core.changes b/ghc-skylighting-core.changes index 65e7e36..ea5a6b8 100644 --- a/ghc-skylighting-core.changes +++ b/ghc-skylighting-core.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Wed Nov 25 16:30:17 UTC 2020 - psimons@suse.com + +- Update skylighting-core to version 0.10.1. + ## 0.10.1 + + * Regex: handle `(?|)` modifier. This is used in bash.xml now. + It resets the numbers of capturing groups in alternatives. + + * Improve regex handling of `{` and `}` not in quantifiers: + - `{}` is literal (not a quantifier). + - loose unescaped `{` and `}` that are not part of a quantifier are + literal matchers. + + * Update xml syntax definitions from upstream. + For: abc, actionscript, ada, agda, alert, apache, asn1, asp, + ats, awk, bash, boo, c, clojure, cmake, coffee, coldfusion, + commonlisp, cs, css, curry, d, djangotemplate, dockerfile, + dot, doxygen, dtd, eiffel, elixir, elm, erlang, fasm, + fortran-fixed, fortran-free, fsharp, glsl, gnuassembler, go, + graphql, groovy, hamlet, haskell, haxe, html, idris, ini, + isocpp, j, java, javadoc, javascript, jsp, julia, kotlin, + latex, lex, lilypond, literate-curry, literate-haskell, + llvm, lua, m4, makefile, markdown, mathematica, matlab, + maxima, mediawiki, metafont, mips, modula-2, modula-3, + monobasic, mustache, nasm, nim, noweb, objectivec, + objectivecpp, ocaml, octave, opencl, pascal, perl, php, + pike, postscript, povray, powershell, prolog, protobuf, + pure, purebasic, python, r, relaxng, relaxngcompact, rest, + rhtml, roff, ruby, rust, scala, scheme, sci, sed, sgml, sml, + sql-mysql, sql-postgresql, sql, stata, tcl, tcsh, texinfo, + toml, verilog, vhdl, xml, xorg, xslt, xul, yacc, yaml, zsh. + Also added spdx-comments.xml and comments.xml, which are + needed for these. Closes #111 (latex bug in matrix). + ------------------------------------------------------------------- Fri Oct 23 19:25:31 UTC 2020 - psimons@suse.com diff --git a/ghc-skylighting-core.spec b/ghc-skylighting-core.spec index 376b4aa..31e886e 100644 --- a/ghc-skylighting-core.spec +++ b/ghc-skylighting-core.spec @@ -19,7 +19,7 @@ %global pkg_name skylighting-core %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.10.0.3 +Version: 0.10.1 Release: 0 Summary: Syntax highlighting library License: BSD-3-Clause diff --git a/skylighting-core-0.10.0.3.tar.gz b/skylighting-core-0.10.0.3.tar.gz deleted file mode 100644 index da1e24e..0000000 --- a/skylighting-core-0.10.0.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c67dff34b348a5f66b054d9b6184fd58a9edc2fe7f44c04735b430e2f50359b0 -size 726328 diff --git a/skylighting-core-0.10.1.tar.gz b/skylighting-core-0.10.1.tar.gz new file mode 100644 index 0000000..4294ae7 --- /dev/null +++ b/skylighting-core-0.10.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7dbb596ae091f6ba76875435bed8abf8e25abf196f98dcfc1c2bc86f7a18aa81 +size 729373 From a14b3f81cfc82deade9de6144e34cd0c47d4e576e35c09bc8e61cc34966dc8f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 18 Dec 2020 12:52:58 +0000 Subject: [PATCH 2/4] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-skylighting-core revision:18, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting-core?expand=0&rev=48 --- ghc-skylighting-core.changes | 28 ++++++++++++++++++++++++++++ ghc-skylighting-core.spec | 8 +++++++- skylighting-core-0.10.1.tar.gz | 3 --- skylighting-core-0.10.2.tar.gz | 3 +++ 4 files changed, 38 insertions(+), 4 deletions(-) delete mode 100644 skylighting-core-0.10.1.tar.gz create mode 100644 skylighting-core-0.10.2.tar.gz diff --git a/ghc-skylighting-core.changes b/ghc-skylighting-core.changes index ea5a6b8..d3a4d33 100644 --- a/ghc-skylighting-core.changes +++ b/ghc-skylighting-core.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Fri Dec 18 09:18:53 UTC 2020 - psimons@suse.com + +- Update skylighting-core to version 0.10.2. + ## 0.10.2 + + * Update syntax definitions for abc, actionscript, asn1, ats, + bash, boo, coffee, comments, cpp, cs, css, curry, d, + djangotemplate, dockerfile, doxygen, dtd, elixir, graphql, + groovy, hamlet, haskell, haxe, idris, ini, j, java, + javadoc, javascript-react, javascript, jsp, kotlin, lex, + lilypond, literate-curry, literate-haskell, m4, makefile, + mandoc, markdown, mediawiki, mips, modula-2, modula-3, + monobasic, mustache, nim, noweb, objectivec, objectivecpp, + ocaml, opencl, pascal, perl, php, pike, postscript, + prolog, protobuf, pure, purebasic, python, qml, relaxng, + relaxngcompact, rest, rhtml, roff, ruby, scala, sci, sed, + sgml, sml, spdx-comments, stata, tcsh, texinfo, verilog, + xml, xorg, xul. + + * Re-insert CSS line needed to make line numbers appear in + HTML. See jgm/pandoc#6625. + +------------------------------------------------------------------- +Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup + +- force i686 arch on i586 + ------------------------------------------------------------------- Wed Nov 25 16:30:17 UTC 2020 - psimons@suse.com diff --git a/ghc-skylighting-core.spec b/ghc-skylighting-core.spec index 31e886e..22ee42d 100644 --- a/ghc-skylighting-core.spec +++ b/ghc-skylighting-core.spec @@ -19,7 +19,7 @@ %global pkg_name skylighting-core %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.10.1 +Version: 0.10.2 Release: 0 Summary: Syntax highlighting library License: BSD-3-Clause @@ -45,6 +45,12 @@ BuildRequires: ghc-safe-devel BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-utf8-string-devel +# GHC dont support i586 +%ifarch %{ix86} +ExclusiveArch: i586 i686 +ExclusiveArch: i686 +%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} +%endif %if %{with tests} BuildRequires: ghc-Diff-devel BuildRequires: ghc-HUnit-devel diff --git a/skylighting-core-0.10.1.tar.gz b/skylighting-core-0.10.1.tar.gz deleted file mode 100644 index 4294ae7..0000000 --- a/skylighting-core-0.10.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7dbb596ae091f6ba76875435bed8abf8e25abf196f98dcfc1c2bc86f7a18aa81 -size 729373 diff --git a/skylighting-core-0.10.2.tar.gz b/skylighting-core-0.10.2.tar.gz new file mode 100644 index 0000000..3a2b017 --- /dev/null +++ b/skylighting-core-0.10.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6f7de10604fec658dc02099be4b4607568c2dcee2ea8b0dd5867c2c5ead4f8c5 +size 695555 From dbd269054357e5d1cbc226a445d0cffec0b7f9e4cc90c1411b9e4a00bafcc2bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 17:49:10 +0000 Subject: [PATCH 3/4] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-skylighting-core revision:20, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting-core?expand=0&rev=49 --- ghc-skylighting-core.changes | 2 +- ghc-skylighting-core.spec | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ghc-skylighting-core.changes b/ghc-skylighting-core.changes index d3a4d33..3fd94c9 100644 --- a/ghc-skylighting-core.changes +++ b/ghc-skylighting-core.changes @@ -24,7 +24,7 @@ Fri Dec 18 09:18:53 UTC 2020 - psimons@suse.com ------------------------------------------------------------------- Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup -- force i686 arch on i586 +- disable %{ix86} build ------------------------------------------------------------------- Wed Nov 25 16:30:17 UTC 2020 - psimons@suse.com diff --git a/ghc-skylighting-core.spec b/ghc-skylighting-core.spec index 22ee42d..8219b58 100644 --- a/ghc-skylighting-core.spec +++ b/ghc-skylighting-core.spec @@ -45,12 +45,7 @@ BuildRequires: ghc-safe-devel BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-utf8-string-devel -# GHC dont support i586 -%ifarch %{ix86} -ExclusiveArch: i586 i686 -ExclusiveArch: i686 -%{expand:%%global optflags %(echo "%{optflags}"|sed -e s/i586/i686/) -march=i686 -mtune=generic} -%endif +ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-Diff-devel BuildRequires: ghc-HUnit-devel From a6a891395c0bebf67794ca1f476bf2a795f13ed03d2e76864cd776656af4190d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 19 Dec 2020 18:29:20 +0000 Subject: [PATCH 4/4] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-skylighting-core revision:21, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting-core?expand=0&rev=50 --- ghc-skylighting-core.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-skylighting-core.changes b/ghc-skylighting-core.changes index 3fd94c9..4a19de5 100644 --- a/ghc-skylighting-core.changes +++ b/ghc-skylighting-core.changes @@ -22,7 +22,7 @@ Fri Dec 18 09:18:53 UTC 2020 - psimons@suse.com HTML. See jgm/pandoc#6625. ------------------------------------------------------------------- -Thu Oct 17 12:20:00 UTC 2020 - Ondřej Súkup +Thu Dec 17 12:20:00 UTC 2020 - Ondřej Súkup - disable %{ix86} build