Accepting request 1104403 from devel:languages:haskell
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/1104403 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghc-bloomfilter?expand=0&rev=7
This commit is contained in:
Ana Guerrero
Git OBS Bridge
commit
ab2048175f
@ -1,29 +0,0 @@
|
||||
From 8f62d424f52cda226f5b7102f2de45e92b72b552 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Simons <simons@cryp.to>
|
||||
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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6c5e0d357d5d39efe97ae2776e8fb533fa50c1c05397c7b85020b0f098ad790f
|
||||
size 22100
|
||||
3
bloomfilter-2.0.1.2.tar.gz
Normal file
3
bloomfilter-2.0.1.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:178293d28a922e89eddffa597513cb2287231322fc8834765762f0d9a8118b4e
|
||||
size 22398
|
||||
@ -1,58 +0,0 @@
|
||||
name: bloomfilter
|
||||
version: 2.0.1.0
|
||||
x-revision: 2
|
||||
license: BSD3
|
||||
license-file: LICENSE
|
||||
author: Bryan O'Sullivan <bos@serpentine.com>
|
||||
maintainer: Bryan O'Sullivan <bos@serpentine.com>
|
||||
homepage: https://github.com/bos/bloomfilter
|
||||
bug-reports: https://github.com/bos/bloomfilter/issues
|
||||
description: Pure and impure Bloom Filter implementations.
|
||||
synopsis: Pure and impure Bloom Filter implementations.
|
||||
category: Data
|
||||
stability: provisional
|
||||
build-type: Simple
|
||||
cabal-version: >= 1.8
|
||||
extra-source-files: README.markdown cbits/lookup3.c cbits/lookup3.h
|
||||
examples/Makefile examples/SpellChecker.hs examples/Words.hs
|
||||
|
||||
library
|
||||
build-depends:
|
||||
array,
|
||||
base >= 4.4 && < 4.16,
|
||||
bytestring >= 0.9,
|
||||
deepseq
|
||||
exposed-modules: Data.BloomFilter
|
||||
Data.BloomFilter.Easy
|
||||
Data.BloomFilter.Mutable
|
||||
Data.BloomFilter.Hash
|
||||
other-modules: Data.BloomFilter.Array
|
||||
Data.BloomFilter.Mutable.Internal
|
||||
Data.BloomFilter.Util
|
||||
c-sources: cbits/lookup3.c
|
||||
ghc-options: -O2 -Wall
|
||||
include-dirs: cbits
|
||||
includes: lookup3.h
|
||||
install-includes: lookup3.h
|
||||
|
||||
test-suite tests
|
||||
type: exitcode-stdio-1.0
|
||||
hs-source-dirs: tests
|
||||
main-is: QC.hs
|
||||
other-modules: QCSupport
|
||||
build-depends:
|
||||
QuickCheck >= 2.5,
|
||||
base >= 4.4 && < 4.16,
|
||||
bloomfilter,
|
||||
bytestring,
|
||||
random,
|
||||
test-framework,
|
||||
test-framework-quickcheck2
|
||||
|
||||
source-repository head
|
||||
type: git
|
||||
location: git://github.com/bos/bloomfilter.git
|
||||
|
||||
source-repository head
|
||||
type: mercurial
|
||||
location: https://bitbucket.org/bos/bloomfilter
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 4 19:23:09 UTC 2023 - Peter Simons <psimons@suse.com>
|
||||
|
||||
- Update bloomfilter to version 2.0.1.2.
|
||||
* Fix Data.BloomFilter.Easy on 32 bit to not incorrectly fail with
|
||||
"capacity too large to represent".
|
||||
* Fix build with GHC 9.2, thanks to Simon Jakobi.
|
||||
|
||||
- Drop "0001-Adapt-FastShift-instances-for-Word32-to-ghc-9.4.x.patch"
|
||||
which is no longer necessary.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 30 17:06:02 UTC 2023 - Peter Simons <psimons@suse.com>
|
||||
|
||||
|
||||
@ -20,14 +20,12 @@
|
||||
%global pkgver %{pkg_name}-%{version}
|
||||
%bcond_with tests
|
||||
Name: ghc-%{pkg_name}
|
||||
Version: 2.0.1.0
|
||||
Version: 2.0.1.2
|
||||
Release: 0
|
||||
Summary: Pure and impure Bloom Filter implementations
|
||||
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
|
||||
@ -80,9 +78,7 @@ Supplements: (ghc-%{pkg_name}-devel and ghc-prof)
|
||||
This package provides the Haskell %{pkg_name} profiling library.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{pkg_name}-%{version}
|
||||
cp -p %{SOURCE1} %{pkg_name}.cabal
|
||||
cabal-tweak-dep-ver base '>= 4.4 && < 4.16' '< 5'
|
||||
%autosetup -n %{pkg_name}-%{version}
|
||||
|
||||
%build
|
||||
%ghc_lib_build
|
||||
@ -103,7 +99,7 @@ cabal-tweak-dep-ver base '>= 4.4 && < 4.16' '< 5'
|
||||
%license LICENSE
|
||||
|
||||
%files devel -f %{name}-devel.files
|
||||
%doc README.markdown examples
|
||||
%doc CHANGELOG.md README.markdown examples
|
||||
|
||||
%files -n ghc-%{pkg_name}-doc -f ghc-%{pkg_name}-doc.files
|
||||
%license LICENSE
|
||||
|
||||
Loading…
Reference in New Issue
Block a user