Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-blaze-builder for openSUSE:Factory checked in at 2021-02-16 22:37:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-blaze-builder (Old) and /work/SRC/openSUSE:Factory/.ghc-blaze-builder.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-blaze-builder" Tue Feb 16 22:37:04 2021 rev:16 rq:870447 version:0.4.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-blaze-builder/ghc-blaze-builder.changes 2020-12-22 11:35:55.337286380 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-blaze-builder.new.28504/ghc-blaze-builder.changes 2021-02-16 22:45:18.914332193 +0100 @@ -1,0 +2,12 @@ +Wed Jan 20 08:34:26 UTC 2021 - [email protected] + +- Update blaze-builder to version 0.4.2.1. + * 0.4.2.1 + - Bump cabal file to Cabal >= 1.10 + + * 0.4.2.0 + - Make semigroup instances unconditional + - Support bytestring-0.11 + - Support semigroups-0.19 + +------------------------------------------------------------------- Old: ---- blaze-builder-0.4.1.0.tar.gz blaze-builder.cabal New: ---- blaze-builder-0.4.2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-blaze-builder.spec ++++++ --- /var/tmp/diff_new_pack.1DLoYh/_old 2021-02-16 22:45:19.666333182 +0100 +++ /var/tmp/diff_new_pack.1DLoYh/_new 2021-02-16 22:45:19.674333192 +0100 @@ -1,7 +1,7 @@ # # spec file for package ghc-blaze-builder # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,13 +19,12 @@ %global pkg_name blaze-builder %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.4.1.0 +Version: 0.4.2.1 Release: 0 Summary: Efficient buffered output License: BSD-3-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-deepseq-devel @@ -66,7 +65,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ blaze-builder-0.4.1.0.tar.gz -> blaze-builder-0.4.2.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blaze-builder-0.4.1.0/Blaze/ByteString/Builder.hs new/blaze-builder-0.4.2.1/Blaze/ByteString/Builder.hs --- old/blaze-builder-0.4.1.0/Blaze/ByteString/Builder.hs 2018-03-14 22:11:24.000000000 +0100 +++ new/blaze-builder-0.4.2.1/Blaze/ByteString/Builder.hs 2001-09-09 03:46:40.000000000 +0200 @@ -120,15 +120,27 @@ unsafeDupablePerformIO = unsafePerformIO #endif +withBS :: S.ByteString -> (ForeignPtr Word8 -> Int -> Int -> a) -> a +#if MIN_VERSION_bytestring(0,11,0) +withBS (S.BS fptr len) f = f fptr 0 len +#else +withBS (S.PS fptr offset len) f = f fptr offset len +#endif +mkBS :: ForeignPtr Word8 -> Int -> S.ByteString +#if MIN_VERSION_bytestring(0,11,0) +mkBS fptr len = S.BS fptr len +#else +mkBS fptr len = S.PS fptr 0 len +#endif -- | Pack the chunks of a lazy bytestring into a single strict bytestring. packChunks :: L.ByteString -> S.ByteString packChunks lbs = do S.unsafeCreate (fromIntegral $ L.length lbs) (copyChunks lbs) where - copyChunks !L.Empty !_pf = return () - copyChunks !(L.Chunk (S.PS fpbuf o l) lbs') !pf = do + copyChunks !L.Empty !_pf = return () + copyChunks !(L.Chunk bs lbs') !pf = withBS bs $ \fpbuf o l -> do withForeignPtr fpbuf $ \pbuf -> copyBytes pf (pbuf `plusPtr` o) l copyChunks lbs' (pf `plusPtr` l) @@ -188,15 +200,15 @@ let !ptr = Unsafe.unsafeForeignPtrToPtr fp (bytes, next) <- writer ptr size case next of - B.Done -> io $! S.PS fp 0 bytes + B.Done -> io $! mkBS fp bytes B.More req writer' -> do - io $! S.PS fp 0 bytes + io $! mkBS fp bytes let !size' = max bufSize req S.mallocByteString size' >>= getBuffer writer' size' B.Chunk bs' writer' -> do if bytes > 0 then do - io $! S.PS fp 0 bytes + io $! mkBS fp bytes unless (S.null bs') (io bs') S.mallocByteString bufSize >>= getBuffer writer' bufSize else do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blaze-builder-0.4.1.0/CHANGES new/blaze-builder-0.4.2.1/CHANGES --- old/blaze-builder-0.4.1.0/CHANGES 2018-03-14 22:11:24.000000000 +0100 +++ new/blaze-builder-0.4.2.1/CHANGES 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,11 @@ +* 0.4.2.1 + - Bump cabal file to Cabal >= 1.10 + +* 0.4.2.0 + - Make semigroup instances unconditional + - Support bytestring-0.11 + - Support semigroups-0.19 + * 0.4.1.0 - Gain compatibility with the Semigroup/Monoid proposal - Add Word8 HTML escaping builders diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/blaze-builder-0.4.1.0/blaze-builder.cabal new/blaze-builder-0.4.2.1/blaze-builder.cabal --- old/blaze-builder-0.4.1.0/blaze-builder.cabal 2018-03-14 22:11:24.000000000 +0100 +++ new/blaze-builder-0.4.2.1/blaze-builder.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ Name: blaze-builder -Version: 0.4.1.0 +Version: 0.4.2.1 Synopsis: Efficient buffered output. Description: @@ -34,7 +34,7 @@ Category: Data Build-type: Simple -Cabal-version: >= 1.8 +Cabal-version: >= 1.10 Extra-source-files: Makefile @@ -55,6 +55,7 @@ Library ghc-options: -Wall + default-language: Haskell98 exposed-modules: Blaze.ByteString.Builder Blaze.ByteString.Builder.Int @@ -80,15 +81,14 @@ build-depends: bytestring >= 0.10.4 && < 1.0 if impl(ghc < 8.0) - build-depends: semigroups >= 0.16 && < 0.19 + build-depends: semigroups >= 0.16 && < 0.20 test-suite test - type: exitcode-stdio-1.0 - - hs-source-dirs: tests - main-is: Tests.hs - - ghc-options: -Wall -fno-warn-orphans + type: exitcode-stdio-1.0 + hs-source-dirs: tests + main-is: Tests.hs + default-language: Haskell98 + ghc-options: -Wall -fno-warn-orphans build-depends: base , blaze-builder
