Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-colour for openSUSE:Factory checked in at 2021-07-05 22:22:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-colour (Old) and /work/SRC/openSUSE:Factory/.ghc-colour.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-colour" Mon Jul 5 22:22:38 2021 rev:12 rq:903725 version:2.3.6 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-colour/ghc-colour.changes 2020-12-22 11:37:34.245386063 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-colour.new.2625/ghc-colour.changes 2021-07-05 22:22:53.337764205 +0200 @@ -1,0 +2,10 @@ +Fri Jun 25 09:24:46 UTC 2021 - [email protected] + +- Update colour to version 2.3.6. + New in version 2.3.6: + - Minimum base of 4.13. + - Locked down non-colour imports. + - Made semigroup instances canonical. + - Updated dependencies (for testing). + +------------------------------------------------------------------- Old: ---- colour-2.3.5.tar.gz New: ---- colour-2.3.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-colour.spec ++++++ --- /var/tmp/diff_new_pack.Tj9vbj/_old 2021-07-05 22:22:54.069758541 +0200 +++ /var/tmp/diff_new_pack.Tj9vbj/_new 2021-07-05 22:22:54.073758510 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-colour # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global pkg_name colour %bcond_with tests Name: ghc-%{pkg_name} -Version: 2.3.5 +Version: 2.3.6 Release: 0 Summary: A model for human colour/color perception License: MIT ++++++ colour-2.3.5.tar.gz -> colour-2.3.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colour-2.3.5/CHANGELOG new/colour-2.3.6/CHANGELOG --- old/colour-2.3.5/CHANGELOG 2019-05-05 02:27:50.000000000 +0200 +++ new/colour-2.3.6/CHANGELOG 2021-06-24 17:40:47.000000000 +0200 @@ -1,3 +1,9 @@ +New in version 2.3.6: +- Minimum base of 4.13. +- Locked down non-colour imports. +- Made semigroup instances canonical. +- Updated dependencies (for testing). + New in version 2.3.5: - Support for MonadFail Proposal. - Documentation updates. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colour-2.3.5/Data/Colour/CIE.hs new/colour-2.3.6/Data/Colour/CIE.hs --- old/colour-2.3.5/Data/Colour/CIE.hs 2019-05-05 02:27:50.000000000 +0200 +++ new/colour-2.3.6/Data/Colour/CIE.hs 2021-06-24 17:40:46.000000000 +0200 @@ -37,7 +37,7 @@ ) where -import Data.List +import Data.List (foldl1') import Data.Colour import Data.Colour.RGB import Data.Colour.SRGB.Linear diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colour-2.3.5/Data/Colour/Internal.hs new/colour-2.3.6/Data/Colour/Internal.hs --- old/colour-2.3.5/Data/Colour/Internal.hs 2019-05-05 02:27:50.000000000 +0200 +++ new/colour-2.3.6/Data/Colour/Internal.hs 2021-06-24 17:40:47.000000000 +0200 @@ -22,11 +22,9 @@ -} module Data.Colour.Internal where -import Data.List +import Data.List (foldl1') import qualified Data.Colour.Chan as Chan import Data.Colour.Chan (Chan(Chan)) -import Data.Monoid -import Data.Semigroup data Red = Red data Green = Green @@ -55,12 +53,11 @@ black = RGB Chan.empty Chan.empty Chan.empty instance (Num a) => Semigroup (Colour a) where - (<>) = mappend + (RGB r1 g1 b1) <> (RGB r2 g2 b2) = + RGB (r1 `Chan.add` r2) (g1 `Chan.add` g2) (b1 `Chan.add` b2) instance (Num a) => Monoid (Colour a) where mempty = black - (RGB r1 g1 b1) `mappend` (RGB r2 g2 b2) = - RGB (r1 `Chan.add` r2) (g1 `Chan.add` g2) (b1 `Chan.add` b2) mconcat l = RGB (Chan.sum lr) (Chan.sum lg) (Chan.sum lb) where (lr,lg,lb) = unzip3 (map toRGB l) @@ -173,11 +170,10 @@ -- | 'AlphaColour' forms a monoid with 'over' and 'transparent'. instance (Num a) => Semigroup (AlphaColour a) where - (<>) = mappend + (<>) = over instance (Num a) => Monoid (AlphaColour a) where mempty = transparent - mappend = over -- | @c1 \`atop\` c2@ returns the 'AlphaColour' produced by covering -- the portion of @c2@ visible by @c1@. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colour-2.3.5/Data/Colour/Matrix.hs new/colour-2.3.6/Data/Colour/Matrix.hs --- old/colour-2.3.5/Data/Colour/Matrix.hs 2019-05-05 02:27:50.000000000 +0200 +++ new/colour-2.3.6/Data/Colour/Matrix.hs 2021-06-24 17:40:47.000000000 +0200 @@ -22,7 +22,7 @@ -} module Data.Colour.Matrix where -import Data.List +import Data.List (transpose) default (Rational) @@ -37,4 +37,4 @@ mult l x = map (sum . (zipWith (*) x)) l -matrixMult l m = transpose (map (mult l) (transpose m)) \ No newline at end of file +matrixMult l m = transpose (map (mult l) (transpose m)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colour-2.3.5/Data/Colour/RGB.hs new/colour-2.3.6/Data/Colour/RGB.hs --- old/colour-2.3.5/Data/Colour/RGB.hs 2019-05-05 02:27:50.000000000 +0200 +++ new/colour-2.3.6/Data/Colour/RGB.hs 2021-06-24 17:40:47.000000000 +0200 @@ -22,10 +22,9 @@ -} module Data.Colour.RGB where -import Data.List +import Data.List (elemIndex, transpose) import Data.Colour.Matrix import Data.Colour.CIE.Chromaticity -import Control.Applicative -- |An RGB triple for an unspecified colour space. data RGB a = RGB {channelRed :: !a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colour-2.3.5/Data/Colour/RGBSpace.hs new/colour-2.3.6/Data/Colour/RGBSpace.hs --- old/colour-2.3.5/Data/Colour/RGBSpace.hs 2019-05-05 02:27:50.000000000 +0200 +++ new/colour-2.3.6/Data/Colour/RGBSpace.hs 2021-06-24 17:40:47.000000000 +0200 @@ -46,8 +46,6 @@ ) where -import Data.Monoid -import Data.Semigroup import Data.Colour.CIE.Chromaticity import Data.Colour.Matrix import Data.Colour.RGB @@ -111,12 +109,11 @@ TransferFunction rev for (recip g) instance (Num a) => Semigroup (TransferFunction a) where - (<>) = mappend + (TransferFunction f0 f1 f) <> (TransferFunction g0 g1 g) = + (TransferFunction (f0 . g0) (g1 . f1) (f*g)) instance (Num a) => Monoid (TransferFunction a) where mempty = linearTransferFunction - (TransferFunction f0 f1 f) `mappend` (TransferFunction g0 g1 g) = - (TransferFunction (f0 . g0) (g1 . f1) (f*g)) -- |An 'RGBSpace' is a colour coordinate system for colours laying -- 'inGamut' of 'gamut'. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colour-2.3.5/Data/Colour/SRGB.hs new/colour-2.3.6/Data/Colour/SRGB.hs --- old/colour-2.3.5/Data/Colour/SRGB.hs 2019-05-05 02:27:50.000000000 +0200 +++ new/colour-2.3.6/Data/Colour/SRGB.hs 2021-06-24 17:40:46.000000000 +0200 @@ -33,8 +33,8 @@ ) where -import Data.Word -import Numeric +import Data.Word (Word8) +import Numeric (readHex, showHex) import Data.Colour.Internal (quantize) import Data.Colour.SRGB.Linear import Data.Colour.RGBSpace hiding (transferFunction) @@ -134,4 +134,4 @@ sRGBSpace :: (Ord a, Floating a) => RGBSpace a sRGBSpace = mkRGBSpace sRGBGamut transfer where - transfer = TransferFunction transferFunction invTransferFunction (recip 2.2) \ No newline at end of file + transfer = TransferFunction transferFunction invTransferFunction (recip 2.2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colour-2.3.5/Data/Colour.hs new/colour-2.3.6/Data/Colour.hs --- old/colour-2.3.5/Data/Colour.hs 2019-05-05 02:27:50.000000000 +0200 +++ new/colour-2.3.6/Data/Colour.hs 2021-06-24 17:40:46.000000000 +0200 @@ -125,7 +125,7 @@ ) where -import Data.Char +import Data.Char (isAlphaNum, isSpace) import Data.Colour.Internal import qualified Data.Colour.SRGB.Linear import Data.Colour.CIE.Chromaticity (app_prec, infix_prec) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colour-2.3.5/Tests.hs new/colour-2.3.6/Tests.hs --- old/colour-2.3.5/Tests.hs 2019-05-05 02:27:50.000000000 +0200 +++ new/colour-2.3.6/Tests.hs 2021-06-24 17:40:46.000000000 +0200 @@ -23,13 +23,13 @@ -} module Main where -import System.Random -import Data.Word -import Control.Monad -import Test.QuickCheck +import Data.Word (Word8) +import Control.Monad (liftM, liftM2, liftM3) +import Test.QuickCheck ( Arbitrary, CoArbitrary, Gen, Property + , (==>), arbitrary, choose, coarbitrary, forAll + ) import Test.Framework (defaultMain, defaultMainWithOpts, testGroup) import Test.Framework.Providers.QuickCheck2 (testProperty) -import Data.Monoid import Data.Colour.Matrix import Data.Colour diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colour-2.3.5/colour.cabal new/colour-2.3.6/colour.cabal --- old/colour-2.3.5/colour.cabal 2019-05-05 02:27:50.000000000 +0200 +++ new/colour-2.3.6/colour.cabal 2021-06-24 17:40:47.000000000 +0200 @@ -1,5 +1,5 @@ Name: colour -Version: 2.3.5 +Version: 2.3.6 Cabal-Version: >= 1.10 License: MIT License-file: LICENSE @@ -13,12 +13,12 @@ Colours can be blended and composed. Various colour spaces are supported. A module of colour names ("Data.Colour.Names") is provided. -Tested-with: GHC == 8.6.4 +Tested-with: GHC == 8.8.4 data-files: README CHANGELOG Library default-language: Haskell98 - Build-Depends: base >= 4.9 && < 5 + Build-Depends: base >= 4.13 && < 5 Exposed-Modules: Data.Colour Data.Colour.SRGB Data.Colour.SRGB.Linear @@ -34,12 +34,26 @@ Data.Colour.Matrix Data.Colour.CIE.Chromaticity test-suite test-colour - default-language: Haskell98 - type: exitcode-stdio-1.0 - main-is: Tests.hs - build-depends: base >= 4.9 && < 5, - QuickCheck >= 2.5 && < 2.14, - random >= 1.0 && < 1.2, - test-framework >= 0.8 && < 0.9, - test-framework-quickcheck2 >= 0.3 && < 0.4 - + default-language: Haskell98 + type: exitcode-stdio-1.0 + main-is: Tests.hs + build-depends: base >= 4.13 && < 5, + colour, + QuickCheck >= 2.5 && < 2.15, + random >= 1.0 && < 1.2, + test-framework >= 0.8 && < 0.9, + test-framework-quickcheck2 >= 0.3 && < 0.4 + Other-Modules: Data.Colour + Data.Colour.SRGB + Data.Colour.SRGB.Linear + Data.Colour.CIE + Data.Colour.CIE.Illuminant + Data.Colour.RGBSpace + Data.Colour.RGBSpace.HSL + Data.Colour.RGBSpace.HSV + Data.Colour.Names + Data.Colour.Internal + Data.Colour.Chan + Data.Colour.RGB + Data.Colour.Matrix + Data.Colour.CIE.Chromaticity
