From a02e7ac400d0de81626c86bf8ebc2dc7041adfe4b666f755dfa1ea2b404a5673 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Dec 2018 02:01:27 +0000 Subject: [PATCH 1/2] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-JuicyPixels revision:5, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-JuicyPixels?expand=0&rev=61 --- JuicyPixels.cabal | 88 ++++++++++++++++++++++++++++++++++++++++++++ ghc-JuicyPixels.spec | 2 + 2 files changed, 90 insertions(+) create mode 100644 JuicyPixels.cabal diff --git a/JuicyPixels.cabal b/JuicyPixels.cabal new file mode 100644 index 0000000..c08bce0 --- /dev/null +++ b/JuicyPixels.cabal @@ -0,0 +1,88 @@ +Name: JuicyPixels +Version: 3.3.3 +x-revision: 1 +Synopsis: Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance) +Description: + <> + . + This library can load and store images in PNG,Bitmap, Jpeg, Radiance, Tiff and Gif images. + +homepage: https://github.com/Twinside/Juicy.Pixels +License: BSD3 +License-file: LICENSE +Author: Vincent Berthoux +Maintainer: vincent.berthoux@gmail.com +Category: Codec, Graphics, Image +Stability: Stable +Build-type: Simple + +-- Constraint on the version of Cabal needed to build this package. +Cabal-version: >= 1.18 + +extra-source-files: changelog, docimages/*.png, docimages/*.svg, README.md +extra-doc-files: docimages/*.png, docimages/*.svg + +Source-Repository head + Type: git + Location: git://github.com/Twinside/Juicy.Pixels.git + +Source-Repository this + Type: git + Location: git://github.com/Twinside/Juicy.Pixels.git + Tag: v3.3.3 + +Flag Mmap + Description: Enable the file loading via mmap (memory map) + Default: False + +Library + hs-source-dirs: src + Default-Language: Haskell2010 + Exposed-modules: Codec.Picture, + Codec.Picture.Bitmap, + Codec.Picture.Gif, + Codec.Picture.Png, + Codec.Picture.Jpg, + Codec.Picture.HDR, + Codec.Picture.Tga, + Codec.Picture.Tiff, + Codec.Picture.Metadata, + Codec.Picture.Metadata.Exif, + Codec.Picture.Saving, + Codec.Picture.Types, + Codec.Picture.ColorQuant, + Codec.Picture.Jpg.Internal.DefaultTable, + Codec.Picture.Jpg.Internal.Metadata, + Codec.Picture.Jpg.Internal.FastIdct, + Codec.Picture.Jpg.Internal.FastDct, + Codec.Picture.Jpg.Internal.Types, + Codec.Picture.Jpg.Internal.Common, + Codec.Picture.Jpg.Internal.Progressive, + Codec.Picture.Gif.Internal.LZW, + Codec.Picture.Gif.Internal.LZWEncoding, + Codec.Picture.Png.Internal.Export, + Codec.Picture.Png.Internal.Type, + Codec.Picture.Png.Internal.Metadata, + Codec.Picture.Tiff.Internal.Metadata, + Codec.Picture.Tiff.Internal.Types + + Ghc-options: -O3 -Wall + Build-depends: base >= 4.11 && < 5, + bytestring >= 0.9 && < 0.11, + mtl >= 1.1 && < 2.3, + binary >= 0.5 && < 0.9, + zlib >= 0.5.3.1 && < 0.7, + transformers >= 0.2, + vector >= 0.10 && < 0.13, + primitive >= 0.4 && < 0.7, + deepseq >= 1.1 && < 1.5, + containers >= 0.4.2 && < 0.7 + + -- Modules not exported by this package. + Other-modules: Codec.Picture.BitWriter, + Codec.Picture.InternalHelper, + Codec.Picture.VectorByteConversion + + Install-Includes: src/Codec/Picture/ConvGraph.hs + Include-Dirs: src/Codec/Picture + diff --git a/ghc-JuicyPixels.spec b/ghc-JuicyPixels.spec index 8f294df..ae3a761 100644 --- a/ghc-JuicyPixels.spec +++ b/ghc-JuicyPixels.spec @@ -25,6 +25,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-binary-devel BuildRequires: ghc-bytestring-devel @@ -54,6 +55,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} +cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build From 57ee67174accffcd21d69d82655f4f45b0471c33c3a2efbaaa47c7c1d15fd7ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 26 Dec 2018 13:25:26 +0000 Subject: [PATCH 2/2] osc copypac from project:devel:languages:haskell:ghc-8.6.x package:ghc-JuicyPixels revision:6, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-JuicyPixels?expand=0&rev=63 --- ghc-JuicyPixels.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ghc-JuicyPixels.changes b/ghc-JuicyPixels.changes index 2876bc3..a0d95e2 100644 --- a/ghc-JuicyPixels.changes +++ b/ghc-JuicyPixels.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Dec 26 13:22:56 UTC 2018 - Peter Simons + +- Fix an incorrectly specified upper bound on the 'base' library. + ------------------------------------------------------------------- Mon Dec 17 03:01:26 UTC 2018 - psimons@suse.com