From 880c114662fd0fdfa59a7956600349080599982e4da9be43ef2133fb9cc7b9fe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 4 Aug 2020 11:07:03 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-zlib revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-zlib?expand=0&rev=57 --- ghc-zlib.changes | 11 +++++ ghc-zlib.spec | 4 +- zlib-0.6.2.1.tar.gz | 3 -- zlib-0.6.2.2.tar.gz | 3 ++ zlib.cabal | 111 -------------------------------------------- 5 files changed, 15 insertions(+), 117 deletions(-) delete mode 100644 zlib-0.6.2.1.tar.gz create mode 100644 zlib-0.6.2.2.tar.gz delete mode 100644 zlib.cabal diff --git a/ghc-zlib.changes b/ghc-zlib.changes index 60a7394..c34534e 100644 --- a/ghc-zlib.changes +++ b/ghc-zlib.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Aug 4 09:04:41 UTC 2020 - psimons@suse.com + +- Update zlib to version 0.6.2.2. + 0.6.2.2 Julian Ospald August 2020 + + * Bump bundled zlib to 1.2.11, fixes #26 + * New build flag to force use of the bundled zlib C sources, #31 + * Simpler build support for ghcjs, #25 + * Add support for GHC 8.10 / base-4.14, #29 + ------------------------------------------------------------------- Tue Jun 16 11:14:55 UTC 2020 - Peter Simons diff --git a/ghc-zlib.spec b/ghc-zlib.spec index d4e094d..c233027 100644 --- a/ghc-zlib.spec +++ b/ghc-zlib.spec @@ -19,13 +19,12 @@ %global pkg_name zlib %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.6.2.1 +Version: 0.6.2.2 Release: 0 Summary: Compression and decompression in the gzip and zlib formats License: BSD-2-Clause 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-bytestring-devel BuildRequires: ghc-rpm-macros @@ -60,7 +59,6 @@ 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 diff --git a/zlib-0.6.2.1.tar.gz b/zlib-0.6.2.1.tar.gz deleted file mode 100644 index 6d84713..0000000 --- a/zlib-0.6.2.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0f810ff173560b60392db448455c0513b3239f48e43cb494b3733aa559621d0 -size 143424 diff --git a/zlib-0.6.2.2.tar.gz b/zlib-0.6.2.2.tar.gz new file mode 100644 index 0000000..a09e961 --- /dev/null +++ b/zlib-0.6.2.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04b5890dd69e992f8cd09570d81e9d5ecab19db8e82cbe47ba8e02c31c0631ba +size 148178 diff --git a/zlib.cabal b/zlib.cabal deleted file mode 100644 index 26ab193..0000000 --- a/zlib.cabal +++ /dev/null @@ -1,111 +0,0 @@ -cabal-version: >= 1.10 -name: zlib -version: 0.6.2.1 -x-revision: 1 - -copyright: (c) 2006-2016 Duncan Coutts -license: BSD3 -license-file: LICENSE -author: Duncan Coutts -maintainer: Duncan Coutts -bug-reports: https://github.com/haskell/zlib/issues -category: Codec -synopsis: Compression and decompression in the gzip and zlib formats -description: This package provides a pure interface for compressing and - decompressing streams of data represented as lazy - 'ByteString's. It uses the - - so it has high performance. It supports the \"zlib\", - \"gzip\" and \"raw\" compression formats. - . - It provides a convenient high level API suitable for most - tasks and for the few cases where more control is needed it - provides access to the full zlib feature set. -build-type: Simple -tested-with: GHC ==7.0.4, GHC ==7.2.2, GHC ==7.4.2, GHC ==7.6.3, GHC ==7.8.4, GHC ==7.10.3, GHC ==8.0.1, GHC==8.0.2, GHC ==8.2.2, GHC ==8.4.4, GHC==8.6.5, GHC==8.8.3, GHC==8.10.1 - -extra-source-files: changelog - -- zlib C sources (for Windows) - cbits/crc32.h cbits/inffast.h cbits/inflate.h - cbits/trees.h cbits/deflate.h cbits/inffixed.h - cbits/inftrees.h cbits/zutil.h cbits/gzguts.h - -- test data files - test/data/bad-crc.gz test/data/custom-dict.zlib - test/data/custom-dict.zlib-dict test/data/hello.gz - test/data/not-gzip test/data/two-files.gz - -- demo programs: - examples/gzip.hs examples/gunzip.hs - -source-repository head - type: git - location: https://github.com/haskell/zlib.git - -flag non-blocking-ffi - default: False - manual: True - description: The (de)compression calls can sometimes take a long time, which - prevents other Haskell threads running. Enabling this flag - avoids this unfairness, but with greater overall cost. - -flag pkg-config - default: False - manual: True - description: Use @pkg-config(1)@ to locate foreign @zlib@ library. - -library - exposed-modules: Codec.Compression.GZip, - Codec.Compression.Zlib, - Codec.Compression.Zlib.Raw, - Codec.Compression.Zlib.Internal - other-modules: Codec.Compression.Zlib.Stream - if impl(ghc < 7) - default-language: Haskell98 - default-extensions: PatternGuards - else - default-language: Haskell2010 - other-extensions: CPP, ForeignFunctionInterface, RankNTypes, BangPatterns, - DeriveDataTypeable - if impl(ghc >= 7.2) - other-extensions: DeriveGeneric - if impl(ghc >= 7.6) - other-extensions: CApiFFI - build-depends: base >= 4 && < 4.15, - bytestring >= 0.9 && < 0.11 - if impl(ghc >= 7.2 && < 7.6) - build-depends: ghc-prim - includes: zlib.h - ghc-options: -Wall -fwarn-tabs - if flag(non-blocking-ffi) - cpp-options: -DNON_BLOCKING_FFI - if flag(pkg-config) - -- NB: pkg-config is available on windows as well when using msys2 - pkgconfig-depends: zlib - else - -- don't use pkg-config - if !os(windows) - -- Normally we use the the standard system zlib. - extra-libraries: z - else - -- However for the benefit of users of Windows (which does not have zlib - -- by default) we bundle a complete copy of the C sources of zlib-1.2.8 - c-sources: cbits/adler32.c cbits/compress.c cbits/crc32.c - cbits/deflate.c cbits/infback.c - cbits/inffast.c cbits/inflate.c cbits/inftrees.c - cbits/trees.c cbits/uncompr.c cbits/zutil.c - include-dirs: cbits - install-includes: zlib.h zconf.h - -test-suite tests - type: exitcode-stdio-1.0 - main-is: Test.hs - other-modules: Utils, - Test.Codec.Compression.Zlib.Internal, - Test.Codec.Compression.Zlib.Stream - hs-source-dirs: test - default-language: Haskell2010 - build-depends: base, bytestring, zlib, - QuickCheck == 2.*, - tasty >= 0.8 && < 1.3, - tasty-quickcheck >= 0.8 && < 0.11, - tasty-hunit >= 0.8 && < 0.11 - ghc-options: -Wall