Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-charset for openSUSE:Factory checked in at 2021-11-11 21:36:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-charset (Old) and /work/SRC/openSUSE:Factory/.ghc-charset.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-charset" Thu Nov 11 21:36:19 2021 rev:7 rq:930316 version:0.3.9 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-charset/ghc-charset.changes 2021-03-10 08:56:39.226851730 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-charset.new.1890/ghc-charset.changes 2021-11-11 21:36:25.224888582 +0100 @@ -1,0 +2,8 @@ +Mon Nov 1 12:26:25 UTC 2021 - [email protected] + +- Update charset to version 0.3.9. + 0.3.9 [2021.11.01] + ------------------ + * Allow building with GHC 9.2. + +------------------------------------------------------------------- Old: ---- charset-0.3.8.tar.gz New: ---- charset-0.3.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-charset.spec ++++++ --- /var/tmp/diff_new_pack.5iZpr2/_old 2021-11-11 21:36:25.652888894 +0100 +++ /var/tmp/diff_new_pack.5iZpr2/_new 2021-11-11 21:36:25.656888897 +0100 @@ -18,7 +18,7 @@ %global pkg_name charset Name: ghc-%{pkg_name} -Version: 0.3.8 +Version: 0.3.9 Release: 0 Summary: Fast unicode character sets based on complemented PATRICIA tries License: BSD-3-Clause ++++++ charset-0.3.8.tar.gz -> charset-0.3.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/charset-0.3.8/CHANGELOG.markdown new/charset-0.3.9/CHANGELOG.markdown --- old/charset-0.3.8/CHANGELOG.markdown 2001-09-09 03:46:40.000000000 +0200 +++ new/charset-0.3.9/CHANGELOG.markdown 2001-09-09 03:46:40.000000000 +0200 @@ -1,3 +1,7 @@ +0.3.9 [2021.11.01] +------------------ +* Allow building with GHC 9.2. + 0.3.8 [2021.02.17] ------------------ * Add an `IsString CharSet` instance. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/charset-0.3.8/charset.cabal new/charset-0.3.9/charset.cabal --- old/charset-0.3.8/charset.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/charset-0.3.9/charset.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,5 +1,5 @@ name: charset -version: 0.3.8 +version: 0.3.9 license: BSD3 license-File: LICENSE copyright: (c) Edward Kmett 2010-2012 @@ -26,8 +26,10 @@ || ==8.2.2 || ==8.4.4 || ==8.6.5 - || ==8.8.3 - || ==8.10.1 + || ==8.8.4 + || ==8.10.7 + || ==9.0.1 + || ==9.2.1 source-repository head type: git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/charset-0.3.8/src/Data/CharSet/ByteSet.hs new/charset-0.3.9/src/Data/CharSet/ByteSet.hs --- old/charset-0.3.8/src/Data/CharSet/ByteSet.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/charset-0.3.9/src/Data/CharSet/ByteSet.hs 2001-09-09 03:46:40.000000000 +0200 @@ -32,7 +32,13 @@ import Data.Bits ((.&.), (.|.)) import Foreign.Storable (peekByteOff, pokeByteOff) -import GHC.Base (Int(I#), iShiftRA#, narrow8Word#, shiftL#) +import GHC.Exts ( Int(I#), Word#, iShiftRA#, shiftL# +#if MIN_VERSION_base(4,16,0) + , Word8#, word8ToWord#, wordToWord8# +#else + , narrow8Word# +#endif + ) import GHC.Word (Word8(W8#)) import qualified Data.ByteString as B import qualified Data.ByteString.Internal as I @@ -50,7 +56,7 @@ shiftR (I# x#) (I# i#) = I# (x# `iShiftRA#` i#) shiftL :: Word8 -> Int -> Word8 -shiftL (W8# x#) (I# i#) = W8# (narrow8Word# (x# `shiftL#` i#)) +shiftL (W8# x#) (I# i#) = W8# (narrow8WordCompat# (word8ToWordCompat# x# `shiftL#` i#)) -- | Convert a bit index to a byte index and bit index inside the byte index :: Int -> I @@ -73,3 +79,17 @@ member w (ByteSet t) = U.unsafeIndex t byte .&. bit /= 0 where I byte bit = index (fromIntegral w) + +#if MIN_VERSION_base(4,16,0) +word8ToWordCompat# :: Word8# -> Word# +word8ToWordCompat# = word8ToWord# + +narrow8WordCompat# :: Word# -> Word8# +narrow8WordCompat# = wordToWord8# +#else +word8ToWordCompat# :: Word# -> Word# +word8ToWordCompat# x = x + +narrow8WordCompat# :: Word# -> Word# +narrow8WordCompat# = narrow8Word# +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/charset-0.3.8/src/Data/CharSet.hs new/charset-0.3.9/src/Data/CharSet.hs --- old/charset-0.3.8/src/Data/CharSet.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/charset-0.3.9/src/Data/CharSet.hs 2001-09-09 03:46:40.000000000 +0200 @@ -371,4 +371,6 @@ instance Monoid CharSet where mempty = empty +#if !(MIN_VERSION_base(4,11,0)) mappend = union +#endif
