diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-haskell/bloomfilter/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-haskell/bloomfilter/files')
-rw-r--r-- | dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-ghc-7.7.patch | 46 | ||||
-rw-r--r-- | dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-quickcheck-2.6.patch | 12 |
2 files changed, 58 insertions, 0 deletions
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 new file mode 100644 index 000000000000..899fb4176aa2 --- /dev/null +++ b/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-ghc-7.7.patch @@ -0,0 +1,46 @@ +diff --git a/Data/BloomFilter.hs b/Data/BloomFilter.hs +index 69711ef..97a8348 100644 +--- a/Data/BloomFilter.hs ++++ b/Data/BloomFilter.hs +@@ -93,7 +93,8 @@ import Control.Monad (liftM, forM_) + import Control.Monad.ST (ST, runST) + import Control.DeepSeq (NFData(..)) + import Data.Array.Base (unsafeAt, unsafeRead, unsafeWrite) +-import Data.Array.ST (STUArray, thaw, unsafeFreeze) ++import Data.Array.ST (STUArray, thaw) ++import qualified Data.Array.Unsafe as U (unsafeFreeze) + import Data.Array.Unboxed (UArray) + import Data.Bits ((.&.), (.|.)) + import Data.BloomFilter.Array (newArray) +@@ -336,7 +337,7 @@ notElemB elt ub = any test (hashesU ub elt) + -- occur. For a safer creation interface, use 'createB'. + unsafeFreezeMB :: MBloom s a -> ST s (Bloom a) + unsafeFreezeMB mb = B (hashMB mb) (shiftMB mb) (maskMB mb) `liftM` +- unsafeFreeze (bitArrayMB mb) ++ U.unsafeFreeze (bitArrayMB mb) + + -- | Copy an immutable Bloom filter to create a mutable one. There is + -- no non-copying equivalent. +diff --git a/Data/BloomFilter/Array.hs b/Data/BloomFilter/Array.hs +index e085bbe..5accde9 100644 +--- a/Data/BloomFilter/Array.hs ++++ b/Data/BloomFilter/Array.hs +@@ -3,7 +3,8 @@ + + module Data.BloomFilter.Array (newArray) where + +-import Control.Monad.ST (ST, unsafeIOToST) ++import Control.Monad.ST (ST) ++import qualified Control.Monad.ST.Unsafe as U (unsafeIOToST) + import Data.Array.Base (MArray, STUArray(..), unsafeNewArray_) + #if __GLASGOW_HASKELL__ >= 704 + import Foreign.C.Types (CInt(..), CSize(..)) +@@ -18,7 +19,7 @@ newArray :: forall e s. (MArray (STUArray s) e (ST s)) => + {-# INLINE newArray #-} + newArray numElems numBytes = do + ary@(STUArray _ _ _ marr#) <- unsafeNewArray_ (0, numElems - 1) +- _ <- unsafeIOToST (memset marr# 0 (fromIntegral numBytes)) ++ _ <- U.unsafeIOToST (memset marr# 0 (fromIntegral numBytes)) + return ary + + foreign import ccall unsafe "memset" 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 new file mode 100644 index 000000000000..0b27043aed2f --- /dev/null +++ b/dev-haskell/bloomfilter/files/bloomfilter-1.2.6.10-quickcheck-2.6.patch @@ -0,0 +1,12 @@ +--- bloomfilter-1.2.6.10-orig/tests/QCSupport.hs 2012-06-16 09:59:56.000000000 +1000 ++++ bloomfilter-1.2.6.10/tests/QCSupport.hs 2012-07-14 19:00:06.035731133 +1000 +@@ -20,9 +20,6 @@ + arbitrary = choose (epsilon, 1 - epsilon) + where epsilon = 1e-6 :: P + +-instance Arbitrary Ordering where +- arbitrary = oneof [return LT, return GT, return EQ] +- + -- For some reason, MIN_VERSION_random doesn't work here :-( + #if __GLASGOW_HASKELL__ < 704 + integralRandomR :: (Integral a, RandomGen g) => (a, a) -> g -> (a, g) |