From 30892c6d9012f67fe940b337b318be90a602450cea13b90ea904c12c1be517e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:04:14 +0000 Subject: [PATCH 1/3] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-skylighting revision:18, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting?expand=0&rev=56 --- _constraints | 14 -------- ghc-skylighting.changes | 75 ---------------------------------------- ghc-skylighting.spec | 15 ++------ skylighting-0.8.3.tar.gz | 3 ++ skylighting-0.8.5.tar.gz | 3 -- 5 files changed, 6 insertions(+), 104 deletions(-) delete mode 100644 _constraints create mode 100644 skylighting-0.8.3.tar.gz delete mode 100644 skylighting-0.8.5.tar.gz diff --git a/_constraints b/_constraints deleted file mode 100644 index b5b0790..0000000 --- a/_constraints +++ /dev/null @@ -1,14 +0,0 @@ - - - - ppc64 - ppc64le - - - - 6 - - - - - diff --git a/ghc-skylighting.changes b/ghc-skylighting.changes index d6226b7..a27dfdd 100644 --- a/ghc-skylighting.changes +++ b/ghc-skylighting.changes @@ -1,78 +1,3 @@ -------------------------------------------------------------------- -Wed Aug 19 06:52:08 UTC 2020 - Michel Normand - -- Add _constraints with 6GB min disk space for ppc64/ppc64le - -------------------------------------------------------------------- -Tue Aug 18 10:46:03 UTC 2020 - Peter Simons - -- Replace %setup -q with the more modern %autosetup macro. - -------------------------------------------------------------------- -Sun Jun 21 02:00:45 UTC 2020 - psimons@suse.com - -- Update skylighting to version 0.8.5. - ## 0.8.5 - - * Respect dynamic flag on StringDetect elements (#99, Albert - Krewinkel). - - * Increase test timeout to avoid failures with qemu-emulated - environments, such as qemu and riscv64 in Ubuntu builders - (William Grant). - - * Fix attribute for opening double quote in sql-postgresql.xml - (Benjamin Wuethrich). - - * Update syntax descriptions for javascript, bash, coffee, - javascript-react, javascript, latex, sql-postgresql, typescript. - -------------------------------------------------------------------- -Tue Jun 9 09:10:53 UTC 2020 - psimons@suse.com - -- Update skylighting to version 0.8.4. - ## 0.8.4 - - * HTML output: use aria-hidden="true" on empty a elements - unless numberLines is specified (in which case the element - is still empty but will have content added by CSS). - This is to avoid excess noise when the code blocks are - read by screen readers. See jgm/pandoc#6352. - -------------------------------------------------------------------- -Wed May 6 06:52:10 UTC 2020 - psimons@suse.com - -- Update skylighting to version 0.8.3.4. - Upstream has edited the change log file since the last release in - a non-trivial way, i.e. they did more than just add a new entry - at the top. You can review the file at: - http://hackage.haskell.org/package/skylighting-0.8.3.4/src/changelog.md - -------------------------------------------------------------------- -Sat Jan 25 10:22:55 UTC 2020 - psimons@suse.com - -- Update skylighting to version 0.8.3.2. - ## 0.8.3.2 -- 2020-01-21 - - * This fixes a packaging error in 0.8.3.1, which didn't include - the results of the bootsrap step and hence didn't update the - syntax modules. - - ## 0.8.3.1 -- 2020-01-21 - - * Escape `<` and `>` in latex to avoid ligatures (#91). - - * Fix and extend Idris keywords (Denis Buzdalov). - - * Update XML syntax definitions for javascript-react, qml, - typescript, javascript, cmake, cofee, latex, perl, python, - rest. - - * Fixed bug with context shifts using `##` syntax for foreign context. - Previously we only handled these in IncludeRules, but - starting with the current batches of xml files they can occur - elsewhere too. - ------------------------------------------------------------------- Wed Nov 27 03:00:59 UTC 2019 - psimons@suse.com diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index aca2222..2ad9ece 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-skylighting # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,24 +18,18 @@ %global pkg_name skylighting Name: ghc-%{pkg_name} -Version: 0.8.5 +Version: 0.8.3 Release: 0 Summary: Syntax highlighting library License: GPL-2.0-or-later URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-binary-devel -BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel -BuildRequires: ghc-directory-devel -BuildRequires: ghc-filepath-devel -BuildRequires: ghc-pretty-show-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-skylighting-core-devel -BuildRequires: ghc-text-devel %description Skylighting is a syntax highlighting library with support for over one hundred @@ -57,15 +51,13 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%autosetup -n %{pkg_name}-%{version} +%setup -q -n %{pkg_name}-%{version} %build -%define cabal_configure_options -fexecutable %ghc_lib_build %install %ghc_lib_install -%ghc_fix_rpath %{pkg_name}-%{version} %post devel %ghc_pkg_recache @@ -75,7 +67,6 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files %license LICENSE -%{_bindir}/%{pkg_name} %files devel -f %{name}-devel.files %doc README.md changelog.md diff --git a/skylighting-0.8.3.tar.gz b/skylighting-0.8.3.tar.gz new file mode 100644 index 0000000..d822243 --- /dev/null +++ b/skylighting-0.8.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:269a4d5cd3a1b83d8d37442f7f76b17bf2b2294da2ad3aa6dd4ef3eede5f55bf +size 629989 diff --git a/skylighting-0.8.5.tar.gz b/skylighting-0.8.5.tar.gz deleted file mode 100644 index e74132a..0000000 --- a/skylighting-0.8.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ba30911f5718ec4c5e76d160c358892b301b3ea58d009cb0506dcabaf0615ad -size 621391 From bf78c8c5b4ac2ac73a8d79fdd1f79f2f04135be0d2d1ab9b5ddc3763054aed60 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 4 Sep 2020 15:11:36 +0000 Subject: [PATCH 2/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-skylighting revision:13, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting?expand=0&rev=57 --- _constraints | 14 ++++++++ ghc-skylighting.changes | 75 ++++++++++++++++++++++++++++++++++++++++ ghc-skylighting.spec | 15 ++++++-- skylighting-0.8.3.tar.gz | 3 -- skylighting-0.8.5.tar.gz | 3 ++ 5 files changed, 104 insertions(+), 6 deletions(-) create mode 100644 _constraints delete mode 100644 skylighting-0.8.3.tar.gz create mode 100644 skylighting-0.8.5.tar.gz diff --git a/_constraints b/_constraints new file mode 100644 index 0000000..b5b0790 --- /dev/null +++ b/_constraints @@ -0,0 +1,14 @@ + + + + ppc64 + ppc64le + + + + 6 + + + + + diff --git a/ghc-skylighting.changes b/ghc-skylighting.changes index a27dfdd..d6226b7 100644 --- a/ghc-skylighting.changes +++ b/ghc-skylighting.changes @@ -1,3 +1,78 @@ +------------------------------------------------------------------- +Wed Aug 19 06:52:08 UTC 2020 - Michel Normand + +- Add _constraints with 6GB min disk space for ppc64/ppc64le + +------------------------------------------------------------------- +Tue Aug 18 10:46:03 UTC 2020 - Peter Simons + +- Replace %setup -q with the more modern %autosetup macro. + +------------------------------------------------------------------- +Sun Jun 21 02:00:45 UTC 2020 - psimons@suse.com + +- Update skylighting to version 0.8.5. + ## 0.8.5 + + * Respect dynamic flag on StringDetect elements (#99, Albert + Krewinkel). + + * Increase test timeout to avoid failures with qemu-emulated + environments, such as qemu and riscv64 in Ubuntu builders + (William Grant). + + * Fix attribute for opening double quote in sql-postgresql.xml + (Benjamin Wuethrich). + + * Update syntax descriptions for javascript, bash, coffee, + javascript-react, javascript, latex, sql-postgresql, typescript. + +------------------------------------------------------------------- +Tue Jun 9 09:10:53 UTC 2020 - psimons@suse.com + +- Update skylighting to version 0.8.4. + ## 0.8.4 + + * HTML output: use aria-hidden="true" on empty a elements + unless numberLines is specified (in which case the element + is still empty but will have content added by CSS). + This is to avoid excess noise when the code blocks are + read by screen readers. See jgm/pandoc#6352. + +------------------------------------------------------------------- +Wed May 6 06:52:10 UTC 2020 - psimons@suse.com + +- Update skylighting to version 0.8.3.4. + Upstream has edited the change log file since the last release in + a non-trivial way, i.e. they did more than just add a new entry + at the top. You can review the file at: + http://hackage.haskell.org/package/skylighting-0.8.3.4/src/changelog.md + +------------------------------------------------------------------- +Sat Jan 25 10:22:55 UTC 2020 - psimons@suse.com + +- Update skylighting to version 0.8.3.2. + ## 0.8.3.2 -- 2020-01-21 + + * This fixes a packaging error in 0.8.3.1, which didn't include + the results of the bootsrap step and hence didn't update the + syntax modules. + + ## 0.8.3.1 -- 2020-01-21 + + * Escape `<` and `>` in latex to avoid ligatures (#91). + + * Fix and extend Idris keywords (Denis Buzdalov). + + * Update XML syntax definitions for javascript-react, qml, + typescript, javascript, cmake, cofee, latex, perl, python, + rest. + + * Fixed bug with context shifts using `##` syntax for foreign context. + Previously we only handled these in IncludeRules, but + starting with the current batches of xml files they can occur + elsewhere too. + ------------------------------------------------------------------- Wed Nov 27 03:00:59 UTC 2019 - psimons@suse.com diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index 2ad9ece..aca2222 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-skylighting # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,18 +18,24 @@ %global pkg_name skylighting Name: ghc-%{pkg_name} -Version: 0.8.3 +Version: 0.8.5 Release: 0 Summary: Syntax highlighting library License: GPL-2.0-or-later URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +BuildRequires: chrpath BuildRequires: ghc-Cabal-devel BuildRequires: ghc-binary-devel +BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel +BuildRequires: ghc-directory-devel +BuildRequires: ghc-filepath-devel +BuildRequires: ghc-pretty-show-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-skylighting-core-devel +BuildRequires: ghc-text-devel %description Skylighting is a syntax highlighting library with support for over one hundred @@ -51,13 +57,15 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%setup -q -n %{pkg_name}-%{version} +%autosetup -n %{pkg_name}-%{version} %build +%define cabal_configure_options -fexecutable %ghc_lib_build %install %ghc_lib_install +%ghc_fix_rpath %{pkg_name}-%{version} %post devel %ghc_pkg_recache @@ -67,6 +75,7 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files %license LICENSE +%{_bindir}/%{pkg_name} %files devel -f %{name}-devel.files %doc README.md changelog.md diff --git a/skylighting-0.8.3.tar.gz b/skylighting-0.8.3.tar.gz deleted file mode 100644 index d822243..0000000 --- a/skylighting-0.8.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:269a4d5cd3a1b83d8d37442f7f76b17bf2b2294da2ad3aa6dd4ef3eede5f55bf -size 629989 diff --git a/skylighting-0.8.5.tar.gz b/skylighting-0.8.5.tar.gz new file mode 100644 index 0000000..e74132a --- /dev/null +++ b/skylighting-0.8.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ba30911f5718ec4c5e76d160c358892b301b3ea58d009cb0506dcabaf0615ad +size 621391 From e8d82daaa21638c3edd829d3c2f403a1ce62bc8f916a37457bac51d38bdb3840 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 20 Oct 2020 09:15:45 +0000 Subject: [PATCH 3/3] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-skylighting revision:14, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting?expand=0&rev=58 --- ghc-skylighting.changes | 76 +++++++++++++++++++++++++++++++++++++ ghc-skylighting.spec | 2 +- skylighting-0.10.0.2.tar.gz | 3 ++ skylighting-0.8.5.tar.gz | 3 -- 4 files changed, 80 insertions(+), 4 deletions(-) create mode 100644 skylighting-0.10.0.2.tar.gz delete mode 100644 skylighting-0.8.5.tar.gz diff --git a/ghc-skylighting.changes b/ghc-skylighting.changes index d6226b7..eae8614 100644 --- a/ghc-skylighting.changes +++ b/ghc-skylighting.changes @@ -1,3 +1,79 @@ +------------------------------------------------------------------- +Tue Oct 13 07:05:30 UTC 2020 - psimons@suse.com + +- Update skylighting to version 0.10.0.2. + ## 0.10.0.2 + + * Improve DetectIdentifier to ensure that identifiers can't + include non-ASCII characters. + + ## 0.10.0.1 + + * Fix identifier detection in non-ASCII context (#110). + + ## 0.10 + + * Add instructions for submitting patches upstream to KDE (#106). + + * Synced syntax definitions from KDE repo. Note that fortran + has split into two: `fortran-fixed` and `fortran-free`. + + * Add test to ensure that all regexes in rules compile. + + * Regex: allow unescaped `}`. + + * Regex: allow empty regexes and groups. + + * Regex: support lazy and possessive quantifiers (#109). + + * Regex: support recursive regexes `(?R)` (#108). + + * Hide invisible line numbers from keyboard focus (#107, d10n). + This fixes tabbing through elements on a page. + + * Remove some obsolete patches for xml definitions. + + ## 0.9 + + * Use a pure Haskell regex implementation (in unexported module + Text.Regex.KDE) instead of pcre. The implementation is not + as efficient as pcre, but it seems good enough for this + application, and it is desirable to avoid depending on a C + library. (Available Haskell libraries weren't up to the + task, because they don't do back-references, captures, + lookahead/behind.) Some benchmarks (old/new): + haskell (4.6/7.9) java (13.4/23.3) c (2.8/3.7) rhtml + (4.7/6.1) lua (10.6/13.2) javascript (4.2/6.6). + Though this is a significant slowdown, the tradeoff seems + worth it to have a pure Haskell implementation. + + * Removed old `system-pcre` flag. + + * More efficient treatment of dynamic regexes. + We put something in the Regex itself to represent the `%1`, + and modify it later. This allows us to cache dynamic + regexes in a way we couldn't before. + + * Add support for TOML (#105, Shiming Wang), + GraphQL, and Nim syntax (#102, Daniel Pozo Escalona). + + * Update xml definitions for actionscript, bash, boo, c, + cmake, elm, erlang, glsl, isocpp, java, lua, m4, mediawiki, + perl, powershell, scala, tcsh, xul, zsh. + + * Fix fallthrough behavior (don't always consume a token). + + * Fix word boundary detection. + + * Remove RegexException. (API change) + + * Skylighting.Regex now exports `isWordChar` and `testRegex`, + as well as the constructors underlying the new `Regex` type. + + * Remove some obsolete xml definition patches. + + * Fix escaped % in dynamic regex. + ------------------------------------------------------------------- Wed Aug 19 06:52:08 UTC 2020 - Michel Normand diff --git a/ghc-skylighting.spec b/ghc-skylighting.spec index aca2222..b2e4992 100644 --- a/ghc-skylighting.spec +++ b/ghc-skylighting.spec @@ -18,7 +18,7 @@ %global pkg_name skylighting Name: ghc-%{pkg_name} -Version: 0.8.5 +Version: 0.10.0.2 Release: 0 Summary: Syntax highlighting library License: GPL-2.0-or-later diff --git a/skylighting-0.10.0.2.tar.gz b/skylighting-0.10.0.2.tar.gz new file mode 100644 index 0000000..9da4f7f --- /dev/null +++ b/skylighting-0.10.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46b8d5877af6a68783d1dbc98584bc0643cfa776c322bbeb34d054b12b245f54 +size 646424 diff --git a/skylighting-0.8.5.tar.gz b/skylighting-0.8.5.tar.gz deleted file mode 100644 index e74132a..0000000 --- a/skylighting-0.8.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ba30911f5718ec4c5e76d160c358892b301b3ea58d009cb0506dcabaf0615ad -size 621391