From 8ad718359faddd0c9c9e9b2f65415d67750f4326 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 14 Jul 2014 16:55:48 -0400 Subject: remove bloomfilter patch no longer needed --- .../bloomfilter_fix-build-with-newer-base.patch | 41 ---------------------- standalone/android/install-haskell-packages | 1 - 2 files changed, 42 deletions(-) delete mode 100644 standalone/android/haskell-patches/bloomfilter_fix-build-with-newer-base.patch diff --git a/standalone/android/haskell-patches/bloomfilter_fix-build-with-newer-base.patch b/standalone/android/haskell-patches/bloomfilter_fix-build-with-newer-base.patch deleted file mode 100644 index 52598bcf2..000000000 --- a/standalone/android/haskell-patches/bloomfilter_fix-build-with-newer-base.patch +++ /dev/null @@ -1,41 +0,0 @@ -From bfbbfe26817bb06ef518b72a9f942dd3843be618 Mon Sep 17 00:00:00 2001 -From: dummy -Date: Sun, 25 May 2014 08:53:50 +0200 -Subject: [PATCH] fix build with newer base - ---- - Data/BloomFilter.hs | 3 ++- - Data/BloomFilter/Array.hs | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/Data/BloomFilter.hs b/Data/BloomFilter.hs -index 69711ef..7a284b8 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 Data.Array.Unsafe (unsafeFreeze) - import Data.Array.Unboxed (UArray) - import Data.Bits ((.&.), (.|.)) - import Data.BloomFilter.Array (newArray) -diff --git a/Data/BloomFilter/Array.hs b/Data/BloomFilter/Array.hs -index e085bbe..d94757a 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 Control.Monad.ST.Unsafe (unsafeIOToST) - import Data.Array.Base (MArray, STUArray(..), unsafeNewArray_) - #if __GLASGOW_HASKELL__ >= 704 - import Foreign.C.Types (CInt(..), CSize(..)) --- -2.0.0.rc2 - diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages index 72cacb3b3..df870b96f 100755 --- a/standalone/android/install-haskell-packages +++ b/standalone/android/install-haskell-packages @@ -89,7 +89,6 @@ install_pkgs () { patched lifted-base patched zlib patched MissingH - patched bloomfilter patched distributive patched comonad patched iproute -- cgit v1.2.3