From e729411552fb4740a43ea0df4b353a638f251d10d62386952c2d2806f3775855 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 2 Feb 2023 13:42:05 +0000 Subject: [PATCH 1/6] 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 From 4f644040e736e0e6c10a0a7525e75c2e85c959fe0d26370a57f3459dc105a176 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Feb 2023 09:19:02 +0000 Subject: [PATCH 2/6] 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 From 008b52d5e1a65e5c8d3d687103158bacb380a3523f2110fc87130844b4e2971d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 08:26:20 +0000 Subject: [PATCH 3/6] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-bloomfilter revision:7, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-bloomfilter?expand=0&rev=14 --- ...ft-instances-for-Word32-to-ghc-9.4.x.patch | 29 +++++++++++++++ ghc-bloomfilter.spec | 35 ++++++++++++++++++- 2 files changed, 63 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..56f848f 100644 --- a/ghc-bloomfilter.spec +++ b/ghc-bloomfilter.spec @@ -17,6 +17,7 @@ %global pkg_name bloomfilter +%global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} Version: 2.0.1.0 @@ -26,17 +27,27 @@ 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-array-prof +BuildRequires: ghc-base-devel +BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-devel +BuildRequires: ghc-bytestring-prof BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-deepseq-prof BuildRequires: ghc-rpm-macros ExcludeArch: %{ix86} %if %{with tests} BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-QuickCheck-prof BuildRequires: ghc-random-devel +BuildRequires: ghc-random-prof BuildRequires: ghc-test-framework-devel +BuildRequires: ghc-test-framework-prof BuildRequires: ghc-test-framework-quickcheck2-devel +BuildRequires: ghc-test-framework-quickcheck2-prof %endif %description @@ -52,9 +63,26 @@ Requires(postun): ghc-compiler = %{ghc_version} %description devel This package provides the Haskell %{pkg_name} library development files. +%package -n ghc-%{pkg_name}-doc +Summary: Haskell %{pkg_name} library documentation +Requires: ghc-filesystem +BuildArch: noarch + +%description -n ghc-%{pkg_name}-doc +This package provides the Haskell %{pkg_name} library documentation. + +%package -n ghc-%{pkg_name}-prof +Summary: Haskell %{pkg_name} profiling library +Requires: ghc-%{pkg_name}-devel = %{version}-%{release} +Supplements: (ghc-%{pkg_name}-devel and ghc-prof) + +%description -n ghc-%{pkg_name}-prof +This package provides the Haskell %{pkg_name} profiling library. + %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 @@ -77,4 +105,9 @@ cp -p %{SOURCE1} %{pkg_name}.cabal %files devel -f %{name}-devel.files %doc README.markdown examples +%files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files +%license LICENSE + +%files -n ghc-%{pkg_name}-prof -f ghc-%{pkg_name}-prof.files + %changelog From 99b9c0ecc69780e9f8b68444137c650d474c42d35617fb6467c2b05c27dbec03 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 17:38:29 +0000 Subject: [PATCH 4/6] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-bloomfilter revision:8, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-bloomfilter?expand=0&rev=15 --- ghc-bloomfilter.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ghc-bloomfilter.changes b/ghc-bloomfilter.changes index 4d0179f..d68c40a 100644 --- a/ghc-bloomfilter.changes +++ b/ghc-bloomfilter.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 30 17:06:02 UTC 2023 - Peter Simons + +- Updated spec file to conform with ghc-rpm-macros-2.5.2. + ------------------------------------------------------------------- Mon May 2 18:30:49 UTC 2022 - Peter Simons From aa0a9d4f14905b1faddc3606af10308c986adfe914d4a595a4a854f141dde20a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 30 Mar 2023 17:51:34 +0000 Subject: [PATCH 5/6] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-bloomfilter revision:9, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-bloomfilter?expand=0&rev=16 --- ghc-bloomfilter.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghc-bloomfilter.spec b/ghc-bloomfilter.spec index 56f848f..a6e72a1 100644 --- a/ghc-bloomfilter.spec +++ b/ghc-bloomfilter.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-bloomfilter # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 8d3b979703286e7d10699acde0796453fc8561260d7ebc187bfd8e969a5c7948 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 31 Mar 2023 15:41:11 +0000 Subject: [PATCH 6/6] osc copypac from project:devel:languages:haskell:ghc-9.4.x package:ghc-bloomfilter revision:10, using keep-link OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc-bloomfilter?expand=0&rev=17 --- ghc-bloomfilter.changes | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ghc-bloomfilter.changes b/ghc-bloomfilter.changes index d68c40a..83d0611 100644 --- a/ghc-bloomfilter.changes +++ b/ghc-bloomfilter.changes @@ -3,6 +3,9 @@ Thu Mar 30 17:06:02 UTC 2023 - Peter Simons - Updated spec file to conform with ghc-rpm-macros-2.5.2. +- Add "0001-Adapt-FastShift-instances-for-Word32-to-ghc-9.4.x.patch" + to fix the build with ghc-9.4.4. + ------------------------------------------------------------------- Mon May 2 18:30:49 UTC 2022 - Peter Simons @@ -17,9 +20,9 @@ Mon Nov 15 06:59:43 UTC 2021 - psimons@suse.com ------------------------------------------------------------------- Thu Dec 17 12:20:00 UTC 2020 - Ondřej Súkup - + - disable %{ix86} build - + ------------------------------------------------------------------- Tue Aug 18 10:44:11 UTC 2020 - Peter Simons @@ -29,4 +32,3 @@ Tue Aug 18 10:44:11 UTC 2020 - Peter Simons Tue Jun 9 09:26:37 UTC 2020 - psimons@suse.com - Add bloomfilter at version 2.0.1.0. -