diff -Nru haskell-diagrams-svg-1.4.3/CHANGELOG.md haskell-diagrams-svg-1.4.3.1/CHANGELOG.md --- haskell-diagrams-svg-1.4.3/CHANGELOG.md 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-svg-1.4.3.1/CHANGELOG.md 2001-09-09 01:46:40.000000000 +0000 @@ -1,3 +1,23 @@ +## [v1.4.3.1](https://github.com/diagrams/diagrams-svg/tree/v1.4.3.1) (2021-12-28) + +- Dependency upper bounds updates to allow: + - `base-4.16` (GHC 9.2) + - `lens-5.1` + - `hashable-1.4` + - `semigroups-0.20` +- Add `Eq` instance for `Options SVG` and (orphan) `Eq` instance for `Element` + +## [v1.4.3-r3](https://github.com/diagrams/diagrams-svg/tree/v1.4.3-r3) (2021-06-08) + +Dependency upper bounds updates, to allow: + +- `base-4.15` (GHC 9.0) +- `base64-bytestring-1.2` +- `diagrams-core-1.5` +- `monoid-extras-0.6` +- `lens-5.0` +- `optparse-applicative-0.16` + ## [v1.4.3](https://github.com/diagrams/diagrams-svg/tree/v1.4.3) (2019-12-10) - Allow `base-4.13` (GHC 8.8), `lens-4.18`, `semigroups-0.19`, diff -Nru haskell-diagrams-svg-1.4.3/debian/changelog haskell-diagrams-svg-1.4.3.1/debian/changelog --- haskell-diagrams-svg-1.4.3/debian/changelog 2020-10-29 20:24:47.000000000 +0000 +++ haskell-diagrams-svg-1.4.3.1/debian/changelog 2022-07-27 09:16:52.000000000 +0000 @@ -1,32 +1,10 @@ -haskell-diagrams-svg (1.4.3-1build5) hirsute; urgency=medium +haskell-diagrams-svg (1.4.3.1-1) unstable; urgency=medium - * No-change rebuild for new GHC ABIs + * Declare compliance with Debian policy 4.6.1 + * Remove retired developer, Joachim Breitner, from Uploaders. + * New upstream release - -- Steve Langasek Thu, 29 Oct 2020 20:24:47 +0000 - -haskell-diagrams-svg (1.4.3-1build4) groovy; urgency=medium - - * No-change rebuild for new GHC ABIs - - -- Steve Langasek Sat, 29 Aug 2020 18:57:21 +0000 - -haskell-diagrams-svg (1.4.3-1build3) groovy; urgency=medium - - * Rebuild against new GHC ABI. - - -- Gianfranco Costamagna Fri, 14 Aug 2020 16:14:29 +0200 - -haskell-diagrams-svg (1.4.3-1build2) groovy; urgency=medium - - * Rebuild against new GHC abi. - - -- Gianfranco Costamagna Fri, 24 Jul 2020 19:46:31 +0200 - -haskell-diagrams-svg (1.4.3-1build1) groovy; urgency=medium - - * No-change rebuild for new GHC ABIs - - -- Steve Langasek Sat, 11 Jul 2020 06:52:09 +0000 + -- Ilias Tsitsimpis Wed, 27 Jul 2022 12:16:52 +0300 haskell-diagrams-svg (1.4.3-1) unstable; urgency=medium diff -Nru haskell-diagrams-svg-1.4.3/debian/control haskell-diagrams-svg-1.4.3.1/debian/control --- haskell-diagrams-svg-1.4.3/debian/control 2020-07-11 06:52:09.000000000 +0000 +++ haskell-diagrams-svg-1.4.3.1/debian/control 2022-07-27 09:16:52.000000000 +0000 @@ -1,8 +1,7 @@ Source: haskell-diagrams-svg -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Haskell Group +Maintainer: Debian Haskell Group Uploaders: - Joachim Breitner , + Ilias Tsitsimpis , Priority: optional Section: haskell Rules-Requires-Root: no @@ -16,33 +15,33 @@ libghc-juicypixels-dev (<< 3.4), libghc-juicypixels-prof, libghc-base64-bytestring-dev (>= 1), - libghc-base64-bytestring-dev (<< 1.1), + libghc-base64-bytestring-dev (<< 1.3), libghc-base64-bytestring-prof, libghc-colour-dev, libghc-colour-prof, libghc-diagrams-core-dev (>= 1.4), - libghc-diagrams-core-dev (<< 1.5), + libghc-diagrams-core-dev (<< 1.6), libghc-diagrams-core-prof, libghc-diagrams-lib-dev (>= 1.4), libghc-diagrams-lib-dev (<< 1.5), libghc-diagrams-lib-prof, libghc-hashable-dev (>= 1.1), - libghc-hashable-dev (<< 1.4), + libghc-hashable-dev (<< 1.5), libghc-hashable-prof, libghc-juicypixels-dev (<< 3.4), libghc-juicypixels-dev (>= 3.1.5), libghc-juicypixels-prof, libghc-lens-dev (>= 4.0), - libghc-lens-dev (<< 4.20), + libghc-lens-dev (<< 5.2), libghc-lens-prof, libghc-monoid-extras-dev (>= 0.3), - libghc-monoid-extras-dev (<< 0.6), + libghc-monoid-extras-dev (<< 0.7), libghc-monoid-extras-prof, libghc-optparse-applicative-dev (>= 0.13), - libghc-optparse-applicative-dev (<< 0.16), + libghc-optparse-applicative-dev (<< 0.17), libghc-optparse-applicative-prof, libghc-semigroups-dev (>= 0.13), - libghc-semigroups-dev (<< 0.20), + libghc-semigroups-dev (<< 0.21), libghc-semigroups-prof, libghc-split-dev (<< 0.3), libghc-split-dev (>= 0.1.2), @@ -64,8 +63,8 @@ libghc-semigroups-doc, libghc-split-doc, libghc-svg-builder-doc, -Standards-Version: 4.5.0 -Homepage: http://projects.haskell.org/diagrams/ +Standards-Version: 4.6.1 +Homepage: https://diagrams.github.io/ Vcs-Browser: https://salsa.debian.org/haskell-team/DHG_packages/tree/master/p/haskell-diagrams-svg Vcs-Git: https://salsa.debian.org/haskell-team/DHG_packages.git [p/haskell-diagrams-svg] diff -Nru haskell-diagrams-svg-1.4.3/debian/patches/newer-deps haskell-diagrams-svg-1.4.3.1/debian/patches/newer-deps --- haskell-diagrams-svg-1.4.3/debian/patches/newer-deps 2020-06-16 22:44:13.000000000 +0000 +++ haskell-diagrams-svg-1.4.3.1/debian/patches/newer-deps 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ ---- a/diagrams-svg.cabal -+++ b/diagrams-svg.cabal -@@ -40,7 +40,7 @@ - Diagrams.Backend.SVG.CmdLine - Other-modules: Graphics.Rendering.SVG - Hs-source-dirs: src -- Build-depends: base >= 4.7 && < 4.14 -+ Build-depends: base >= 4.7 && < 5 - , filepath - , mtl >= 1 && < 2.3 - , bytestring >= 0.9 && < 1.0 -@@ -54,7 +54,7 @@ - , JuicyPixels >= 3.1.5 && < 3.4 - , split >= 0.1.2 && < 0.3 - , containers >= 0.3 && < 0.7 -- , lens >= 4.0 && < 4.19 -+ , lens >= 4.0 && < 4.20 - , hashable >= 1.1 && < 1.4 - , optparse-applicative >= 0.13 && < 0.16 - , semigroups >= 0.13 && < 0.20 diff -Nru haskell-diagrams-svg-1.4.3/debian/patches/series haskell-diagrams-svg-1.4.3.1/debian/patches/series --- haskell-diagrams-svg-1.4.3/debian/patches/series 2020-02-08 01:58:08.000000000 +0000 +++ haskell-diagrams-svg-1.4.3.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -newer-deps diff -Nru haskell-diagrams-svg-1.4.3/diagrams-svg.cabal haskell-diagrams-svg-1.4.3.1/diagrams-svg.cabal --- haskell-diagrams-svg-1.4.3/diagrams-svg.cabal 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-svg-1.4.3.1/diagrams-svg.cabal 2001-09-09 01:46:40.000000000 +0000 @@ -1,7 +1,7 @@ Name: diagrams-svg -Version: 1.4.3 +Version: 1.4.3.1 Synopsis: SVG backend for diagrams drawing EDSL. -Homepage: http://projects.haskell.org/diagrams/ +Homepage: https://diagrams.github.io/ License: BSD3 License-file: LICENSE Extra-source-files: README.md, CHANGELOG.md @@ -12,7 +12,7 @@ Category: Graphics Build-type: Simple Cabal-version: >=1.10 -Tested-with: GHC ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.3 || ==8.6.5 || ==8.8.1 +Tested-with: GHC ==8.4.4 || ==8.6.5 || ==8.8.4 || ==8.10.4 || ==9.0.1 || ==9.2.1 Description: This package provides a modular backend for rendering diagrams created with the diagrams EDSL to SVG files. It uses @lucid-svg@ to be a native @@ -40,26 +40,24 @@ Diagrams.Backend.SVG.CmdLine Other-modules: Graphics.Rendering.SVG Hs-source-dirs: src - Build-depends: base >= 4.7 && < 4.14 + Build-depends: base >= 4.7 && < 4.17 , filepath , mtl >= 1 && < 2.3 , bytestring >= 0.9 && < 1.0 - , base64-bytestring >= 1 && < 1.1 + , base64-bytestring >= 1 && < 1.3 , colour - , diagrams-core >= 1.4 && < 1.5 + , diagrams-core >= 1.4 && < 1.6 , diagrams-lib >= 1.4 && < 1.5 - , monoid-extras >= 0.3 && < 0.6 + , monoid-extras >= 0.3 && < 0.7 , svg-builder >= 0.1 && < 0.2 , text >= 0.11 && < 1.3 , JuicyPixels >= 3.1.5 && < 3.4 , split >= 0.1.2 && < 0.3 , containers >= 0.3 && < 0.7 - , lens >= 4.0 && < 4.19 - , hashable >= 1.1 && < 1.4 - , optparse-applicative >= 0.13 && < 0.16 - , semigroups >= 0.13 && < 0.20 - if impl(ghc < 7.6) - build-depends: ghc-prim + , lens >= 4.0 && < 5.2 + , hashable >= 1.1 && < 1.5 + , optparse-applicative >= 0.13 && < 0.17 + , semigroups >= 0.13 && < 0.21 Ghc-options: -Wall diff -Nru haskell-diagrams-svg-1.4.3/src/Diagrams/Backend/SVG/CmdLine.hs haskell-diagrams-svg-1.4.3.1/src/Diagrams/Backend/SVG/CmdLine.hs --- haskell-diagrams-svg-1.4.3/src/Diagrams/Backend/SVG/CmdLine.hs 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-svg-1.4.3.1/src/Diagrams/Backend/SVG/CmdLine.hs 2001-09-09 01:46:40.000000000 +0000 @@ -50,7 +50,7 @@ -- "Diagrams.Backend.SVG" for more information. -- -- For a tutorial on command-line diagram creation see --- . +-- . -- ----------------------------------------------------------------------------- diff -Nru haskell-diagrams-svg-1.4.3/src/Diagrams/Backend/SVG.hs haskell-diagrams-svg-1.4.3.1/src/Diagrams/Backend/SVG.hs --- haskell-diagrams-svg-1.4.3/src/Diagrams/Backend/SVG.hs 2001-09-09 01:46:40.000000000 +0000 +++ haskell-diagrams-svg-1.4.3.1/src/Diagrams/Backend/SVG.hs 2001-09-09 01:46:40.000000000 +0000 @@ -17,6 +17,8 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeSynonymInstances #-} +{-# OPTIONS_GHC -fno-warn-orphans #-} + ---------------------------------------------------------------------------- -- | -- Module : Diagrams.Backend.SVG @@ -125,6 +127,7 @@ import Control.Monad.Reader import Control.Monad.State import Data.Char +import Data.Function (on) import Data.Typeable -- from hashable @@ -254,6 +257,7 @@ -- ^ Attriubtes to apply to the entire svg element. , _generateDoctype :: Bool } + deriving Eq renderRTree :: SVG -> Options SVG V2 n -> RTree SVG V2 n Annotation -> Result SVG V2 n renderRTree _ opts rt = runRenderM (opts ^.idPrefix) svgOutput @@ -427,3 +431,12 @@ sa `hashWithSalt` gd where ds = fmap renderBS defs + +-- This is an orphan instance. Since Element is defined as a newtype +-- of (HashMap Text Text -> Builder), it doesn't really make sense to +-- define an Eq instance for it in general. However, as of +-- hashable-1.4 an Eq superclass was added to Hashable, so in order to +-- have a Hashable instance for Options SVG, we need to have a +-- matching Eq instance. +instance Eq Element where + (==) = (==) `on` renderBS