more patch cleanup

4 files changed, 49 insertions, 81 deletions

diff --git a/standalone/android/haskell-patches/HTTP_4000.2.8-0001-build-with-base-4.8.patch b/standalone/android/haskell-patches/HTTP_4000.2.8-0001-build-with-base-4.8.patch
index 7109475a9..3114653f2 100644
--- a/standalone/android/haskell-patches/HTTP_4000.2.8-0001-build-with-base-4.8.patch
+++ b/standalone/android/haskell-patches/HTTP_4000.2.8-0001-build-with-base-4.8.patch
@@ -1,17 +1,17 @@
-From 413b087d3f6b1f4e80313035797144621356c36c Mon Sep 17 00:00:00 2001
+From 32d0741c64e6bd280e46f7c452db9462fbac05f9 Mon Sep 17 00:00:00 2001
 From: Joey Hess <joey@kitenet.net>
-Date: Tue, 7 May 2013 18:17:29 -0400
-Subject: [PATCH] build with base 4.8
+Date: Tue, 7 May 2013 18:21:04 -0400
+Subject: [PATCH] fix build
 
 ---
- HTTP.cabal |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ HTTP.cabal |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/HTTP.cabal b/HTTP.cabal
-index 76cb5d6..c7019f0 100644
+index 76cb5d6..edddf26 100644
 --- a/HTTP.cabal
 +++ b/HTTP.cabal
-@@ -85,7 +85,7 @@ Library
+@@ -85,12 +85,12 @@ Library
                   Network.HTTP.Utils
                   Paths_HTTP
    GHC-options: -fwarn-missing-signatures -Wall
@@ -20,6 +20,12 @@ index 76cb5d6..c7019f0 100644
    Extensions: FlexibleInstances
    if flag(old-base)
      Build-depends: base < 3
+   else
+-    Build-depends: base >= 3, array, old-time, bytestring
++    Build-depends: base >= 3, array, old-time, bytestring (>= 0.10.3.0)
+ 
+   if flag(mtl1)
+     Build-depends: mtl >= 1.1 && < 1.2
 -- 
 1.7.10.4
 
diff --git a/standalone/android/haskell-patches/gsasl_0.3.5-0001-link-with-libgsasl.patch b/standalone/android/haskell-patches/gsasl_0.3.5-0001-link-with-libgsasl.patch
index 05495a320..42206a1cf 100644
--- a/standalone/android/haskell-patches/gsasl_0.3.5-0001-link-with-libgsasl.patch
+++ b/standalone/android/haskell-patches/gsasl_0.3.5-0001-link-with-libgsasl.patch
@@ -1,27 +1,25 @@
-From c7d39a8f91af93203194313195a79b04d80a16a3 Mon Sep 17 00:00:00 2001
+From df0f41f92d003f7d59ef927737ffec3a9bd61827 Mon Sep 17 00:00:00 2001
 From: Joey Hess <joey@kitenet.net>
-Date: Sun, 21 Apr 2013 15:22:00 -0400
-Subject: [PATCH] link with libgsasl
+Date: Tue, 7 May 2013 18:41:01 -0400
+Subject: [PATCH] avoid cabal hell
 
-This requires libgsasl.a (and no .so) be installed in the ugly hardcoded
-lib dir. When built this way, the haskell gsasl library will link the
-library into executables with no further options.
 ---
- gsasl.cabal |    1 +
- 1 file changed, 1 insertion(+)
+ gsasl.cabal |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gsasl.cabal b/gsasl.cabal
-index c5c2b19..a31cc71 100644
+index d991873..c5c2b19 100644
 --- a/gsasl.cabal
 +++ b/gsasl.cabal
-@@ -27,6 +27,7 @@ library
-   ghc-options: -Wall -O2
-   hs-source-dirs: lib
-   c-sources: cbits/hsgsasl-shim.c
-+  LD-Options: -L /home/joey/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/sysroot/usr/lib/
- 
+@@ -31,7 +31,7 @@ library
    build-depends:
        base >= 4.0 && < 5.0
+     , transformers >= 0.2
+-    , bytestring >= 0.9
++    , bytestring >= 0.10.3.0
+ 
+   pkgconfig-depends: libgsasl >= 1.1
+ 
 -- 
 1.7.10.4
 
diff --git a/standalone/android/haskell-patches/hS3_0.5.6_0001-fix-build.patch b/standalone/android/haskell-patches/hS3_0.5.6_0001-fix-build.patch
deleted file mode 100644
index 5f842d813..000000000
--- a/standalone/android/haskell-patches/hS3_0.5.6_0001-fix-build.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 0eba6e68ed23a2901d63b77438da2015af9d7a7a Mon Sep 17 00:00:00 2001
-From: Joey Hess <joey@kitenet.net>
-Date: Sat, 4 May 2013 15:32:58 -0400
-Subject: [PATCH] fix build
-
-Update to newer exception library.
-
-Cross building the executable fails at strip time, so disable it.
----
- Network/AWS/.AWSConnection.hs.swp | Bin 4096 -> 0 bytes
- Network/AWS/AWSConnection.hs      |   3 +++
- hS3.cabal                         |   3 ---
- 3 files changed, 3 insertions(+), 3 deletions(-)
- delete mode 100644 Network/AWS/.AWSConnection.hs.swp
-
-diff --git a/Network/AWS/.AWSConnection.hs.swp b/Network/AWS/.AWSConnection.hs.swp
-deleted file mode 100644
-index ccbf6d0439a7f0878b13229c973afe7518a48f8e..0000000000000000000000000000000000000000
-GIT binary patch
-literal 0
-HcmV?d00001
-
-literal 4096
-zcmYc?2=nw+FxN9?00IF92DPNtK=V%=3?5Pp3|aZ9l^|h4AU&^?kP@(b9mqialH3CQ
-zj9_D313gncGkw3*lJfkbY<<V@U=ViB&&x|qF3HT#)5|C(%Ft0oqaiRF0z`%YFN3j>
-up@FiJqJpqcD3N+bm5qkLXb6mkz-S1JhQMeDjE2By2#kinXb23K5C8xpjT&eG
-
-diff --git a/Network/AWS/AWSConnection.hs b/Network/AWS/AWSConnection.hs
-index 9a76961..76c3642 100644
---- a/Network/AWS/AWSConnection.hs
-+++ b/Network/AWS/AWSConnection.hs
-@@ -16,6 +16,7 @@ module Network.AWS.AWSConnection (
-    ) where
- 
- import System.Environment
-+import Control.Exception
- 
- -- | An Amazon Web Services connection.  Everything needed to connect
- --   and authenticate requests.
-@@ -57,3 +58,5 @@ amazonS3ConnectionFromEnv =
-                   ( _,  _,  _) -> Just (amazonS3Connection ak sk0)
-     where getEnvKey s = catch (getEnv s) (const $ return "")
- 
-+catchIO :: IO a -> (IOException -> IO a) -> IO a
-+catchIO = catch
-diff --git a/hS3.cabal b/hS3.cabal
-index aefb1ca..32e90b5 100644
---- a/hS3.cabal
-+++ b/hS3.cabal
-@@ -44,6 +44,3 @@ Library
-         Network.AWS.AWSConnection,
-         Network.AWS.Authentication,
-         Network.AWS.ArrowUtils
--
--Executable     hs3
--  main-is:        hS3.hs
--- 
-1.8.2.rc3
-
diff --git a/standalone/android/haskell-patches/hS3_0.5.7_0001-fix-build.patch b/standalone/android/haskell-patches/hS3_0.5.7_0001-fix-build.patch
new file mode 100644
index 000000000..c0158c0f4
--- /dev/null
+++ b/standalone/android/haskell-patches/hS3_0.5.7_0001-fix-build.patch
@@ -0,0 +1,23 @@
+From 643b3c9fd95967c5911107f46498cd851e68f97d Mon Sep 17 00:00:00 2001
+From: Joey Hess <joey@kitenet.net>
+Date: Tue, 7 May 2013 18:26:33 -0400
+Subject: [PATCH] fix build
+
+---
+ hS3.cabal |    3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/hS3.cabal b/hS3.cabal
+index 35f7496..e04bf65 100644
+--- a/hS3.cabal
++++ b/hS3.cabal
+@@ -44,6 +44,3 @@ Library
+         Network.AWS.AWSConnection,
+         Network.AWS.Authentication,
+         Network.AWS.ArrowUtils
+-
+-Executable     hs3
+-  main-is:        hS3.hs
+-- 
+1.7.10.4
+