diff --git a/ghc-skylighting-core.changes b/ghc-skylighting-core.changes index ed17a95..6b99b07 100644 --- a/ghc-skylighting-core.changes +++ b/ghc-skylighting-core.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Sat Aug 13 17:58:22 UTC 2022 - Peter Simons + +- Update skylighting-core to version 0.13 revision 1. + Upstream has revised the Cabal build instructions on Hackage. + +------------------------------------------------------------------- +Sat Jul 30 15:38:53 UTC 2022 - Peter Simons + +- Update skylighting-core to version 0.13. + ## 0.13 + + * Update syntax definitions from upstream: bash, cmake, diff, + ini, perl, php, sgml, xml. + + * Split out formatters into separate packages (#152). API changes: + - Skylighting.Core no longer exports Skylighting.Format.ANSI, + Skylighting.Format.HTML, Skylighting.Format.LaTeX. These are + now provided by separate packages, skylighting-format-ansi, + skylighting-format-blaze-html, skylighting-format-latex. + - Skylighting.Types no longer exports XTerm256ColorCode. + This has been moved to skylighting-format-ansi. + + * Change Makefile to use cabal instead of stack. + ------------------------------------------------------------------- Thu May 19 17:52:09 UTC 2022 - Peter Simons diff --git a/ghc-skylighting-core.spec b/ghc-skylighting-core.spec index 4b7d0ec..3f5bdbe 100644 --- a/ghc-skylighting-core.spec +++ b/ghc-skylighting-core.spec @@ -19,19 +19,18 @@ %global pkg_name skylighting-core %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.12.3.1 +Version: 0.13 Release: 0 Summary: Syntax highlighting library License: BSD-3-Clause URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-aeson-devel -BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-attoparsec-devel BuildRequires: ghc-base64-bytestring-devel BuildRequires: ghc-binary-devel -BuildRequires: ghc-blaze-html-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-case-insensitive-devel BuildRequires: ghc-colour-devel @@ -78,6 +77,7 @@ files. %prep %autosetup -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/skylighting-core-0.12.3.1.tar.gz b/skylighting-core-0.12.3.1.tar.gz deleted file mode 100644 index 2e54fee..0000000 --- a/skylighting-core-0.12.3.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08967893029266b79a0c63742bf18aaecd7bf5c6fd29fae8a2f01fc1dd5a5b23 -size 782536 diff --git a/skylighting-core-0.13.tar.gz b/skylighting-core-0.13.tar.gz new file mode 100644 index 0000000..e404188 --- /dev/null +++ b/skylighting-core-0.13.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7688fd91973e03259c1c7c7f5000c3a47bbcdba6f43947aae9a12e09bd84606 +size 768478 diff --git a/skylighting-core.cabal b/skylighting-core.cabal new file mode 100644 index 0000000..cfeb965 --- /dev/null +++ b/skylighting-core.cabal @@ -0,0 +1,208 @@ +name: skylighting-core +version: 0.13 +x-revision: 1 +synopsis: syntax highlighting library +description: Skylighting is a syntax highlighting library. + It derives its tokenizers from XML syntax + definitions used by KDE's KSyntaxHighlighting + framework, so any syntax supported by that + framework can be added. An optional command-line + program is provided. + + Skylighting is intended to be the successor to + highlighting-kate. + + This package provides the core highlighting + functionality under a permissive license. It also + bundles XML parser definitions licensed under the + GPL. + +homepage: https://github.com/jgm/skylighting +license: BSD3 +license-file: LICENSE +author: John MacFarlane +maintainer: jgm@berkeley.edu +copyright: (C) 2016-2018 John MacFarlane +category: Text +build-type: Simple +extra-source-files: README.md + changelog.md + xml/*.xml + xml/*.xml.patch + test/default.theme + test/cases/abc.ada + test/cases/abc.agda + test/cases/abc.c + test/cases/abc.clojure + test/cases/abc.cpp + test/cases/abc.cs + test/cases/abc.d + test/cases/abc.fortran + test/cases/abc.go + test/cases/abc.haskell + test/cases/abc.java + test/cases/abc.javascript + test/cases/abc.julia + test/cases/abc.kotlin + test/cases/abc.lisp + test/cases/abc.matlab + test/cases/abc.ocaml + test/cases/abc.perl + test/cases/abc.php + test/cases/abc.prolog + test/cases/abc.python + test/cases/abc.r + test/cases/abc.ruby + test/cases/abc.scala + test/cases/abc.scheme + test/cases/abc.tcl + test/cases/archive.rhtml + test/cases/life.lua + test/cases/hk91.html + test/cases/if.cmake + test/cases/docbook.xml + test/cases/issue41.djangotemplate + test/expected/abc.ada.native + test/expected/abc.agda.native + test/expected/abc.c.native + test/expected/abc.clojure.native + test/expected/abc.cpp.native + test/expected/abc.cs.native + test/expected/abc.d.native + test/expected/abc.fortran.native + test/expected/abc.go.native + test/expected/abc.haskell.native + test/expected/abc.java.native + test/expected/abc.javascript.native + test/expected/abc.julia.native + test/expected/abc.kotlin.native + test/expected/abc.lisp.native + test/expected/abc.matlab.native + test/expected/abc.ocaml.native + test/expected/abc.perl.native + test/expected/abc.php.native + test/expected/abc.prolog.native + test/expected/abc.python.native + test/expected/abc.r.native + test/expected/abc.ruby.native + test/expected/abc.scala.native + test/expected/abc.scheme.native + test/expected/abc.tcl.native + test/expected/archive.rhtml.native + test/expected/life.lua.native + test/expected/hk91.html.native + test/expected/if.cmake.native + test/expected/issue41.djangotemplate.native + test/expected/docbook.xml.native + +cabal-version: >=1.10 + +source-repository head + type: git + location: https://github.com/jgm/skylighting.git + +library + exposed-modules: Skylighting.Core + Skylighting.Types + Skylighting.Regex + Skylighting.Parser + Skylighting.Styles + Skylighting.Loader + Skylighting.Tokenizer + other-modules: Regex.KDE + Regex.KDE.Regex + Regex.KDE.Compile + Regex.KDE.Match + other-extensions: CPP + build-depends: base >= 4.8 && < 5.0, + mtl, + transformers, + text, + binary, + bytestring, + directory >= 1.2.5, + filepath, + aeson >= 1.0, + case-insensitive, + attoparsec, + utf8-string, + xml-conduit >= 1.9.1.0 && < 1.10, + safe, + base64-bytestring, + colour >= 2.0, + containers >= 0.6.0.1 + hs-source-dirs: src + ghc-prof-options: -fprof-auto-exported + default-language: Haskell2010 + ghc-options: -Wall + if impl(ghc >= 8.4) + ghc-options: -fhide-source-paths + if impl(ghc >= 8.10) + ghc-options: -Wunused-packages + +Flag executable + Description: Build skylighting-extract tool + Default: False + +test-suite test-skylighting + type: exitcode-stdio-1.0 + main-is: test-skylighting.hs + hs-source-dirs: test + build-depends: base >= 4.8 && < 5.0, + tasty, + tasty-golden, + tasty-hunit, + tasty-quickcheck, + QuickCheck, + containers, + Diff, + text, + pretty-show, + aeson >= 1.0, + bytestring, + directory, + filepath, + skylighting-core + default-language: Haskell2010 + ghc-options: -Wall + if impl(ghc >= 8.10) + ghc-options: -Wunused-packages + +benchmark benchmark-skylighting + Type: exitcode-stdio-1.0 + Main-Is: benchmark.hs + Hs-Source-Dirs: benchmark + Build-Depends: skylighting-core, + base >= 4.8 && < 5, + filepath, + text, + containers, + criterion >= 1.0 + Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind + if impl(ghc >= 8.4) + ghc-options: -fhide-source-paths + if impl(ghc >= 8.10) + ghc-options: -Wunused-packages + Default-Language: Haskell2010 + +executable skylighting-extract + build-depends: base >= 4.8 && < 5.0, + skylighting-core, + filepath, + text, + binary, + containers, + directory + if flag(executable) + buildable: True + else + buildable: False + hs-source-dirs: bin + main-is: extract.hs + default-language: Haskell2010 + other-extensions: CPP + ghc-options: -Wall + if impl(ghc >= 8.10) + ghc-options: -Wunused-packages + if impl(ghc >= 8.4) + ghc-options: -fhide-source-paths