refresh patches

4 files changed, 75 insertions, 50 deletions

diff --git a/standalone/android/haskell-patches/gnuidn_fix-build-with-new-base.patch b/standalone/android/haskell-patches/gnuidn_fix-build-with-new-base.patch
deleted file mode 100644
index ff9d8f245..000000000
--- a/standalone/android/haskell-patches/gnuidn_fix-build-with-new-base.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From afdec6c9e66211a0ac8419fffe191b059d1fd00c Mon Sep 17 00:00:00 2001
-From: foo <foo@bar>
-Date: Sun, 22 Sep 2013 17:24:33 +0000
-Subject: [PATCH] fix build with new base
-
----
- Data/Text/IDN/IDNA.chs       |    1 +
- Data/Text/IDN/Punycode.chs   |    1 +
- Data/Text/IDN/StringPrep.chs |    1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/Data/Text/IDN/IDNA.chs b/Data/Text/IDN/IDNA.chs
-index ed29ee4..dbb4ba5 100644
---- a/Data/Text/IDN/IDNA.chs
-+++ b/Data/Text/IDN/IDNA.chs
-@@ -31,6 +31,7 @@ import Foreign
- import Foreign.C
- 
- import Data.Text.IDN.Internal
-+import System.IO.Unsafe
- 
- #include <idna.h>
- #include <idn-free.h>
-diff --git a/Data/Text/IDN/Punycode.chs b/Data/Text/IDN/Punycode.chs
-index 24b5fa6..4e62555 100644
---- a/Data/Text/IDN/Punycode.chs
-+++ b/Data/Text/IDN/Punycode.chs
-@@ -32,6 +32,7 @@ import Data.List (unfoldr)
- import qualified Data.ByteString as B
- import qualified Data.Text as T
- 
-+import System.IO.Unsafe
- import Foreign
- import Foreign.C
- 
-diff --git a/Data/Text/IDN/StringPrep.chs b/Data/Text/IDN/StringPrep.chs
-index 752dc9e..5e9fd84 100644
---- a/Data/Text/IDN/StringPrep.chs
-+++ b/Data/Text/IDN/StringPrep.chs
-@@ -39,6 +39,7 @@ import qualified Data.ByteString as B
- import qualified Data.Text as T
- import qualified Data.Text.Encoding as TE
- 
-+import System.IO.Unsafe
- import Foreign
- import Foreign.C
- 
--- 
-1.7.10.4
-
diff --git a/standalone/android/haskell-patches/libxml-sax_text-dep.patch b/standalone/android/haskell-patches/libxml-sax_text-dep.patch
new file mode 100644
index 000000000..c9b4fdb78
--- /dev/null
+++ b/standalone/android/haskell-patches/libxml-sax_text-dep.patch
@@ -0,0 +1,25 @@
+From d4c861dbdee34cb2434085b9ece62c416d4cad79 Mon Sep 17 00:00:00 2001
+From: androidbuilder <androidbuilder@example.com>
+Date: Sat, 8 Feb 2014 17:19:37 +0000
+Subject: [PATCH] text dependency
+
+---
+ libxml-sax.cabal |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libxml-sax.cabal b/libxml-sax.cabal
+index 60dba81..d6883bd 100644
+--- a/libxml-sax.cabal
++++ b/libxml-sax.cabal
+@@ -35,7 +35,7 @@ library
+   build-depends:
+       base >= 4.1 && < 5.0
+     , bytestring >= 0.9
+-    , text >= 0.7 && < 0.12
++    , text
+     , xml-types >= 0.3 && < 0.4
+ 
+   exposed-modules:
+-- 
+1.7.10.4
+
diff --git a/standalone/android/haskell-patches/network-protocol-xmpp_text-dapendency.patch b/standalone/android/haskell-patches/network-protocol-xmpp_text-dapendency.patch
new file mode 100644
index 000000000..798781837
--- /dev/null
+++ b/standalone/android/haskell-patches/network-protocol-xmpp_text-dapendency.patch
@@ -0,0 +1,25 @@
+From 8f124aad6d04abba5729af21ba3b50944f165d4b Mon Sep 17 00:00:00 2001
+From: androidbuilder <androidbuilder@example.com>
+Date: Sat, 8 Feb 2014 17:20:41 +0000
+Subject: [PATCH] text dependency
+
+---
+ network-protocol-xmpp.cabal |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/network-protocol-xmpp.cabal b/network-protocol-xmpp.cabal
+index 2500075..d709a15 100644
+--- a/network-protocol-xmpp.cabal
++++ b/network-protocol-xmpp.cabal
+@@ -36,7 +36,7 @@ library
+     , libxml-sax >= 0.7 && < 0.8
+     , monads-tf >= 0.1 && < 0.2
+     , network >= 2.2
+-    , text >= 0.10 && < 0.12
++    , text
+     , transformers >= 0.2
+     , xml-types >= 0.3 && < 0.4
+ 
+-- 
+1.7.10.4
+
diff --git a/standalone/android/haskell-patches/system-filepath_cross-build.patch b/standalone/android/haskell-patches/system-filepath_cross-build.patch
new file mode 100644
index 000000000..430e8f99f
--- /dev/null
+++ b/standalone/android/haskell-patches/system-filepath_cross-build.patch
@@ -0,0 +1,25 @@
+From 9345a1ad95cc263f99ef124c7a386fb5aaa5405b Mon Sep 17 00:00:00 2001
+From: androidbuilder <androidbuilder@example.com>
+Date: Fri, 7 Feb 2014 22:18:12 +0000
+Subject: [PATCH] fix
+
+---
+ system-filepath.cabal |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/system-filepath.cabal b/system-filepath.cabal
+index d5fbbdd..efdf9ca 100644
+--- a/system-filepath.cabal
++++ b/system-filepath.cabal
+@@ -6,7 +6,7 @@ license-file: license.txt
+ author: John Millikin <jmillikin@gmail.com>
+ maintainer: John Millikin <jmillikin@gmail.com>
+ copyright: John Millikin 2010-2012
+-build-type: Custom
++build-type: Simple
+ cabal-version: >= 1.6
+ category: System
+ stability: experimental
+-- 
+1.7.10.4
+