Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-streaming-commons for
openSUSE:Factory checked in at 2021-12-19 17:34:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-streaming-commons (Old)
and /work/SRC/openSUSE:Factory/.ghc-streaming-commons.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-streaming-commons"
Sun Dec 19 17:34:16 2021 rev:24 rq:932799 version:0.2.2.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-streaming-commons/ghc-streaming-commons.changes
2020-12-22 11:46:35.649869120 +0100
+++
/work/SRC/openSUSE:Factory/.ghc-streaming-commons.new.2520/ghc-streaming-commons.changes
2021-12-19 17:34:20.212260729 +0100
@@ -1,0 +2,8 @@
+Wed Nov 10 10:04:56 UTC 2021 - [email protected]
+
+- Update streaming-commons to version 0.2.2.2.
+ ## 0.2.2.2
+
+ * Support GHC 9.2 [#62](https://github.com/fpco/streaming-commons/pull/62)
+
+-------------------------------------------------------------------
Old:
----
streaming-commons-0.2.2.1.tar.gz
New:
----
streaming-commons-0.2.2.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-streaming-commons.spec ++++++
--- /var/tmp/diff_new_pack.VLhPoK/_old 2021-12-19 17:34:20.772261123 +0100
+++ /var/tmp/diff_new_pack.VLhPoK/_new 2021-12-19 17:34:20.776261126 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ghc-streaming-commons
#
-# 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,7 +19,7 @@
%global pkg_name streaming-commons
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.2.2.1
+Version: 0.2.2.2
Release: 0
Summary: Common lower-level functions needed by various streaming data
libraries
License: MIT
++++++ streaming-commons-0.2.2.1.tar.gz -> streaming-commons-0.2.2.2.tar.gz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/streaming-commons-0.2.2.1/ChangeLog.md
new/streaming-commons-0.2.2.2/ChangeLog.md
--- old/streaming-commons-0.2.2.1/ChangeLog.md 2020-07-19 18:22:26.000000000
+0200
+++ new/streaming-commons-0.2.2.2/ChangeLog.md 2021-11-09 09:15:15.000000000
+0100
@@ -1,5 +1,9 @@
# ChangeLog for streaming-commons
+## 0.2.2.2
+
+* Support GHC 9.2 [#62](https://github.com/fpco/streaming-commons/pull/62)
+
## 0.2.2.1
* Fix test suite compilation issue
[stackage#5528](https://github.com/commercialhaskell/stackage/issues/5528)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/streaming-commons-0.2.2.1/Data/Text/Internal/Encoding/Utf16.hs
new/streaming-commons-0.2.2.2/Data/Text/Internal/Encoding/Utf16.hs
--- old/streaming-commons-0.2.2.1/Data/Text/Internal/Encoding/Utf16.hs
2020-07-19 14:43:33.000000000 +0200
+++ new/streaming-commons-0.2.2.2/Data/Text/Internal/Encoding/Utf16.hs
2021-11-09 09:14:45.000000000 +0100
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-# LANGUAGE MagicHash, BangPatterns #-}
-- |
@@ -29,8 +30,8 @@
chr2 :: Word16 -> Word16 -> Char
chr2 (W16# a#) (W16# b#) = C# (chr# (upper# +# lower# +# 0x10000#))
where
- !x# = word2Int# a#
- !y# = word2Int# b#
+ !x# = word2Int# (word16ToWordCompat# a#)
+ !y# = word2Int# (word16ToWordCompat# b#)
!upper# = uncheckedIShiftL# (x# -# 0xD800#) 10#
!lower# = y# -# 0xDC00#
{-# INLINE chr2 #-}
@@ -43,3 +44,11 @@
validate2 x1 x2 = x1 >= 0xD800 && x1 <= 0xDBFF &&
x2 >= 0xDC00 && x2 <= 0xDFFF
{-# INLINE validate2 #-}
+
+#if MIN_VERSION_base(4,16,0)
+word16ToWordCompat# :: Word16# -> Word#
+word16ToWordCompat# = word16ToWord#
+#else
+word16ToWordCompat# :: Word# -> Word#
+word16ToWordCompat# x = x
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/streaming-commons-0.2.2.1/Data/Text/Internal/Encoding/Utf8.hs
new/streaming-commons-0.2.2.2/Data/Text/Internal/Encoding/Utf8.hs
--- old/streaming-commons-0.2.2.1/Data/Text/Internal/Encoding/Utf8.hs
2020-07-19 14:43:33.000000000 +0200
+++ new/streaming-commons-0.2.2.2/Data/Text/Internal/Encoding/Utf8.hs
2021-11-09 09:14:45.000000000 +0100
@@ -94,8 +94,8 @@
chr2 :: Word8 -> Word8 -> Char
chr2 (W8# x1#) (W8# x2#) = C# (chr# (z1# +# z2#))
where
- !y1# = word2Int# x1#
- !y2# = word2Int# x2#
+ !y1# = word2Int# (word8ToWordCompat# x1#)
+ !y2# = word2Int# (word8ToWordCompat# x2#)
!z1# = uncheckedIShiftL# (y1# -# 0xC0#) 6#
!z2# = y2# -# 0x80#
{-# INLINE chr2 #-}
@@ -103,9 +103,9 @@
chr3 :: Word8 -> Word8 -> Word8 -> Char
chr3 (W8# x1#) (W8# x2#) (W8# x3#) = C# (chr# (z1# +# z2# +# z3#))
where
- !y1# = word2Int# x1#
- !y2# = word2Int# x2#
- !y3# = word2Int# x3#
+ !y1# = word2Int# (word8ToWordCompat# x1#)
+ !y2# = word2Int# (word8ToWordCompat# x2#)
+ !y3# = word2Int# (word8ToWordCompat# x3#)
!z1# = uncheckedIShiftL# (y1# -# 0xE0#) 12#
!z2# = uncheckedIShiftL# (y2# -# 0x80#) 6#
!z3# = y3# -# 0x80#
@@ -115,10 +115,10 @@
chr4 (W8# x1#) (W8# x2#) (W8# x3#) (W8# x4#) =
C# (chr# (z1# +# z2# +# z3# +# z4#))
where
- !y1# = word2Int# x1#
- !y2# = word2Int# x2#
- !y3# = word2Int# x3#
- !y4# = word2Int# x4#
+ !y1# = word2Int# (word8ToWordCompat# x1#)
+ !y2# = word2Int# (word8ToWordCompat# x2#)
+ !y3# = word2Int# (word8ToWordCompat# x3#)
+ !y4# = word2Int# (word8ToWordCompat# x4#)
!z1# = uncheckedIShiftL# (y1# -# 0xF0#) 18#
!z2# = uncheckedIShiftL# (y2# -# 0x80#) 12#
!z3# = uncheckedIShiftL# (y3# -# 0x80#) 6#
@@ -166,3 +166,11 @@
between x2 0x80 0x8F &&
between x3 0x80 0xBF &&
between x4 0x80 0xBF
+
+#if MIN_VERSION_base(4,16,0)
+word8ToWordCompat# :: Word8# -> Word#
+word8ToWordCompat# = word8ToWord#
+#else
+word8ToWordCompat# :: Word# -> Word#
+word8ToWordCompat# x = x
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/streaming-commons-0.2.2.1/Data/Text/Internal/Unsafe/Char.hs
new/streaming-commons-0.2.2.2/Data/Text/Internal/Unsafe/Char.hs
--- old/streaming-commons-0.2.2.1/Data/Text/Internal/Unsafe/Char.hs
2020-07-19 14:43:33.000000000 +0200
+++ new/streaming-commons-0.2.2.2/Data/Text/Internal/Unsafe/Char.hs
2021-11-09 09:14:45.000000000 +0100
@@ -32,24 +32,28 @@
import Control.Monad.ST (ST)
import Data.Bits ((.&.))
import Data.Text.Internal.Unsafe.Shift (shiftR)
-import GHC.Exts (Char(..), Int(..), chr#, ord#, word2Int#)
+import GHC.Exts (Char(..), Int(..), Word#, chr#, ord#, word2Int#)
import GHC.Word (Word8(..), Word16(..), Word32(..))
import qualified Data.Text.Array as A
+#if MIN_VERSION_base(4,16,0)
+import GHC.Exts (Word8#, Word16#, Word32#, word8ToWord#, word16ToWord#,
word32ToWord#)
+#endif
+
ord :: Char -> Int
ord (C# c#) = I# (ord# c#)
{-# INLINE ord #-}
unsafeChr :: Word16 -> Char
-unsafeChr (W16# w#) = C# (chr# (word2Int# w#))
+unsafeChr (W16# w#) = C# (chr# (word2Int# (word16ToWordCompat# w#)))
{-# INLINE unsafeChr #-}
unsafeChr8 :: Word8 -> Char
-unsafeChr8 (W8# w#) = C# (chr# (word2Int# w#))
+unsafeChr8 (W8# w#) = C# (chr# (word2Int# (word8ToWordCompat# w#)))
{-# INLINE unsafeChr8 #-}
unsafeChr32 :: Word32 -> Char
-unsafeChr32 (W32# w#) = C# (chr# (word2Int# w#))
+unsafeChr32 (W32# w#) = C# (chr# (word2Int# (word32ToWordCompat# w#)))
{-# INLINE unsafeChr32 #-}
-- | Write a character into the array at the given offset. Returns
@@ -93,3 +97,23 @@
hi = fromIntegral $ (m .&. 0x3FF) + 0xDC00
{-# INLINE unsafeWriteRev #-}
-}
+
+#if MIN_VERSION_base(4,16,0)
+word8ToWordCompat# :: Word8# -> Word#
+word8ToWordCompat# = word8ToWord#
+
+word16ToWordCompat# :: Word16# -> Word#
+word16ToWordCompat# = word16ToWord#
+
+word32ToWordCompat# :: Word32# -> Word#
+word32ToWordCompat# = word32ToWord#
+#else
+word8ToWordCompat# :: Word# -> Word#
+word8ToWordCompat# x = x
+
+word16ToWordCompat# :: Word# -> Word#
+word16ToWordCompat# x = x
+
+word32ToWordCompat# :: Word# -> Word#
+word32ToWordCompat# x = x
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/streaming-commons-0.2.2.1/Data/Text/Internal/Unsafe/Shift.hs
new/streaming-commons-0.2.2.2/Data/Text/Internal/Unsafe/Shift.hs
--- old/streaming-commons-0.2.2.1/Data/Text/Internal/Unsafe/Shift.hs
2020-07-19 14:43:33.000000000 +0200
+++ new/streaming-commons-0.2.2.2/Data/Text/Internal/Unsafe/Shift.hs
2021-11-09 09:14:45.000000000 +0100
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{-# LANGUAGE MagicHash #-}
-- |
@@ -22,6 +23,9 @@
-- import qualified Data.Bits as Bits
import GHC.Base
+#if __GLASGOW_HASKELL__ >= 903
+ hiding (uncheckedShiftL64#, uncheckedShiftRL64#)
+#endif
import GHC.Word
-- | This is a workaround for poor optimisation in GHC 6.8.2. It
@@ -36,17 +40,17 @@
instance UnsafeShift Word16 where
{-# INLINE shiftL #-}
- shiftL (W16# x#) (I# i#) = W16# (narrow16Word# (x# `uncheckedShiftL#` i#))
+ shiftL (W16# x#) (I# i#) = W16# (narrow16WordCompat# (word16ToWordCompat#
x# `uncheckedShiftL#` i#))
{-# INLINE shiftR #-}
- shiftR (W16# x#) (I# i#) = W16# (x# `uncheckedShiftRL#` i#)
+ shiftR (W16# x#) (I# i#) = W16# (wordToWord16Compat# (word16ToWordCompat#
x# `uncheckedShiftRL#` i#))
instance UnsafeShift Word32 where
{-# INLINE shiftL #-}
- shiftL (W32# x#) (I# i#) = W32# (narrow32Word# (x# `uncheckedShiftL#` i#))
+ shiftL (W32# x#) (I# i#) = W32# (narrow32WordCompat# (word32ToWordCompat#
x# `uncheckedShiftL#` i#))
{-# INLINE shiftR #-}
- shiftR (W32# x#) (I# i#) = W32# (x# `uncheckedShiftRL#` i#)
+ shiftR (W32# x#) (I# i#) = W32# (wordToWord32Compat# (word32ToWordCompat#
x# `uncheckedShiftRL#` i#))
instance UnsafeShift Word64 where
{-# INLINE shiftL #-}
@@ -70,3 +74,43 @@
{-# INLINE shiftR #-}
shiftR = Bits.shiftR
-}
+
+#if MIN_VERSION_base(4,16,0)
+word16ToWordCompat# :: Word16# -> Word#
+word16ToWordCompat# = word16ToWord#
+
+word32ToWordCompat# :: Word32# -> Word#
+word32ToWordCompat# = word32ToWord#
+
+wordToWord16Compat# :: Word# -> Word16#
+wordToWord16Compat# = wordToWord16#
+
+wordToWord32Compat# :: Word# -> Word32#
+wordToWord32Compat# = wordToWord32#
+
+narrow16WordCompat# :: Word# -> Word16#
+narrow16WordCompat# = wordToWord16#
+
+narrow32WordCompat# :: Word# -> Word32#
+narrow32WordCompat# = wordToWord32#
+#else
+-- No-ops
+word16ToWordCompat# :: Word# -> Word#
+word16ToWordCompat# x = x
+
+word32ToWordCompat# :: Word# -> Word#
+word32ToWordCompat# x = x
+
+wordToWord16Compat# :: Word# -> Word#
+wordToWord16Compat# x = x
+
+wordToWord32Compat# :: Word# -> Word#
+wordToWord32Compat# x = x
+
+-- Actual narrowing
+narrow16WordCompat# :: Word# -> Word#
+narrow16WordCompat# = narrow16Word#
+
+narrow32WordCompat# :: Word# -> Word#
+narrow32WordCompat# = narrow32Word#
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/streaming-commons-0.2.2.1/README.md
new/streaming-commons-0.2.2.2/README.md
--- old/streaming-commons-0.2.2.1/README.md 2020-07-19 14:43:33.000000000
+0200
+++ new/streaming-commons-0.2.2.2/README.md 2021-11-09 09:14:37.000000000
+0100
@@ -4,7 +4,7 @@
Common lower-level functions needed by various streaming data libraries.
Intended to be shared by libraries like conduit and pipes.
-[](https://dev.azure.com/fpco/streaming-commons/_build/latest?definitionId=2&branchName=master)
+[](https://github.com/fpco/streaming-commons/actions/workflows/tests.yml)
Dependencies
------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/streaming-commons-0.2.2.1/streaming-commons.cabal
new/streaming-commons-0.2.2.2/streaming-commons.cabal
--- old/streaming-commons-0.2.2.1/streaming-commons.cabal 2020-07-19
18:22:31.000000000 +0200
+++ new/streaming-commons-0.2.2.2/streaming-commons.cabal 2021-11-09
09:15:00.000000000 +0100
@@ -1,5 +1,5 @@
name: streaming-commons
-version: 0.2.2.1
+version: 0.2.2.2
synopsis: Common lower-level functions needed by various streaming
data libraries
description: Provides low-dependency functionality commonly needed by
various streaming data libraries, such as conduit and pipes.
homepage: https://github.com/fpco/streaming-commons
@@ -46,7 +46,7 @@
Data.Text.Internal.Encoding.Utf16
Data.Text.Internal.Encoding.Utf32
- build-depends: base >= 4.9 && < 5
+ build-depends: base >= 4.12 && < 5
, array
, async
, bytestring
