Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/bloomfilter/files/
Date: Mon, 14 Sep 2020 07:05:49
Message-Id: 1600067138.627ceb7946ec1ccb1016c4acedcc84cc3da127fb.slyfox@gentoo
1 commit: 627ceb7946ec1ccb1016c4acedcc84cc3da127fb
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sun Sep 13 12:55:46 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 14 07:05:38 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=627ceb79
7
8 dev-haskell/bloomfilter: remove unused patch(es)
9
10 Package-Manager: Portage-3.0.6, Repoman-3.0.1
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
13
14 .../files/bloomfilter-1.2.6.10-ghc-7.7.patch | 46 ----------------------
15 .../bloomfilter-1.2.6.10-quickcheck-2.6.patch | 12 ------
16 2 files changed, 58 deletions(-)
17
18 diff --git a/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-ghc-7.7.patch b/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-ghc-7.7.patch
19 deleted file mode 100644
20 index 899fb4176aa..00000000000
21 --- a/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-ghc-7.7.patch
22 +++ /dev/null
23 @@ -1,46 +0,0 @@
24 -diff --git a/Data/BloomFilter.hs b/Data/BloomFilter.hs
25 -index 69711ef..97a8348 100644
26 ---- a/Data/BloomFilter.hs
27 -+++ b/Data/BloomFilter.hs
28 -@@ -93,7 +93,8 @@ import Control.Monad (liftM, forM_)
29 - import Control.Monad.ST (ST, runST)
30 - import Control.DeepSeq (NFData(..))
31 - import Data.Array.Base (unsafeAt, unsafeRead, unsafeWrite)
32 --import Data.Array.ST (STUArray, thaw, unsafeFreeze)
33 -+import Data.Array.ST (STUArray, thaw)
34 -+import qualified Data.Array.Unsafe as U (unsafeFreeze)
35 - import Data.Array.Unboxed (UArray)
36 - import Data.Bits ((.&.), (.|.))
37 - import Data.BloomFilter.Array (newArray)
38 -@@ -336,7 +337,7 @@ notElemB elt ub = any test (hashesU ub elt)
39 - -- occur. For a safer creation interface, use 'createB'.
40 - unsafeFreezeMB :: MBloom s a -> ST s (Bloom a)
41 - unsafeFreezeMB mb = B (hashMB mb) (shiftMB mb) (maskMB mb) `liftM`
42 -- unsafeFreeze (bitArrayMB mb)
43 -+ U.unsafeFreeze (bitArrayMB mb)
44 -
45 - -- | Copy an immutable Bloom filter to create a mutable one. There is
46 - -- no non-copying equivalent.
47 -diff --git a/Data/BloomFilter/Array.hs b/Data/BloomFilter/Array.hs
48 -index e085bbe..5accde9 100644
49 ---- a/Data/BloomFilter/Array.hs
50 -+++ b/Data/BloomFilter/Array.hs
51 -@@ -3,7 +3,8 @@
52 -
53 - module Data.BloomFilter.Array (newArray) where
54 -
55 --import Control.Monad.ST (ST, unsafeIOToST)
56 -+import Control.Monad.ST (ST)
57 -+import qualified Control.Monad.ST.Unsafe as U (unsafeIOToST)
58 - import Data.Array.Base (MArray, STUArray(..), unsafeNewArray_)
59 - #if __GLASGOW_HASKELL__ >= 704
60 - import Foreign.C.Types (CInt(..), CSize(..))
61 -@@ -18,7 +19,7 @@ newArray :: forall e s. (MArray (STUArray s) e (ST s)) =>
62 - {-# INLINE newArray #-}
63 - newArray numElems numBytes = do
64 - ary@(STUArray _ _ _ marr#) <- unsafeNewArray_ (0, numElems - 1)
65 -- _ <- unsafeIOToST (memset marr# 0 (fromIntegral numBytes))
66 -+ _ <- U.unsafeIOToST (memset marr# 0 (fromIntegral numBytes))
67 - return ary
68 -
69 - foreign import ccall unsafe "memset"
70
71 diff --git a/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-quickcheck-2.6.patch b/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-quickcheck-2.6.patch
72 deleted file mode 100644
73 index 0b27043aed2..00000000000
74 --- a/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-quickcheck-2.6.patch
75 +++ /dev/null
76 @@ -1,12 +0,0 @@
77 ---- bloomfilter-1.2.6.10-orig/tests/QCSupport.hs 2012-06-16 09:59:56.000000000 +1000
78 -+++ bloomfilter-1.2.6.10/tests/QCSupport.hs 2012-07-14 19:00:06.035731133 +1000
79 -@@ -20,9 +20,6 @@
80 - arbitrary = choose (epsilon, 1 - epsilon)
81 - where epsilon = 1e-6 :: P
82 -
83 --instance Arbitrary Ordering where
84 -- arbitrary = oneof [return LT, return GT, return EQ]
85 --
86 - -- For some reason, MIN_VERSION_random doesn't work here :-(
87 - #if __GLASGOW_HASKELL__ < 704
88 - integralRandomR :: (Integral a, RandomGen g) => (a, a) -> g -> (a, g)