From cb9a7844e46ad9a4ce844e2db62f468b096b49130e3f96ad8aca393dddb0a3ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 16 Jun 2018 13:27:53 +0000 Subject: [PATCH 1/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-skylighting-core revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting-core?expand=0&rev=4 --- ghc-skylighting-core.spec | 2 +- skylighting-core-0.7.1.tar.gz | 3 --- skylighting-core-0.7.2.tar.gz | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 skylighting-core-0.7.1.tar.gz create mode 100644 skylighting-core-0.7.2.tar.gz diff --git a/ghc-skylighting-core.spec b/ghc-skylighting-core.spec index d5c26d5..9c7256c 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.7.1 +Version: 0.7.2 Release: 0 Summary: Syntax highlighting library License: BSD-3-Clause diff --git a/skylighting-core-0.7.1.tar.gz b/skylighting-core-0.7.1.tar.gz deleted file mode 100644 index 22e4565..0000000 --- a/skylighting-core-0.7.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ffe223554db53cedfce5af92a7f22a907904c40bf498777dfdfe3c5ccd8723e -size 545965 diff --git a/skylighting-core-0.7.2.tar.gz b/skylighting-core-0.7.2.tar.gz new file mode 100644 index 0000000..6a8a30a --- /dev/null +++ b/skylighting-core-0.7.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7832e5976f321cbaf45b969a789241b703fce98f623a1b29dfac9fa679e5ce18 +size 557031 From 53afad376ad23afd516418b0f1686aaa92ab333de834fd9567bae1e8ae830c84 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 11 Jul 2018 01:01:54 +0000 Subject: [PATCH 2/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-skylighting-core revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting-core?expand=0&rev=5 --- ghc-skylighting-core.changes | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/ghc-skylighting-core.changes b/ghc-skylighting-core.changes index 63623de..e509390 100644 --- a/ghc-skylighting-core.changes +++ b/ghc-skylighting-core.changes @@ -1,4 +1,16 @@ +------------------------------------------------------------------- +Tue Jul 10 18:17:19 UTC 2018 - psimons@suse.com + +- Update skylighting-core to version 0.7.2. + # Revision history for skylighting-core + + ## 0.7.2 -- 2018-06-08 + + * Update syntax definitions from upstream. + * Added support for POV-Ray syntax (#46). + * Display line numbers without absolute positioning (David + ------------------------------------------------------------------- Mon May 14 17:02:11 UTC 2018 - psimons@suse.com -- Adding initial version version 0.7.1. +- Add skylighting-core at version 0.7.1. From 3719b456d45323b8cc05a1c77c02bf3ab23fd6d69f6e302231c555876fb72dec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 15 Jul 2018 01:01:54 +0000 Subject: [PATCH 3/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-skylighting-core revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting-core?expand=0&rev=6 --- ghc-skylighting-core.changes | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ghc-skylighting-core.changes b/ghc-skylighting-core.changes index e509390..216a204 100644 --- a/ghc-skylighting-core.changes +++ b/ghc-skylighting-core.changes @@ -1,14 +1,13 @@ ------------------------------------------------------------------- -Tue Jul 10 18:17:19 UTC 2018 - psimons@suse.com +Fri Jul 13 14:31:50 UTC 2018 - psimons@suse.com - Update skylighting-core to version 0.7.2. - # Revision history for skylighting-core - ## 0.7.2 -- 2018-06-08 * Update syntax definitions from upstream. * Added support for POV-Ray syntax (#46). * Display line numbers without absolute positioning (David + Baynard, #32). ------------------------------------------------------------------- Mon May 14 17:02:11 UTC 2018 - psimons@suse.com From 2e9fa5bdba79559e64e3926f64bc4e6fc188f8fe8c8a717b21b3afb0eb8931ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 18 Jul 2018 01:01:33 +0000 Subject: [PATCH 4/4] osc copypac from project:devel:languages:haskell:ghc-8.4.x package:ghc-skylighting-core revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-skylighting-core?expand=0&rev=7 --- ghc-skylighting-core.spec | 2 + skylighting-core.cabal | 217 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 219 insertions(+) create mode 100644 skylighting-core.cabal diff --git a/ghc-skylighting-core.spec b/ghc-skylighting-core.spec index 9c7256c..fc576f2 100644 --- a/ghc-skylighting-core.spec +++ b/ghc-skylighting-core.spec @@ -26,6 +26,7 @@ License: BSD-3-Clause Group: Development/Libraries/Haskell 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 @@ -82,6 +83,7 @@ files. %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build diff --git a/skylighting-core.cabal b/skylighting-core.cabal new file mode 100644 index 0000000..3009b23 --- /dev/null +++ b/skylighting-core.cabal @@ -0,0 +1,217 @@ +name: skylighting-core +version: 0.7.2 +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/language.dtd + 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/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 + +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 + Skylighting.Format.ANSI + Skylighting.Format.HTML + Skylighting.Format.LaTeX + other-extensions: CPP, Arrows + 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, + hxt, + safe, + base64-bytestring, + blaze-html >= 0.5, + containers, + ansi-terminal >= 0.7, + colour >= 2.0 + if flag(system-pcre) + build-depends: regex-pcre + else + build-depends: regex-pcre-builtin + hs-source-dirs: src + ghc-prof-options: -fprof-auto-exported + default-language: Haskell2010 + ghc-options: -Wall + +Flag executable + Description: Build skylighting CLI tools + Default: False + +Flag system-pcre + Description: Use regex-pcre instead of regex-pcre-builtin + 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, + HUnit, + tasty, + tasty-golden, + tasty-hunit, + tasty-quickcheck, + QuickCheck, + containers, + random, + Diff, + text, + pretty-show, + aeson >= 1.0, + bytestring, + directory, + filepath, + skylighting-core + default-language: Haskell2010 + ghc-options: -Wall + +benchmark benchmark-skylighting + Type: exitcode-stdio-1.0 + Main-Is: benchmark.hs + Hs-Source-Dirs: benchmark + Build-Depends: skylighting-core, + base >= 4.2 && < 5, + filepath, + text, + containers, + directory, + criterion >= 1.0 && < 1.5 + Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind + Default-Language: Haskell2010 + +executable skylighting-extract + build-depends: base >= 4.8 && < 5.0, + skylighting-core, + filepath, + bytestring, + base64-bytestring, + text, + safe, + hxt, + utf8-string, + case-insensitive, + aeson >= 1.0, + binary, + containers, + directory, + ansi-terminal >= 0.7, + colour >= 2.0 + if flag(system-pcre) + build-depends: regex-pcre + else + build-depends: regex-pcre-builtin + 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