patch for 32bit ghc-9.2 primitive words

[skip changelog]

.gitignore

@@ -1,3 +1,8 @@
 /basement-0.0.4.tar.gz
 /basement-0.0.7.tar.gz
 /basement-0.0.8.tar.gz
+/basement-0.0.10.tar.gz
+/basement-0.0.11.tar.gz
+/basement-0.0.12.tar.gz
+/basement-0.0.14.tar.gz
+/basement-0.0.15.tar.gz

basement-0.0.8.cabal

@@ -1,162 +0,0 @@
-name:                basement
-version:             0.0.8
-x-revision: 1
-synopsis:            Foundation scrap box of array & string
-description:         Foundation most basic primitives without any dependencies
-license:             BSD3
-license-file:        LICENSE
-copyright:           2015-2017 Vincent Hanquez <vincent@snarc.org>
-                   , 2017-2018 Foundation Maintainers
-maintainer:          vincent@snarc.org
-category:            Web
-build-type:          Simple
-homepage:            https://github.com/haskell-foundation/foundation#readme
-bug-reports:         https://github.com/haskell-foundation/foundation/issues
-cabal-version:       >=1.10
-extra-source-files:  cbits/*.h
-
-source-repository head
-  type: git
-  location: https://github.com/haskell-foundation/foundation
-  subdir: basement
-
-library
-  hs-source-dirs:    .
-  exposed-modules:
-                     Basement.Imports
-
-                     Basement.Base16
-                     Basement.Bindings.Memory
-                     Basement.Endianness
-                     Basement.Environment
-                     Basement.PrimType
-
-                     Basement.Exception
-                     Basement.Cast
-                     Basement.From
-
-                     Basement.Types.Char7
-                     Basement.Types.CharUTF8
-                     Basement.Types.OffsetSize
-                     Basement.Types.Ptr
-                     Basement.Types.AsciiString
-                     Basement.Types.Word128
-                     Basement.Types.Word256
-                     Basement.Monad
-                     Basement.MutableBuilder
-                     Basement.FinalPtr
-
-                     Basement.Nat
-
-                     -- Extended Types
-                     Basement.BoxedArray
-                     Basement.Block
-                     Basement.Block.Mutable
-                     Basement.Block.Builder
-                     Basement.UArray
-                     Basement.UArray.Mutable
-                     Basement.String
-                     Basement.String.Builder
-                     Basement.NonEmpty
-
-                     -- Extended Types with explicit type level size
-                     Basement.Sized.Block
-                     Basement.Sized.UVect
-                     Basement.Sized.Vect
-                     Basement.Sized.List
-                     Basement.BlockN
-
-                     -- Utils
-                     Basement.NormalForm
-                     Basement.These
-
-                     -- Terminal
-                     Basement.Terminal
-                     Basement.Terminal.ANSI
-
-                     -- numeric stuff
-                     Basement.IntegralConv
-                     Basement.Floating
-                     Basement.Numerical.Number
-                     Basement.Numerical.Additive
-                     Basement.Numerical.Subtractive
-                     Basement.Numerical.Multiplicative
-                     Basement.Bounded
-
-                     -- exported algorithms
-                     Basement.Alg.XorShift
-
-                     -- compat / base redefinition
-                     Basement.Compat.AMP
-                     Basement.Compat.Base
-                     Basement.Compat.Bifunctor
-                     Basement.Compat.CallStack
-                     Basement.Compat.C.Types
-                     Basement.Compat.ExtList
-                     Basement.Compat.IsList
-                     Basement.Compat.Identity
-                     Basement.Compat.Primitive
-                     Basement.Compat.PrimTypes
-                     Basement.Compat.MonadTrans
-                     Basement.Compat.Semigroup
-                     Basement.Compat.Natural
-                     Basement.Compat.NumLiteral
-                     Basement.Compat.Typeable
-
-                     Basement.Bits
-
-  other-modules:
-                     Basement.Error
-                     Basement.Show
-                     Basement.Runtime
-
-                     Basement.Alg.Class
-                     Basement.Alg.Mutable
-                     Basement.Alg.PrimArray
-
-                     Basement.Alg.UTF8
-                     Basement.Alg.String
-
-                     Basement.Numerical.Conversion
-
-                     Basement.Block.Base
-
-                     Basement.UTF8.Base
-                     Basement.UTF8.Helper
-                     Basement.UTF8.Table
-                     Basement.UTF8.Types
-
-                     Basement.UArray.Base
-
-                     Basement.String.CaseMapping
-                     Basement.String.Encoding.Encoding
-                     Basement.String.Encoding.UTF16
-                     Basement.String.Encoding.UTF32
-                     Basement.String.Encoding.ASCII7
-                     Basement.String.Encoding.ISO_8859_1
-
-                     Basement.Terminal.Size
-
-  -- support and dependencies
-  if impl(ghc < 8.0)
-    -- https://github.com/haskell-infra/hackage-trustees/issues/171
-    build-depends:     base >= 4.9 && < 4.13
-  else
-    build-depends:     base
-                     , ghc-prim
-    if os(windows)
-      build-depends:   Win32
-
-  default-language:    Haskell2010
-  default-extensions: NoImplicitPrelude
-                      RebindableSyntax
-                      TypeFamilies
-                      BangPatterns
-                      DeriveDataTypeable
-  if (arch(i386) || arch(x86_64))
-    cpp-options: -DARCH_IS_LITTLE_ENDIAN
-  else
-    cpp-options: -DARCH_IS_UNKNOWN_ENDIAN
-  include-dirs:      cbits
-  c-sources:         cbits/foundation_mem.c
-                     cbits/foundation_rts.c

basement-32bit-prim.patch

@@ -0,0 +1,105 @@
+diff -up basement-0.0.15/Basement/Bits.hs~ basement-0.0.15/Basement/Bits.hs
+--- basement-0.0.15/Basement/Bits.hs~	2022-02-28 12:00:48.000000000 +0800
++++ basement-0.0.15/Basement/Bits.hs	2023-02-16 18:50:32.947378064 +0800
+@@ -54,7 +54,7 @@ import GHC.Int
+ import Basement.Compat.Primitive
+ 
+ #if WORD_SIZE_IN_BITS < 64
+-import GHC.IntWord64
++import GHC.Exts
+ #endif
+ 
+ -- | operation over finite bits
+diff -up basement-0.0.15/Basement/Numerical/Additive.hs~ basement-0.0.15/Basement/Numerical/Additive.hs
+--- basement-0.0.15/Basement/Numerical/Additive.hs~	2022-02-28 12:00:48.000000000 +0800
++++ basement-0.0.15/Basement/Numerical/Additive.hs	2023-02-16 18:52:14.547975419 +0800
+@@ -29,7 +29,7 @@ import qualified Basement.Types.Word128
+ import qualified Basement.Types.Word256 as Word256
+ 
+ #if WORD_SIZE_IN_BITS < 64
+-import           GHC.IntWord64
++import           GHC.Exts
+ #endif
+ 
+ -- | Represent class of things that can be added together,
+diff -up basement-0.0.15/Basement/Numerical/Conversion.hs~ basement-0.0.15/Basement/Numerical/Conversion.hs
+--- basement-0.0.15/Basement/Numerical/Conversion.hs~	2022-02-28 12:00:48.000000000 +0800
++++ basement-0.0.15/Basement/Numerical/Conversion.hs	2023-02-16 18:28:38.844400110 +0800
+@@ -25,7 +25,7 @@ import GHC.Word
+ import Basement.Compat.Primitive
+ 
+ #if WORD_SIZE_IN_BITS < 64
+-import GHC.IntWord64
++import GHC.Exts
+ #endif
+ 
+ intToInt64 :: Int -> Int64
+@@ -114,7 +114,7 @@
+ #endif
+ #else
+ word64ToWord32s :: Word64 -> Word32x2
+-word64ToWord32s (W64# w64) = Word32x2 (W32# (word64ToWord# (uncheckedShiftRL64# w64 32#))) (W32# (word64ToWord# w64))
++word64ToWord32s (W64# w64) = Word32x2 (W32# (wordToWord32# (word64ToWord# (uncheckedShiftRL64# w64 32#)))) (W32# (wordToWord32# (word64ToWord# w64)))
+ #endif
+ 
+ wordToChar :: Word -> Char
+diff -up basement-0.0.15/Basement/PrimType.hs~ basement-0.0.15/Basement/PrimType.hs
+--- basement-0.0.15/Basement/PrimType.hs~	2022-03-03 10:51:42.000000000 +0800
++++ basement-0.0.15/Basement/PrimType.hs	2023-02-16 18:52:13.884971521 +0800
+@@ -54,7 +54,7 @@ import           Basement.Nat
+ import qualified Prelude (quot)
+ 
+ #if WORD_SIZE_IN_BITS < 64
+-import           GHC.IntWord64
++import           GHC.Exts
+ #endif
+ 
+ #ifdef FOUNDATION_BOUNDS_CHECK
+diff -up basement-0.0.15/Basement/Types/OffsetSize.hs~ basement-0.0.15/Basement/Types/OffsetSize.hs
+--- basement-0.0.15/Basement/Types/OffsetSize.hs~	2019-09-02 11:58:08.000000000 +0800
++++ basement-0.0.15/Basement/Types/OffsetSize.hs	2023-02-16 18:49:45.703100306 +0800
+@@ -69,7 +69,7 @@ import Data.List (foldl')
+ import qualified Prelude
+ 
+ #if WORD_SIZE_IN_BITS < 64
+-import GHC.IntWord64
++import GHC.Exts
+ #endif
+ 
+ -- | File size in bytes
+@@ -225,7 +225,7 @@
+ 
+ csizeOfSize :: CountOf Word8 -> CSize
+ #if WORD_SIZE_IN_BITS < 64
+-csizeOfSize (CountOf (I# sz)) = CSize (W32# (int2Word# sz))
++csizeOfSize (CountOf (I# sz)) = CSize (W32# (wordToWord32# (int2Word# sz)))
+ #else
+ #if __GLASGOW_HASKELL__ >= 904
+ csizeOfSize (CountOf (I# sz)) = CSize (W64# (wordToWord64# (int2Word# sz)))
+@@ -238,7 +238,7 @@
+ 
+ csizeOfOffset :: Offset8 -> CSize
+ #if WORD_SIZE_IN_BITS < 64
+-csizeOfOffset (Offset (I# sz)) = CSize (W32# (int2Word# sz))
++csizeOfOffset (Offset (I# sz)) = CSize (W32# (wordToWord32# (int2Word# sz)))
+ #else
+ #if __GLASGOW_HASKELL__ >= 904
+ csizeOfOffset (Offset (I# sz)) = CSize (W64# (wordToWord64# (int2Word# sz)))
+@@ -250,7 +250,7 @@
+ sizeOfCSSize :: CSsize -> CountOf Word8
+ sizeOfCSSize (CSsize (-1))      = error "invalid size: CSSize is -1"
+ #if WORD_SIZE_IN_BITS < 64
+-sizeOfCSSize (CSsize (I32# sz)) = CountOf (I# sz)
++sizeOfCSSize (CSsize (I32# sz)) = CountOf (I# (int32ToInt# sz))
+ #else
+ #if __GLASGOW_HASKELL__ >= 904
+ sizeOfCSSize (CSsize (I64# sz)) = CountOf (I# (int64ToInt# sz))
+@@ -261,7 +261,7 @@
+ 
+ sizeOfCSize :: CSize -> CountOf Word8
+ #if WORD_SIZE_IN_BITS < 64
+-sizeOfCSize (CSize (W32# sz)) = CountOf (I# (word2Int# sz))
++sizeOfCSize (CSize (W32# sz)) = CountOf (I# (word2Int# (word32ToWord# sz)))
+ #else
+ #if __GLASGOW_HASKELL__ >= 904
+ sizeOfCSize (CSize (W64# sz)) = CountOf (I# (word2Int# (word64ToWord# sz)))

changelog

@@ -0,0 +1,60 @@
+* Sun Jan 22 2023 Jens Petersen <petersen@redhat.com> - 0.0.15-1
+- https://hackage.haskell.org/package/basement-0.0.15/changelog
+- refresh to cabal-rpm-2.1.0 with SPDX migration
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jun 07 2022 Jens Petersen <petersen@redhat.com> - 0.0.14-1
+- https://hackage.haskell.org/package/basement-0.0.14/changelog
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Aug  5 2021 Jens Petersen <petersen@redhat.com> - 0.0.12-1
+- update to 0.0.12
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.11-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.11-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 17 2020 Jens Petersen <petersen@redhat.com> - 0.0.11-2
+- refresh to cabal-rpm-2.0.6
+
+* Sun Feb 09 2020 Jens Petersen <petersen@redhat.com> - 0.0.11-1
+- update to 0.0.11
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Jens Petersen <petersen@redhat.com> - 0.0.10-1
+- update to 0.0.10
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 17 2019 Jens Petersen <petersen@redhat.com> - 0.0.8-3
+- refresh to cabal-rpm-0.13
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 26 2018 Jens Petersen <petersen@redhat.com> - 0.0.8-1
+- update to 0.0.8
+
+* Sun Jul 22 2018 Jens Petersen <petersen@redhat.com> - 0.0.7-1
+- update to 0.0.7
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Fri Feb 23 2018 Jens Petersen <petersen@redhat.com> - 0.0.4-3
+- bump over foundation
+
+* Sat Jan 27 2018 Fedora Haskell SIG <haskell@lists.fedoraproject.org> - 0.0.4-1
+- spec file generated by cabal-rpm-0.12

ghc-basement.spec

@@ -1,24 +1,29 @@
-# generated by cabal-rpm-0.13
-# https://fedoraproject.org/wiki/Packaging:Haskell
+# generated by cabal-rpm-2.1.0
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
 
 %global pkg_name basement
 %global pkgver %{pkg_name}-%{version}
 
 Name:           ghc-%{pkg_name}
-Version:        0.0.8
-Release:        3%{?dist}
+Version:        0.0.15
+Release:        %autorelease
 Summary:        Foundation scrap box of array & string
 
-License:        BSD
+License:        BSD-3-Clause
 Url:            https://hackage.haskell.org/package/%{pkg_name}
 # Begin cabal-rpm sources:
 Source0:        https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
-Source1:        https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal
 # End cabal-rpm sources
+# https://github.com/haskell-foundation/foundation/issues/565
+Patch0:         basement-32bit-prim.patch
 
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
+BuildRequires:  ghc-base-devel
+%if %{with ghc_prof}
+BuildRequires:  ghc-base-prof
+%endif
 # End cabal-rpm deps
 
 %description
@@ -28,11 +33,9 @@ Foundation most basic primitives without any dependencies.
 %package devel
 Summary:        Haskell %{pkg_name} library development files
 Provides:       %{name}-static = %{version}-%{release}
-Provides:       %{name}-doc = %{version}-%{release}
+Provides:       %{name}-static%{?_isa} = %{version}-%{release}
 %if %{defined ghc_version}
 Requires:       ghc-compiler = %{ghc_version}
-Requires(post): ghc-compiler = %{ghc_version}
-Requires(postun): ghc-compiler = %{ghc_version}
 %endif
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
@@ -40,11 +43,33 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 This package provides the Haskell %{pkg_name} library development files.
 
 
+%if %{with haddock}
+%package doc
+Summary:        Haskell %{pkg_name} library documentation
+BuildArch:      noarch
+Requires:       ghc-filesystem
+
+%description doc
+This package provides the Haskell %{pkg_name} library documentation.
+%endif
+
+
+%if %{with ghc_prof}
+%package prof
+Summary:        Haskell %{pkg_name} profiling library
+Requires:       %{name}-devel%{?_isa} = %{version}-%{release}
+Supplements:    (%{name}-devel and ghc-prof)
+
+%description prof
+This package provides the Haskell %{pkg_name} profiling library.
+%endif
+
+
 %prep
 # Begin cabal-rpm setup:
 %setup -q -n %{pkgver}
-cp -bp %{SOURCE1} %{pkg_name}.cabal
 # End cabal-rpm setup
+%patch0 -p1 -b .orig
 
 
 %build
@@ -59,14 +84,6 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal
 # End cabal-rpm install
 
 
-%post devel
-%ghc_pkg_recache
-
-
-%postun devel
-%ghc_pkg_recache
-
-
 %files -f %{name}.files
 # Begin cabal-rpm files:
 %license LICENSE
@@ -76,24 +93,16 @@ cp -bp %{SOURCE1} %{pkg_name}.cabal
 %files devel -f %{name}-devel.files
 
 
+%if %{with haddock}
+%files doc -f %{name}-doc.files
+%license LICENSE
+%endif
+
+
+%if %{with ghc_prof}
+%files prof -f %{name}-prof.files
+%endif
+
+
 %changelog
-* Sun Feb 17 2019 Jens Petersen <petersen@redhat.com> - 0.0.8-3
-- refresh to cabal-rpm-0.13
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 26 2018 Jens Petersen <petersen@redhat.com> - 0.0.8-1
-- update to 0.0.8
-
-* Sun Jul 22 2018 Jens Petersen <petersen@redhat.com> - 0.0.7-1
-- update to 0.0.7
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 23 2018 Jens Petersen <petersen@redhat.com> - 0.0.4-3
-- bump over foundation
-
-* Sat Jan 27 2018 Fedora Haskell SIG <haskell@lists.fedoraproject.org> - 0.0.4-1
-- spec file generated by cabal-rpm-0.12
+%autochangelog

sources

@@ -1 +1 @@
-SHA512 (basement-0.0.8.tar.gz) = 37969ab403b23ac1f129eb6e2f81d46f53e6ba931a59695cc9a37a7387a77b24e9ba6da9cdec1ee2523410a9dad9ee5af0f8a45b59af7d07f4d467e1ad55b66f
+SHA512 (basement-0.0.15.tar.gz) = bc69bf67685e3bf6abaab2f7b85233de7926906d4ca646a00c8c8f09ca32672090b28348e35b5a71af7ed3b1c4416b5aab4b2865502f99515342c0b457c38e28