Accepting request 1184206 from devel:languages:haskell

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1184206
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghc-zlib?expand=0&rev=30

ghc-zlib.changes

@@ -1,17 +1,3 @@
--------------------------------------------------------------------
-Sun Nov 24 20:39:41 UTC 2024 - Peter Simons <psimons@suse.com>
-
-- Update zlib to version 0.7.1.0 revision 2.
-  Upstream has revised the Cabal build instructions on Hackage.
-
--------------------------------------------------------------------
-Wed Jun 26 20:42:43 UTC 2024 - Peter Simons <psimons@suse.com>
-
-- Update zlib to version 0.7.1.0 revision 1.
-  Upstream has renamed and modified the change log file(s) in this
-  release. Unfortunately, the automatic updater cannot reliable
-  determine relevant entries for this release.
-
 -------------------------------------------------------------------
 Sun Jun 23 13:09:06 UTC 2024 - Peter Simons <psimons@suse.com>
 

ghc-zlib.spec

@@ -20,21 +20,20 @@
 %global pkgver %{pkg_name}-%{version}
 %bcond_with tests
 Name:           ghc-%{pkg_name}
-Version:        0.7.1.0
+Version:        0.6.3.0
 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/2.cabal#/%{pkg_name}.cabal
+Source1:        https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/5.cabal#/%{pkg_name}.cabal
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-base-devel
 BuildRequires:  ghc-base-prof
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-bytestring-prof
 BuildRequires:  ghc-rpm-macros
-BuildRequires:  pkgconfig
-BuildRequires:  pkgconfig(zlib)
+BuildRequires:  zlib-devel
 ExcludeArch:    %{ix86}
 %if %{with tests}
 BuildRequires:  ghc-QuickCheck-devel
@@ -59,8 +58,7 @@ set.
 Summary:        Haskell %{pkg_name} library development files
 Requires:       %{name} = %{version}-%{release}
 Requires:       ghc-compiler = %{ghc_version}
-Requires:       pkgconfig
-Requires:       pkgconfig(zlib)
+Requires:       zlib-devel
 Requires(post): ghc-compiler = %{ghc_version}
 Requires(postun): ghc-compiler = %{ghc_version}
 
@@ -106,7 +104,7 @@ cp -p %{SOURCE1} %{pkg_name}.cabal
 %license LICENSE
 
 %files devel -f %{name}-devel.files
-%doc README.md changelog.md examples
+%doc README.md changelog examples
 
 %files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files
 %license LICENSE

zlib-0.7.1.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6edd38b6b81df8d274952aa85affa6968ae86b2231e1d429ce8bc9083e6a55bc
-size 29318

zlib.cabal

@@ -1,7 +1,7 @@
 cabal-version:   >= 1.10
 name:            zlib
-version:         0.7.1.0
-x-revision: 2
+version:         0.6.3.0
+x-revision:      5
 
 copyright:       (c) 2006-2016 Duncan Coutts
 license:         BSD3
@@ -23,7 +23,13 @@ description:     This package provides a pure interface for compressing and
                  provides access to the full zlib feature set.
 build-type:      Simple
 
-tested-with:     GHC == 8.0.2
+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.2
                , GHC == 8.2.2
                , GHC == 8.4.4
                , GHC == 8.6.5
@@ -31,15 +37,16 @@ tested-with:     GHC == 8.0.2
                , GHC == 8.10.7
                , GHC == 9.0.2
                , GHC == 9.2.8
-               , GHC == 9.4.8
-               , GHC == 9.6.5
-               , GHC == 9.8.2
-               , GHC == 9.10.1
+               , GHC == 9.4.7
+               , GHC == 9.6.3
+               , GHC == 9.8.1
 
-extra-source-files: changelog.md
+extra-source-files: changelog
                     README.md
-                    -- extra headers
-                    cbits-extra/hs-zlib.h
+                    -- 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
@@ -52,23 +59,23 @@ source-repository head
   location: https://github.com/haskell/zlib.git
 
 flag non-blocking-ffi
-  default:     True
+  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:     True
-  manual:      False
-  description: Use @pkg-config@ executable to locate foreign @zlib@ library.
+  default:     False
+  manual:      True
+  description: Use @pkg-config(1)@ to locate foreign @zlib@ library.
 
 flag bundled-c-zlib
   default:     False
   manual:      True
-  description: Use @zlib-clib@ package with C sources instead of a system library.
-               C sources are used for GHCJS and WASM unconditionally
-               and on Windows unless @pkg-config@ flag is on.
+  description: Use the bundled zlib C sources. Requires pkg-config to be False.
+               For windows, this is the default.
+
 
 library
   exposed-modules: Codec.Compression.GZip,
@@ -78,46 +85,45 @@ library
   other-modules:   Codec.Compression.Zlib.Stream,
                    Codec.Compression.Zlib.ByteStringCompat
 
-  default-language: Haskell2010
+  if impl(ghc < 7)
+    default-language: Haskell98
+    default-extensions: PatternGuards
+  else
+    default-language: Haskell2010
 
   other-extensions: CPP, ForeignFunctionInterface, RankNTypes, BangPatterns,
                     DeriveDataTypeable
-  other-extensions: DeriveGeneric
-  other-extensions: CApiFFI
+  if impl(ghc >= 7.2)
+    other-extensions: DeriveGeneric
+  if impl(ghc >= 7.6)
+    other-extensions: CApiFFI
 
-  build-depends:   base >= 4.9 && < 4.22,
+  build-depends:   base >= 4 && < 4.21,
                    bytestring >= 0.9 && < 0.13
+  if impl(ghc >= 7.0 && < 8.0.3)
+    build-depends: ghc-prim
 
-  build-tools:     hsc2hs >= 0.67 && < 0.69
-  if os(windows) && impl(ghc < 8.4)
-    build-tools:     hsc2hs < 0.68.5
-    -- GHC 7 ships hsc2hs-0.67
-
-  -- use `includes:` to include them when compiling
-  includes:        zlib.h hs-zlib.h
-  include-dirs:    cbits-extra
-  c-sources:       cbits-extra/hs-zlib.c
+  includes:        zlib.h
   ghc-options:     -Wall -fwarn-tabs
   if flag(non-blocking-ffi)
     cpp-options:   -DNON_BLOCKING_FFI
-
-  -- Cross-platform builds (such as JS and WASM) must have access
-  -- to C sources, so using zlib-clib unconditionally.
-  --
-  -- On Windows, zlib is shipped as part of GHC's mingw/lib directory,
-  -- which GHC always includes in its linker search path. However,
-  -- there is no guarantee that zlib1.dll (the corresponding shared library)
-  -- will be available on the user's PATH at runtime, making it risky to depend upon
-  -- (see https://github.com/haskell/zlib/issues/65 for what can go wrong).
-  -- Thus, we resort to zlib-clib unless pkg-config is available.
-  if flag(bundled-c-zlib) || impl(ghcjs) || os(ghcjs) || arch(wasm32) || (!flag(pkg-config) && os(windows))
-    build-depends: zlib-clib < 2
+  if flag(pkg-config) && !impl(ghcjs) && !os(ghcjs)
+    -- NB: pkg-config is available on windows as well when using msys2
+    pkgconfig-depends: zlib
   else
-    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) && !flag(bundled-c-zlib) && !impl(ghcjs) && !os(ghcjs)
+      -- 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.11
+      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
@@ -130,5 +136,5 @@ test-suite tests
   build-depends:   base, bytestring, zlib,
                    QuickCheck       == 2.*,
                    tasty            >= 0.8 && < 1.6,
-                   tasty-quickcheck >= 0.8 && < 1
+                   tasty-quickcheck >= 0.8 && < 0.12
   ghc-options:     -Wall