From e729411552fb4740a43ea0df4b353a638f251d10d62386952c2d2806f3775855 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2023 13:42:05 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-bloomfilter revision:3, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-bloomfilter?expand=0&rev=12 --- ...ft-instances-for-Word32-to-ghc-9.4.x.patch | 29 +++++++++++++++++++ ghc-bloomfilter.spec | 4 ++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0001-Adapt-FastShift-instances-for-Word32-to-ghc-9.4.x.patch diff --git a/0001-Adapt-FastShift-instances-for-Word32-to-ghc-9.4.x.patch b/0001-Adapt-FastShift-instances-for-Word32-to-ghc-9.4.x.patch new file mode 100644 index 0000000..f52b9c1 --- /dev/null +++ b/0001-Adapt-FastShift-instances-for-Word32-to-ghc-9.4.x.patch @@ -0,0 +1,29 @@ +From 8f62d424f52cda226f5b7102f2de45e92b72b552 Mon Sep 17 00:00:00 2001 +From: Peter Simons +Date: Wed, 1 Feb 2023 16:03:29 +0100 +Subject: [PATCH] Adapt FastShift instances for Word32 to ghc-9.4.x. + +--- + Data/BloomFilter/Util.hs | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Data/BloomFilter/Util.hs b/Data/BloomFilter/Util.hs +index 7f695dc..6868209 100644 +--- a/Data/BloomFilter/Util.hs ++++ b/Data/BloomFilter/Util.hs +@@ -40,10 +40,10 @@ class FastShift a where + + instance FastShift Word32 where + {-# INLINE shiftL #-} +- shiftL (W32# x#) (I# i#) = W32# (x# `uncheckedShiftL#` i#) ++ shiftL (W32# x#) (I# i#) = W32# (x# `uncheckedShiftLWord32#` i#) + + {-# INLINE shiftR #-} +- shiftR (W32# x#) (I# i#) = W32# (x# `uncheckedShiftRL#` i#) ++ shiftR (W32# x#) (I# i#) = W32# (x# `uncheckedShiftRLWord32#` i#) + + instance FastShift Word64 where + {-# INLINE shiftL #-} +-- +2.38.1 + diff --git a/ghc-bloomfilter.spec b/ghc-bloomfilter.spec index 7507ac8..354bcef 100644 --- a/ghc-bloomfilter.spec +++ b/ghc-bloomfilter.spec @@ -26,6 +26,7 @@ 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/2.cabal#/%{pkg_name}.cabal +Patch1: 0001-Adapt-FastShift-instances-for-Word32-to-ghc-9.4.x.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-array-devel BuildRequires: ghc-bytestring-devel @@ -53,8 +54,9 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%autosetup -n %{pkg_name}-%{version} +%autosetup -p1 -n %{pkg_name}-%{version} cp -p %{SOURCE1} %{pkg_name}.cabal +cabal-tweak-dep-ver base '>= 4.4 && < 4.16' '< 5' %build %ghc_lib_build