Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-skylighting-core for
openSUSE:Factory checked in at 2023-04-04 21:23:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-skylighting-core (Old)
and /work/SRC/openSUSE:Factory/.ghc-skylighting-core.new.19717 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-skylighting-core"
Tue Apr 4 21:23:15 2023 rev:32 rq:1076043 version:0.13.2.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-skylighting-core/ghc-skylighting-core.changes
2023-01-18 13:11:00.320890159 +0100
+++
/work/SRC/openSUSE:Factory/.ghc-skylighting-core.new.19717/ghc-skylighting-core.changes
2023-04-04 21:23:27.074226760 +0200
@@ -1,0 +2,17 @@
+Thu Mar 30 17:08:18 UTC 2023 - Peter Simons <[email protected]>
+
+- Updated spec file to conform with ghc-rpm-macros-2.5.2.
+
+-------------------------------------------------------------------
+Wed Feb 8 23:11:31 UTC 2023 - Peter Simons <[email protected]>
+
+- Update skylighting-core to version 0.13.2.1.
+ ## 0.13.2.1
+
+ * Update tango style for new token types (#164). The original
+ tango style didn't have colors defined for many token types
+ that have been added since it was added. This commit
+ updates the style to support them. Thanks to @danbraswell
+ for providing the values needed.
+
+-------------------------------------------------------------------
Old:
----
skylighting-core-0.13.2.tar.gz
New:
----
skylighting-core-0.13.2.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-skylighting-core.spec ++++++
--- /var/tmp/diff_new_pack.X9jM4v/_old 2023-04-04 21:23:31.966254461 +0200
+++ /var/tmp/diff_new_pack.X9jM4v/_new 2023-04-04 21:23:31.974254506 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-skylighting-core
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,9 +17,10 @@
%global pkg_name skylighting-core
+%global pkgver %{pkg_name}-%{version}
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.13.2
+Version: 0.13.2.1
Release: 0
Summary: Syntax highlighting library
License: BSD-3-Clause
@@ -27,31 +28,56 @@
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-aeson-devel
+BuildRequires: ghc-aeson-prof
BuildRequires: ghc-attoparsec-devel
+BuildRequires: ghc-attoparsec-prof
+BuildRequires: ghc-base-devel
+BuildRequires: ghc-base-prof
BuildRequires: ghc-base64-bytestring-devel
+BuildRequires: ghc-base64-bytestring-prof
BuildRequires: ghc-binary-devel
+BuildRequires: ghc-binary-prof
BuildRequires: ghc-bytestring-devel
+BuildRequires: ghc-bytestring-prof
BuildRequires: ghc-case-insensitive-devel
+BuildRequires: ghc-case-insensitive-prof
BuildRequires: ghc-colour-devel
+BuildRequires: ghc-colour-prof
BuildRequires: ghc-containers-devel
+BuildRequires: ghc-containers-prof
BuildRequires: ghc-directory-devel
+BuildRequires: ghc-directory-prof
BuildRequires: ghc-filepath-devel
+BuildRequires: ghc-filepath-prof
BuildRequires: ghc-mtl-devel
+BuildRequires: ghc-mtl-prof
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-safe-devel
+BuildRequires: ghc-safe-prof
BuildRequires: ghc-text-devel
+BuildRequires: ghc-text-prof
BuildRequires: ghc-transformers-devel
+BuildRequires: ghc-transformers-prof
BuildRequires: ghc-utf8-string-devel
+BuildRequires: ghc-utf8-string-prof
BuildRequires: ghc-xml-conduit-devel
+BuildRequires: ghc-xml-conduit-prof
ExcludeArch: %{ix86}
%if %{with tests}
BuildRequires: ghc-Diff-devel
+BuildRequires: ghc-Diff-prof
BuildRequires: ghc-QuickCheck-devel
+BuildRequires: ghc-QuickCheck-prof
BuildRequires: ghc-pretty-show-devel
+BuildRequires: ghc-pretty-show-prof
BuildRequires: ghc-tasty-devel
BuildRequires: ghc-tasty-golden-devel
+BuildRequires: ghc-tasty-golden-prof
BuildRequires: ghc-tasty-hunit-devel
+BuildRequires: ghc-tasty-hunit-prof
+BuildRequires: ghc-tasty-prof
BuildRequires: ghc-tasty-quickcheck-devel
+BuildRequires: ghc-tasty-quickcheck-prof
%endif
%description
@@ -74,6 +100,22 @@
This package provides the Haskell %{pkg_name} library development
files.
+%package -n ghc-%{pkg_name}-doc
+Summary: Haskell %{pkg_name} library documentation
+Requires: ghc-filesystem
+BuildArch: noarch
+
+%description -n ghc-%{pkg_name}-doc
+This package provides the Haskell %{pkg_name} library documentation.
+
+%package -n ghc-%{pkg_name}-prof
+Summary: Haskell %{pkg_name} profiling library
+Requires: ghc-%{pkg_name}-devel = %{version}-%{release}
+Supplements: (ghc-%{pkg_name}-devel and ghc-prof)
+
+%description -n ghc-%{pkg_name}-prof
+This package provides the Haskell %{pkg_name} profiling library.
+
%prep
%autosetup -n %{pkg_name}-%{version}
@@ -98,4 +140,9 @@
%files devel -f %{name}-devel.files
%doc README.md changelog.md
+%files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files
+%license LICENSE
+
+%files -n ghc-%{pkg_name}-prof -f ghc-%{pkg_name}-prof.files
+
%changelog
++++++ skylighting-core-0.13.2.tar.gz -> skylighting-core-0.13.2.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.13.2/changelog.md
new/skylighting-core-0.13.2.1/changelog.md
--- old/skylighting-core-0.13.2/changelog.md 2001-09-09 03:46:40.000000000
+0200
+++ new/skylighting-core-0.13.2.1/changelog.md 2001-09-09 03:46:40.000000000
+0200
@@ -1,5 +1,13 @@
# Revision history for skylighting and skylighting-core
+## 0.13.2.1
+
+ * Update tango style for new token types (#164). The original
+ tango style didn't have colors defined for many token types
+ that have been added since it was added. This commit
+ updates the style to support them. Thanks to @danbraswell
+ for providing the values needed.
+
## 0.13.2
* Support ConTeXt output via skylighting-format-context (Albert Krewinkel).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.13.2/skylighting-core.cabal
new/skylighting-core-0.13.2.1/skylighting-core.cabal
--- old/skylighting-core-0.13.2/skylighting-core.cabal 2001-09-09
03:46:40.000000000 +0200
+++ new/skylighting-core-0.13.2.1/skylighting-core.cabal 2001-09-09
03:46:40.000000000 +0200
@@ -1,5 +1,5 @@
name: skylighting-core
-version: 0.13.2
+version: 0.13.2.1
synopsis: syntax highlighting library
description: Skylighting is a syntax highlighting library.
It derives its tokenizers from XML syntax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.13.2/src/Skylighting/Styles.hs
new/skylighting-core-0.13.2.1/src/Skylighting/Styles.hs
--- old/skylighting-core-0.13.2/src/Skylighting/Styles.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/skylighting-core-0.13.2.1/src/Skylighting/Styles.hs 2001-09-09
03:46:40.000000000 +0200
@@ -148,41 +148,266 @@
-- | Style based on pygments's tango colors.
tango :: Style
-tango = Style{
- backgroundColor = color 0xf8f8f8
+tango = Style
+ { tokenStyles =
+ Map.fromList
+ [ ( KeywordTok
+ , TokenStyle
+ { tokenColor = Just (RGB 32 74 135)
+ , tokenBackground = Nothing
+ , tokenBold = True
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( DataTypeTok
+ , TokenStyle
+ { tokenColor = Just (RGB 32 74 135)
+ , tokenBackground = Nothing
+ , tokenBold = False
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( DecValTok
+ , TokenStyle
+ { tokenColor = Just (RGB 0 0 207)
+ , tokenBackground = Nothing
+ , tokenBold = False
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( BaseNTok
+ , TokenStyle
+ { tokenColor = Just (RGB 0 0 207)
+ , tokenBackground = Nothing
+ , tokenBold = False
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( FloatTok
+ , TokenStyle
+ { tokenColor = Just (RGB 0 0 207)
+ , tokenBackground = Nothing
+ , tokenBold = False
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( ConstantTok
+ , TokenStyle
+ { tokenColor = Just (RGB 143 89 2)
+ , tokenBackground = Nothing
+ , tokenBold = False
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( CharTok
+ , TokenStyle
+ { tokenColor = Just (RGB 78 154 6)
+ , tokenBackground = Nothing
+ , tokenBold = False
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( SpecialCharTok
+ , TokenStyle
+ { tokenColor = Just (RGB 206 92 0)
+ , tokenBackground = Nothing
+ , tokenBold = True
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( StringTok
+ , TokenStyle
+ { tokenColor = Just (RGB 78 154 6)
+ , tokenBackground = Nothing
+ , tokenBold = False
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( VerbatimStringTok
+ , TokenStyle
+ { tokenColor = Just (RGB 78 154 6)
+ , tokenBackground = Nothing
+ , tokenBold = False
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( SpecialStringTok
+ , TokenStyle
+ { tokenColor = Just (RGB 78 154 6)
+ , tokenBackground = Nothing
+ , tokenBold = False
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( ImportTok
+ , TokenStyle
+ { tokenColor = Nothing
+ , tokenBackground = Nothing
+ , tokenBold = False
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( CommentTok
+ , TokenStyle
+ { tokenColor = Just (RGB 143 89 2)
+ , tokenBackground = Nothing
+ , tokenBold = False
+ , tokenItalic = True
+ , tokenUnderline = False
+ }
+ )
+ , ( DocumentationTok
+ , TokenStyle
+ { tokenColor = Just (RGB 143 89 2)
+ , tokenBackground = Nothing
+ , tokenBold = True
+ , tokenItalic = True
+ , tokenUnderline = False
+ }
+ )
+ , ( AnnotationTok
+ , TokenStyle
+ { tokenColor = Just (RGB 143 89 2)
+ , tokenBackground = Nothing
+ , tokenBold = True
+ , tokenItalic = True
+ , tokenUnderline = False
+ }
+ )
+ , ( CommentVarTok
+ , TokenStyle
+ { tokenColor = Just (RGB 143 89 2)
+ , tokenBackground = Nothing
+ , tokenBold = True
+ , tokenItalic = True
+ , tokenUnderline = False
+ }
+ )
+ , ( OtherTok
+ , TokenStyle
+ { tokenColor = Just (RGB 143 89 2)
+ , tokenBackground = Nothing
+ , tokenBold = False
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( FunctionTok
+ , TokenStyle
+ { tokenColor = Just (RGB 32 74 135)
+ , tokenBackground = Nothing
+ , tokenBold = True
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( VariableTok
+ , TokenStyle
+ { tokenColor = Just (RGB 0 0 0)
+ , tokenBackground = Nothing
+ , tokenBold = False
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( ControlFlowTok
+ , TokenStyle
+ { tokenColor = Just (RGB 32 74 135)
+ , tokenBackground = Nothing
+ , tokenBold = True
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( OperatorTok
+ , TokenStyle
+ { tokenColor = Just (RGB 206 92 0)
+ , tokenBackground = Nothing
+ , tokenBold = True
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( ExtensionTok
+ , TokenStyle
+ { tokenColor = Nothing
+ , tokenBackground = Nothing
+ , tokenBold = False
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( PreprocessorTok
+ , TokenStyle
+ { tokenColor = Just (RGB 143 89 2)
+ , tokenBackground = Nothing
+ , tokenBold = False
+ , tokenItalic = True
+ , tokenUnderline = False
+ }
+ )
+ , ( AttributeTok
+ , TokenStyle
+ { tokenColor = Just (RGB 32 74 135)
+ , tokenBackground = Nothing
+ , tokenBold = False
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( InformationTok
+ , TokenStyle
+ { tokenColor = Just (RGB 143 89 2)
+ , tokenBackground = Nothing
+ , tokenBold = True
+ , tokenItalic = True
+ , tokenUnderline = False
+ }
+ )
+ , ( WarningTok
+ , TokenStyle
+ { tokenColor = Just (RGB 143 89 2)
+ , tokenBackground = Nothing
+ , tokenBold = True
+ , tokenItalic = True
+ , tokenUnderline = False
+ }
+ )
+ , ( AlertTok
+ , TokenStyle
+ { tokenColor = Just (RGB 239 41 41)
+ , tokenBackground = Nothing
+ , tokenBold = False
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ , ( ErrorTok
+ , TokenStyle
+ { tokenColor = Just (RGB 164 0 0)
+ , tokenBackground = Nothing
+ , tokenBold = True
+ , tokenItalic = False
+ , tokenUnderline = False
+ }
+ )
+ ]
, defaultColor = Nothing
- , lineNumberColor = color 0xaaaaaa
+ , backgroundColor = Just (RGB 248 248 248)
+ , lineNumberColor = Just (RGB 170 170 170)
, lineNumberBackgroundColor = Nothing
- , tokenStyles = Map.fromList
- [ (KeywordTok, defStyle{ tokenColor = color 0x204a87, tokenBold = True })
- , (DataTypeTok, defStyle{ tokenColor = color 0x204a87 })
- , (DecValTok, defStyle{ tokenColor = color 0x0000cf })
- , (BaseNTok, defStyle{ tokenColor = color 0x0000cf })
- , (FloatTok, defStyle{ tokenColor = color 0x0000cf })
- , (CharTok, defStyle{ tokenColor = color 0x4e9a06 })
- , (StringTok, defStyle{ tokenColor = color 0x4e9a06 })
- , (CommentTok, defStyle{ tokenColor = color 0x8f5902, tokenItalic = True })
- , (OtherTok, defStyle{ tokenColor = color 0x8f5902 })
- , (AlertTok, defStyle{ tokenColor = color 0xef2929 })
- , (FunctionTok, defStyle{ tokenColor = color 0x000000 })
- , (ErrorTok, defStyle{ tokenColor = color 0xa40000, tokenBold = True })
- , (WarningTok, defStyle{ tokenColor = color 0x8f5902, tokenItalic =
True,tokenBold = True })
- , (ConstantTok, defStyle{ tokenColor = color 0x000000 })
- , (SpecialCharTok, defStyle{ tokenColor = color 0x000000 })
- , (VerbatimStringTok, defStyle{ tokenColor = color 0x4e9a06 })
- , (SpecialStringTok, defStyle{ tokenColor = color 0x4e9a06 })
- , (ImportTok, defStyle)
- , (VariableTok, defStyle{ tokenColor = color 0x000000 })
- , (ControlFlowTok, defStyle{ tokenColor = color 0x204a87, tokenBold = True
})
- , (OperatorTok, defStyle{ tokenColor = color 0xce5c00, tokenBold = True })
- , (PreprocessorTok, defStyle{ tokenColor = color 0x8f5902, tokenItalic =
True} )
- , (ExtensionTok, defStyle)
- , (AttributeTok, defStyle{ tokenColor = color 0xc4a000 })
- , (DocumentationTok, defStyle{ tokenColor = color 0x8f5902, tokenItalic =
True, tokenBold = True })
- , (AnnotationTok, defStyle{ tokenColor = color 0x8f5902, tokenItalic =
True,tokenBold = True })
- , (CommentVarTok, defStyle{ tokenColor = color 0x8f5902, tokenItalic =
True,tokenBold = True })
- , (InformationTok, defStyle{ tokenColor = color 0x8f5902, tokenItalic =
True,tokenBold = True })
- ]
}
-- | Style based on ultraviolet's espresso_libre.css (dark background).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.13.2/test/test-skylighting.hs
new/skylighting-core-0.13.2.1/test/test-skylighting.hs
--- old/skylighting-core-0.13.2/test/test-skylighting.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/skylighting-core-0.13.2.1/test/test-skylighting.hs 2001-09-09
03:46:40.000000000 +0200
@@ -224,7 +224,7 @@
noDropTest :: TokenizerConfig -> [Text] -> Syntax -> TestTree
noDropTest cfg inps syntax =
- localOption (mkTimeout 25000000)
+ localOption (mkTimeout 75000000)
$ testCase (Text.unpack (sName syntax))
$ mapM_ go inps
where go inp =
@@ -238,7 +238,7 @@
assertFailure ("Unexpected error: " ++ e ++ "\ninput = "
++ show inp)
tokenizerTest :: TokenizerConfig -> SyntaxMap -> Bool -> FilePath -> TestTree
-tokenizerTest cfg sMap regen inpFile = localOption (mkTimeout 25000000) $
+tokenizerTest cfg sMap regen inpFile = localOption (mkTimeout 75000000) $
goldenTest testname getExpected getActual
(compareValues referenceFile) updateGolden
where testname = lang ++ " tokenizing of " ++ inpFile
