From 5dcb31259a4cb90675fe1caa044c9afcc6394e8e4cefd9cf1359d2a8f9c543a8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Feb 2023 09:19:02 +0000 Subject: [PATCH] osc copypac from project:devel:languages:haskell:ghc-8.10.x package:ghc-bloomfilter revision:12, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-bloomfilter?expand=0&rev=13 --- ...ft-instances-for-Word32-to-ghc-9.4.x.patch | 29 ------------------- ghc-bloomfilter.spec | 4 +-- 2 files changed, 1 insertion(+), 32 deletions(-) delete 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 deleted file mode 100644 index f52b9c1..0000000 --- a/0001-Adapt-FastShift-instances-for-Word32-to-ghc-9.4.x.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 354bcef..7507ac8 100644 --- a/ghc-bloomfilter.spec +++ b/ghc-bloomfilter.spec @@ -26,7 +26,6 @@ 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 @@ -54,9 +53,8 @@ Requires(postun): ghc-compiler = %{ghc_version} This package provides the Haskell %{pkg_name} library development files. %prep -%autosetup -p1 -n %{pkg_name}-%{version} +%autosetup -n %{pkg_name}-%{version} cp -p %{SOURCE1} %{pkg_name}.cabal -cabal-tweak-dep-ver base '>= 4.4 && < 4.16' '< 5' %build %ghc_lib_build