diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-08 18:15:05 +0000 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-08 18:15:05 +0000 |
| commit | 7dd86927078adffde6d33c73fb21c55796fe7c56 (patch) | |
| tree | 2c3c34f944e9b93f4de02c2e93c98be9b3c73a62 /standalone | |
| parent | 2f5f75e7898b6a4b9fecc2afaa3e12af68b98d59 (diff) | |
| parent | e36978ef19e1b1aa9f2acb30ccc53c893cd508b3 (diff) | |
Merge branch 'master' of git://git-annex.branchable.com
Diffstat (limited to 'standalone')
| -rw-r--r-- | standalone/android/haskell-patches/gnuidn_fix-build-with-new-base.patch | 50 | ||||
| -rwxr-xr-x | standalone/android/install-haskell-packages | 2 |
2 files changed, 2 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/install-haskell-packages b/standalone/android/install-haskell-packages index d344a36fd..749f45f62 100755 --- a/standalone/android/install-haskell-packages +++ b/standalone/android/install-haskell-packages @@ -106,6 +106,8 @@ install_pkgs () { patched uuid patched dns patched gnutls + patched libxml-sax + patched network-protocol-xmpp cd .. |