Hello community, here is the log from the commit of package ghc-colour for openSUSE:Factory checked in at 2018-05-30 12:04:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-colour (Old) and /work/SRC/openSUSE:Factory/.ghc-colour.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-colour" Wed May 30 12:04:43 2018 rev:4 rq:607768 version:2.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-colour/ghc-colour.changes 2017-09-15 21:27:35.554131297 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-colour.new/ghc-colour.changes 2018-05-30 12:25:10.402588187 +0200 @@ -1,0 +2,7 @@ +Mon May 14 17:02:11 UTC 2018 - [email protected] + +- Update colour to version 2.3.4. + * Support for Semigroup (as superclass of) Monoid Proposal. + * Add test-suite to cabal file. + +------------------------------------------------------------------- Old: ---- colour-2.3.3.tar.gz New: ---- colour-2.3.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-colour.spec ++++++ --- /var/tmp/diff_new_pack.t8CMke/_old 2018-05-30 12:25:11.246560702 +0200 +++ /var/tmp/diff_new_pack.t8CMke/_new 2018-05-30 12:25:11.250560571 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-colour # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -17,8 +17,9 @@ %global pkg_name colour +%bcond_with tests Name: ghc-%{pkg_name} -Version: 2.3.3 +Version: 2.3.4 Release: 0 Summary: A model for human colour/color perception License: MIT @@ -27,6 +28,12 @@ Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros +%if %{with tests} +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-random-devel +BuildRequires: ghc-test-framework-devel +BuildRequires: ghc-test-framework-quickcheck2-devel +%endif %description This package provides a data type for colours and transparency. @@ -55,6 +62,9 @@ rm %{buildroot}/%{_datadir}/%{pkg_name}-%{version}/README rm %{buildroot}/%{_datadir}/%{pkg_name}-%{version}/CHANGELOG +%check +%cabal_test + %post devel %ghc_pkg_recache @@ -62,7 +72,7 @@ %ghc_pkg_recache %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files %doc README ++++++ colour-2.3.3.tar.gz -> colour-2.3.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colour-2.3.3/CHANGELOG new/colour-2.3.4/CHANGELOG --- old/colour-2.3.3/CHANGELOG 2012-01-17 16:49:47.000000000 +0100 +++ new/colour-2.3.4/CHANGELOG 2017-12-04 04:43:01.000000000 +0100 @@ -1,3 +1,8 @@ +New in version 2.3.4: + +- Support for Semigroup (as superclass of) Monoid Proposal. +- Add test-suite to cabal file. + New in version 2.3.3: - Support for GHC 7.4 from Eugene Kirpichov. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colour-2.3.3/Data/Colour/Internal.hs new/colour-2.3.4/Data/Colour/Internal.hs --- old/colour-2.3.3/Data/Colour/Internal.hs 2012-01-17 16:49:47.000000000 +0100 +++ new/colour-2.3.4/Data/Colour/Internal.hs 2017-12-04 04:43:01.000000000 +0100 @@ -26,6 +26,7 @@ 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 @@ -53,6 +54,9 @@ black :: (Num a) => Colour a black = RGB Chan.empty Chan.empty Chan.empty +instance (Num a) => Semigroup (Colour a) where + (<>) = mappend + instance (Num a) => Monoid (Colour a) where mempty = black (RGB r1 g1 b1) `mappend` (RGB r2 g2 b2) = @@ -168,6 +172,9 @@ darken s (RGBA c a) = RGBA (darken s c) a -- | 'AlphaColour' forms a monoid with 'over' and 'transparent'. +instance (Num a) => Semigroup (AlphaColour a) where + (<>) = mappend + instance (Num a) => Monoid (AlphaColour a) where mempty = transparent mappend = over diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colour-2.3.3/Data/Colour/RGBSpace.hs new/colour-2.3.4/Data/Colour/RGBSpace.hs --- old/colour-2.3.3/Data/Colour/RGBSpace.hs 2012-01-17 16:49:47.000000000 +0100 +++ new/colour-2.3.4/Data/Colour/RGBSpace.hs 2017-12-04 04:43:01.000000000 +0100 @@ -47,6 +47,7 @@ where import Data.Monoid +import Data.Semigroup import Data.Colour.CIE.Chromaticity import Data.Colour.Matrix import Data.Colour.RGB @@ -109,6 +110,9 @@ inverseTransferFunction (TransferFunction for rev g) = TransferFunction rev for (recip g) +instance (Num a) => Semigroup (TransferFunction a) where + (<>) = mappend + instance (Num a) => Monoid (TransferFunction a) where mempty = linearTransferFunction (TransferFunction f0 f1 f) `mappend` (TransferFunction g0 g1 g) = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colour-2.3.3/Tests.hs new/colour-2.3.4/Tests.hs --- old/colour-2.3.3/Tests.hs 2012-01-17 16:49:47.000000000 +0100 +++ new/colour-2.3.4/Tests.hs 2017-12-04 04:43:01.000000000 +0100 @@ -1,4 +1,4 @@ -{-# OPTIONS_GHC -XTypeSynonymInstances #-} +{-# LANGUAGE TypeSynonymInstances #-} {- Copyright (c) 2008, 2009 Russell O'Connor @@ -27,7 +27,8 @@ import Data.Word import Control.Monad import Test.QuickCheck -import Text.Printf +import Test.Framework (defaultMain, defaultMainWithOpts, testGroup) +import Test.Framework.Providers.QuickCheck2 (testProperty) import Data.Monoid import Data.Colour.Matrix @@ -119,7 +120,7 @@ prop_matrixMult (a1,b1,c1) (d1,e1,f1) (g1,h1,i1) (a2,b2,c2) (d2,e2,f2) (g2,h2,i2) (x,y,z) = mult m1 (mult m2 v) == mult (matrixMult m1 m2) v - where + where m1 = [[a1,b1,c1],[d1,e1,f1],[g1,h1,i1]] m2 = [[a2,b2,c2],[d2,e2,f2],[g2,h2,i2]] v :: [Rational] @@ -189,19 +190,19 @@ prop_overOpaque c1 c2 = c1 `over` opaque c2 == opaque (c1 `over` c2) prop_blendOver :: Rational -> RColour -> RColour -> Bool -prop_blendOver o c1 c2 = +prop_blendOver o c1 c2 = (c1 `withOpacity` o) `over` c2 == blend o c1 c2 prop_blendTransparent :: Rational -> Rational -> RColour -> Bool -prop_blendTransparent o a c = +prop_blendTransparent o a c = blend o (c `withOpacity` a) transparent == c `withOpacity ` (o*a) prop_blendFlip :: Rational -> RColour -> RColour -> Bool -prop_blendFlip o c1 c2 = +prop_blendFlip o c1 c2 = blend (1-o) c2 c1 == blend o c1 c2 prop_darkenBlend :: Rational -> RColour -> Bool -prop_darkenBlend w c = +prop_darkenBlend w c = blend w c mempty == darken w c prop_darkenBlack :: RAlphaColour -> Bool @@ -268,7 +269,7 @@ prop_fromToHSL h = forAll (two (fmap toRational zeroOne)) (\(s,l) -> checkHSL (hslView (hsl h s l)) (h,s,l)) where - checkHSL (h0,s0,l0) (h1,s1,l1) = + checkHSL (h0,s0,l0) (h1,s1,l1) = snd (properFraction ((h0-h1)/360)::(Integer,Rational)) == 0 && s0 == s1 && l0 == l1 @@ -281,50 +282,50 @@ prop_fromToHSV h = forAll (two (fmap toRational zeroOne)) (\(s,v) -> checkHSV (hsvView (hsv h s v)) (h,s,v)) where - checkHSV (h0,s0,v0) (h1,s1,v1) = + checkHSV (h0,s0,v0) (h1,s1,v1) = snd (properFraction ((h0-h1)/360)::(Integer,Rational)) == 0 && s0 == s1 && v0 == v1 -quickChecks = [("matrix-mult", quickCheck prop_matrixMult) - ,("RGB-to-from", quickCheck prop_toFromRGB) - ,("RGB-from-to", quickCheck prop_fromToRGB) - ,("XYZ-to-from", quickCheck prop_toFromXYZ) - ,("XYZ-from-to", quickCheck prop_fromToXYZ) - ,("sRGB-to-from", quickCheck prop_toFromSRGB) - ,("sRGB-from-to", quickCheck prop_fromToSRGB) - ,("cieLAB-to-from", quickCheck (prop_toFromLAB d65)) --- ,("Y'CbCr-709-from-to", quickCheck prop_fromToY'CbCr709) --- ,("Y'CbCr-601-from-to", quickCheck prop_fromToY'CbCr601) - ,("dissolve-id", quickCheck prop_disolveId) - ,("dissolve-transparent", quickCheck prop_disolveTransparent) - ,("transparent-over", quickCheck prop_transparentOver) - ,("over-transparent", quickCheck prop_overTransparent) - ,("opaque-over", quickCheck prop_opaqueOver) - ,("over-opaque", quickCheck prop_overOpaque) - ,("blend-over", quickCheck prop_blendOver) - ,("blend-transparent", quickCheck prop_blendTransparent) - ,("blend-flip", quickCheck prop_blendFlip) - ,("darken-blend", quickCheck prop_darkenBlend) - ,("darken-black", quickCheck prop_darkenBlack) - ,("darken-id", quickCheck prop_darkenId) - ,("atop-opaque", quickCheck prop_atopOpaque) - ,("transparent-atop", quickCheck prop_transparentAtop) - ,("atop-transparent", quickCheck prop_atopTransparent) - ,("atop-alpha", quickCheck prop_atopAlpha) - ,("colour-show-read", quickCheck prop_showReadC) - ,("alphaColour-show-read", quickCheck prop_showReadAC) - ,("sRGB24-show-length", quickCheck prop_sRGB24showlength) - ,("sRGB24-read-show", quickCheck prop_readshowSRGB24) - ,("luminance-white", quickCheck prop_luminance_white) - ,("rgb", quickCheck prop_rgb) - ,("toRGB", quickCheck prop_toRGB) - ,("sRGB", quickCheck prop_sRGB) - ,("toSRGB", quickCheck prop_toSRGB) - ,("hueRange", quickCheck prop_hueRange) - ,("toFromHSL", quickCheck prop_toFromHSL) - ,("fromToHSL", quickCheck prop_fromToHSL) - ,("toFromHSV", quickCheck prop_toFromHSV) - ,("fromToHSV", quickCheck prop_fromToHSV) +tests = [ testProperty "matrix-mult" prop_matrixMult + , testProperty "RGB-to-from" prop_toFromRGB + , testProperty "RGB-from-to" prop_fromToRGB + , testProperty "XYZ-to-from" prop_toFromXYZ + , testProperty "XYZ-from-to" prop_fromToXYZ + , testProperty "sRGB-to-from" prop_toFromSRGB + , testProperty "sRGB-from-to" prop_fromToSRGB + , testProperty "cieLAB-to-from" (prop_toFromLAB d65) +-- , testProperty "Y'CbCr-709-from-to" prop_fromToY'CbCr709 +-- , testProperty "Y'CbCr-601-from-to" prop_fromToY'CbCr601 + , testProperty "dissolve-id" prop_disolveId + , testProperty "dissolve-transparent" prop_disolveTransparent + , testProperty "transparent-over" prop_transparentOver + , testProperty "over-transparent" prop_overTransparent + , testProperty "opaque-over" prop_opaqueOver + , testProperty "over-opaque" prop_overOpaque + , testProperty "blend-over" prop_blendOver + , testProperty "blend-transparent" prop_blendTransparent + , testProperty "blend-flip" prop_blendFlip + , testProperty "darken-blend" prop_darkenBlend + , testProperty "darken-black" prop_darkenBlack + , testProperty "darken-id" prop_darkenId + , testProperty "atop-opaque" prop_atopOpaque + , testProperty "transparent-atop" prop_transparentAtop + , testProperty "atop-transparent" prop_atopTransparent + , testProperty "atop-alpha" prop_atopAlpha + , testProperty "colour-show-read" prop_showReadC + , testProperty "alphaColour-show-read" prop_showReadAC + , testProperty "sRGB24-show-length" prop_sRGB24showlength + , testProperty "sRGB24-read-show" prop_readshowSRGB24 + , testProperty "luminance-white" prop_luminance_white + , testProperty "rgb" prop_rgb + , testProperty "toRGB" prop_toRGB + , testProperty "sRGB" prop_sRGB + , testProperty "toSRGB" prop_toSRGB + , testProperty "hueRange" prop_hueRange + , testProperty "toFromHSL" prop_toFromHSL + , testProperty "fromToHSL" prop_fromToHSL + , testProperty "toFromHSV" prop_toFromHSV + , testProperty "fromToHSV" prop_fromToHSV ] -main = mapM_ (\(s,a) -> printf "%-25s: " s >> a) quickChecks +main = defaultMain tests diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/colour-2.3.3/colour.cabal new/colour-2.3.4/colour.cabal --- old/colour-2.3.3/colour.cabal 2012-01-17 16:49:47.000000000 +0100 +++ new/colour-2.3.4/colour.cabal 2017-12-04 04:43:01.000000000 +0100 @@ -1,6 +1,6 @@ Name: colour -Version: 2.3.3 -Cabal-Version: >= 1.6 +Version: 2.3.4 +Cabal-Version: >= 1.10 License: MIT License-file: LICENSE Author: Russell O'Connor @@ -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 == 6.12.3 -extra-source-files: Tests.hs +Tested-with: GHC == 8.0.2 data-files: README CHANGELOG Library - Build-Depends: base >= 3 && < 5 + default-language: Haskell98 + Build-Depends: base >= 4.9 && < 5 Exposed-Modules: Data.Colour Data.Colour.SRGB Data.Colour.SRGB.Linear @@ -33,3 +33,13 @@ Data.Colour.RGB 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.11, + random >= 1.0 && < 1.2, + test-framework >= 0.8 && < 0.9, + test-framework-quickcheck2 >= 0.3 && < 0.4 +
