Merge branch 'master' of ssh://git-annex.branchable.com

7 files changed, 198 insertions, 66 deletions

diff --git a/standalone/android/haskell-patches/hamlet_1.1.6.1_0001-remove-TH.patch b/standalone/android/haskell-patches/hamlet_1.1.6.1_0001-remove-TH.patch
index 8a8ac29c1..1c511a132 100644
--- a/standalone/android/haskell-patches/hamlet_1.1.6.1_0001-remove-TH.patch
+++ b/standalone/android/haskell-patches/hamlet_1.1.6.1_0001-remove-TH.patch
@@ -1,13 +1,12 @@
-From aa18210b7cc124e11fb71640d993de77492b63b1 Mon Sep 17 00:00:00 2001
+From b2c677ed39f1aca3a1111691ba51b26f7fd414a4 Mon Sep 17 00:00:00 2001
 From: Joey Hess <joey@kitenet.net>
-Date: Mon, 15 Apr 2013 15:08:31 -0400
+Date: Wed, 8 May 2013 01:50:58 -0400
 Subject: [PATCH] remove TH
 
-Export functions referred to by TH splices, as these will be needed when
-using the Evil Splicer
 ---
- Text/Hamlet.hs | 219 ++-------------------------------------------------------
- 1 file changed, 6 insertions(+), 213 deletions(-)
+ Text/Hamlet.hs |  219 ++------------------------------------------------------
+ hamlet.cabal   |    2 +-
+ 2 files changed, 7 insertions(+), 214 deletions(-)
 
 diff --git a/Text/Hamlet.hs b/Text/Hamlet.hs
 index 4ac870a..63b8555 100644
@@ -277,6 +276,19 @@ index 4ac870a..63b8555 100644
  varName :: Scope -> String -> Exp
  varName _ "" = error "Illegal empty varName"
  varName scope v@(_:_) = fromMaybe (strToExp v) $ lookup (Ident v) scope
+diff --git a/hamlet.cabal b/hamlet.cabal
+index 73fa6a8..4348508 100644
+--- a/hamlet.cabal
++++ b/hamlet.cabal
+@@ -50,7 +50,7 @@ library
+                    , text             >= 0.7     && < 0.12
+                    , containers       >= 0.2
+                    , blaze-builder    >= 0.2     && < 0.4
+-                   , process          >= 1.0     && < 1.2
++                   , process          >= 1.0     && < 1.3
+                    , blaze-html       >= 0.5     && < 0.6
+                    , blaze-markup     >= 0.5.1   && < 0.6
+ 
 -- 
-1.8.2.rc3
+1.7.10.4
 
diff --git a/standalone/android/haskell-patches/process_1.1.0.2-0001-avoid-configure-script.patch b/standalone/android/haskell-patches/process_1.1.0.2-0001-avoid-configure-script.patch
deleted file mode 100644
index 63b769574..000000000
--- a/standalone/android/haskell-patches/process_1.1.0.2-0001-avoid-configure-script.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ff72a2c501358b3cd71e15c6275ee03670748f3d Mon Sep 17 00:00:00 2001
-From: Joey Hess <joey@kitenet.net>
-Date: Tue, 7 May 2013 17:52:50 -0400
-Subject: [PATCH] avoid configure script
-
----
- process.cabal |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/process.cabal b/process.cabal
-index 8c76b08..2930fdc 100644
---- a/process.cabal
-+++ b/process.cabal
-@@ -14,7 +14,7 @@ extra-source-files:
- extra-tmp-files:
-     config.log config.status autom4te.cache
-     include/HsProcessConfig.h
--build-type:    Configure
-+build-type:    Simple
- cabal-version: >=1.6
- 
- source-repository head
--- 
-1.7.10.4
-
diff --git a/standalone/android/haskell-patches/shakespeare-css_1.0.2_0001-remove-TH.patch b/standalone/android/haskell-patches/shakespeare-css_1.0.2_0001-remove-TH.patch
index 3e2637293..f868197a8 100644
--- a/standalone/android/haskell-patches/shakespeare-css_1.0.2_0001-remove-TH.patch
+++ b/standalone/android/haskell-patches/shakespeare-css_1.0.2_0001-remove-TH.patch
@@ -1,14 +1,15 @@
-From cb77113314702175f066cd801dee5c38d3e26576 Mon Sep 17 00:00:00 2001
+From 8f058e84892a8c4202275f524f74bd6a7097ad40 Mon Sep 17 00:00:00 2001
 From: Joey Hess <joey@kitenet.net>
-Date: Thu, 28 Feb 2013 23:35:51 -0400
+Date: Wed, 8 May 2013 02:07:15 -0400
 Subject: [PATCH] remove TH
 
 ---
- Text/Cassius.hs   |   23 ---------------
- Text/Css.hs       |   84 -----------------------------------------------------
- Text/CssCommon.hs |    4 ---
- Text/Lucius.hs    |   30 +------------------
- 4 files changed, 1 insertion(+), 140 deletions(-)
+ Text/Cassius.hs       |   23 --------------
+ Text/Css.hs           |   84 -------------------------------------------------
+ Text/CssCommon.hs     |    4 ---
+ Text/Lucius.hs        |   30 +-----------------
+ shakespeare-css.cabal |    2 +-
+ 5 files changed, 2 insertions(+), 141 deletions(-)
 
 diff --git a/Text/Cassius.hs b/Text/Cassius.hs
 index ce05374..ae56b0a 100644
@@ -255,6 +256,19 @@ index b71614e..a902e1c 100644
  parseTopLevels :: Parser [TopLevel]
  parseTopLevels =
      go id
+diff --git a/shakespeare-css.cabal b/shakespeare-css.cabal
+index de2497b..874a3b5 100644
+--- a/shakespeare-css.cabal
++++ b/shakespeare-css.cabal
+@@ -33,7 +33,7 @@ library
+                    , shakespeare      >= 1.0     && < 1.1
+                    , template-haskell
+                    , text             >= 0.11.1.1 && < 0.12
+-                   , process          >= 1.0      && < 1.2
++                   , process          >= 1.0      && < 1.3
+                    , parsec           >= 2        && < 4
+                    , transformers
+ 
 -- 
 1.7.10.4
 
diff --git a/standalone/android/haskell-patches/shakespeare-js_1.1.2_0001-remove-TH.patch b/standalone/android/haskell-patches/shakespeare-js_1.1.2_0001-remove-TH.patch
index b583d6e0a..98a16ae07 100644
--- a/standalone/android/haskell-patches/shakespeare-js_1.1.2_0001-remove-TH.patch
+++ b/standalone/android/haskell-patches/shakespeare-js_1.1.2_0001-remove-TH.patch
@@ -1,14 +1,14 @@
-From f3e31696cfb45a528e4b4b6f016dc7101d7cd4fb Mon Sep 17 00:00:00 2001
+From 332c71b3f6bc4786b914e675020a23c492beee5a Mon Sep 17 00:00:00 2001
 From: Joey Hess <joey@kitenet.net>
-Date: Thu, 28 Feb 2013 23:36:06 -0400
+Date: Tue, 7 May 2013 19:28:06 -0400
 Subject: [PATCH] remove TH
 
 ---
  Text/Coffee.hs     |   54 -------------------------------------------------
- Text/Julius.hs     |   53 +-----------------------------------------------
+ Text/Julius.hs     |   56 ++++-----------------------------------------------
  Text/Roy.hs        |   54 -------------------------------------------------
  Text/TypeScript.hs |   57 +---------------------------------------------------
- 4 files changed, 2 insertions(+), 216 deletions(-)
+ 4 files changed, 5 insertions(+), 216 deletions(-)
 
 diff --git a/Text/Coffee.hs b/Text/Coffee.hs
 index 2481936..3f7f9c3 100644
@@ -80,7 +80,7 @@ index 2481936..3f7f9c3 100644
 -coffeeFileDebug = coffeeFileReload
 -{-# DEPRECATED coffeeFileDebug "Please use coffeeFileReload instead." #-}
 diff --git a/Text/Julius.hs b/Text/Julius.hs
-index 230eac3..b990f73 100644
+index 230eac3..1a0376f 100644
 --- a/Text/Julius.hs
 +++ b/Text/Julius.hs
 @@ -14,17 +14,8 @@ module Text.Julius
@@ -102,15 +102,20 @@ index 230eac3..b990f73 100644
      , Javascript (..)
      , RawJavascript (..)
  
-@@ -37,7 +28,6 @@ module Text.Julius
+@@ -37,9 +28,11 @@ module Text.Julius
      , renderJavascriptUrl
  
        -- ** internal, used by 'Text.Coffee'
 -    , javascriptSettings
        -- ** internal
      , juliusUsedIdentifiers
++
++      -- used by TH splices
++    , asJavascriptUrl
      ) where
-@@ -101,47 +91,6 @@ instance RawJS TL.Text where rawJS = RawJavascript . fromLazyText
+ 
+ import Language.Haskell.TH.Quote (QuasiQuoter (..))
+@@ -101,47 +94,6 @@ instance RawJS TL.Text where rawJS = RawJavascript . fromLazyText
  instance RawJS Builder where rawJS = RawJavascript
  instance RawJS Bool where rawJS = RawJavascript . toJavascript
  
diff --git a/standalone/android/haskell-patches/shakespeare_1.0.3_0001-remove-TH.patch b/standalone/android/haskell-patches/shakespeare_1.0.3_0001-remove-TH.patch
index 37676dfa7..5a5b8eeb8 100644
--- a/standalone/android/haskell-patches/shakespeare_1.0.3_0001-remove-TH.patch
+++ b/standalone/android/haskell-patches/shakespeare_1.0.3_0001-remove-TH.patch
@@ -1,15 +1,16 @@
-From 2e6721d571148cb77fb8c906042f6fa61e660999 Mon Sep 17 00:00:00 2001
+From 10484c5f68431349b249f07517c392c4a90bdb05 Mon Sep 17 00:00:00 2001
 From: Joey Hess <joey@kitenet.net>
-Date: Thu, 28 Feb 2013 23:35:41 -0400
+Date: Wed, 8 May 2013 01:47:19 -0400
 Subject: [PATCH] remove TH
 
 ---
  Text/Shakespeare.hs      |  109 ----------------------------------------------
  Text/Shakespeare/Base.hs |   28 ------------
- 2 files changed, 137 deletions(-)
+ shakespeare.cabal        |    2 +-
+ 3 files changed, 1 insertion(+), 138 deletions(-)
 
 diff --git a/Text/Shakespeare.hs b/Text/Shakespeare.hs
-index e774e65..d300951 100644
+index 7750135..fabbf66 100644
 --- a/Text/Shakespeare.hs
 +++ b/Text/Shakespeare.hs
 @@ -12,11 +12,7 @@ module Text.Shakespeare
@@ -24,7 +25,7 @@ index e774e65..d300951 100644
      , shakespeareUsedIdentifiers
      , RenderUrl
      , VarType
-@@ -133,39 +129,6 @@ defaultShakespeareSettings = ShakespeareSettings {
+@@ -135,39 +131,6 @@ defaultShakespeareSettings = ShakespeareSettings {
    , modifyFinalValue = Nothing
  }
  
@@ -64,7 +65,7 @@ index e774e65..d300951 100644
  type QueryParameters = [(TS.Text, TS.Text)]
  type RenderUrl url = (url -> QueryParameters -> TS.Text)
  type Shakespeare url = RenderUrl url -> Builder
-@@ -300,54 +263,6 @@ pack' = TS.pack
+@@ -302,54 +265,6 @@ pack' = TS.pack
  {-# NOINLINE pack' #-}
  #endif
  
@@ -119,7 +120,7 @@ index e774e65..d300951 100644
  data VarType = VTPlain | VTUrl | VTUrlParam | VTMixin
  
  getVars :: Content -> [(Deref, VarType)]
-@@ -367,30 +282,6 @@ data VarExp url = EPlain Builder
+@@ -369,30 +284,6 @@ data VarExp url = EPlain Builder
  shakespeareUsedIdentifiers :: ShakespeareSettings -> String -> [(Deref, VarType)]
  shakespeareUsedIdentifiers settings = concatMap getVars . contentFromString settings
  
@@ -189,6 +190,19 @@ index 7c96898..ef769b1 100644
  derefParens, derefCurlyBrackets :: UserParser a Deref
  derefParens        = between (char '(') (char ')') parseDeref
  derefCurlyBrackets = between (char '{') (char '}') parseDeref
+diff --git a/shakespeare.cabal b/shakespeare.cabal
+index 01c8d5d..0fff966 100644
+--- a/shakespeare.cabal
++++ b/shakespeare.cabal
+@@ -27,7 +27,7 @@ library
+                    , template-haskell
+                    , parsec           >= 2       && < 4
+                    , text             >= 0.7     && < 0.12
+-                   , process          >= 1.0     && < 1.2
++                   , process          >= 1.0     && < 1.3
+ 
+     exposed-modules: 
+                      Text.Shakespeare
 -- 
 1.7.10.4
 
diff --git a/standalone/android/haskell-patches/yesod-static_1.1.2-remove-TH.patch b/standalone/android/haskell-patches/yesod-static_1.1.2-remove-TH.patch
index de30ea4ca..b0446111b 100644
--- a/standalone/android/haskell-patches/yesod-static_1.1.2-remove-TH.patch
+++ b/standalone/android/haskell-patches/yesod-static_1.1.2-remove-TH.patch
@@ -172,16 +172,3 @@ index e8ca09f..193b1f0 100644
  base64md5File :: Prelude.FilePath -> IO String
  base64md5File = fmap (base64 . encode) . hashFile
      where encode d = Data.Serialize.encode (d :: MD5)
-diff --git a/dist/package.conf.inplace b/dist/package.conf.inplace
-index 0637a08..eeff311 100644
---- a/dist/package.conf.inplace
-+++ b/dist/package.conf.inplace
-@@ -1 +1,2 @@
--[]
-\ No newline at end of file
-+[InstalledPackageInfo {installedPackageId = InstalledPackageId "yesod-static-1.1.2-inplace", sourcePackageId = PackageIdentifier {pkgName = PackageName "yesod-static", pkgVersion = Version {versionBranch = [1,1,2], versionTags = []}}, license = MIT, copyright = "", maintainer = "Michael Snoyman <michael@snoyman.com>, Greg Weber <greg@gregweber.info>", author = "Michael Snoyman <michael@snoyman.com>", stability = "Stable", homepage = "http://www.yesodweb.com/", pkgUrl = "", synopsis = "Static file serving subsite for Yesod Web Framework.", description = "Static file serving subsite for Yesod Web Framework.", category = "Web, Yesod", exposed = True, exposedModules = ["Yesod.Static"], hiddenModules = [], trusted = False, importDirs = ["/home/joey/yesod-static-1.1.2/dist/build"], libraryDirs = ["/home/joey/yesod-static-1.1.2/dist/build"], hsLibraries = ["HSyesod-static-1.1.2"], extraLibraries = [], extraGHCiLibraries = [], includeDirs = [], includes = [], depends = [InstalledPackageId "base-4.7.0.0-460992ac16ead97d88c73f4125e796d4",InstalledPackageId "base64-bytestring-1.0.0.1-8f54bb73ec493a5130061ebca542c11e",InstalledPackageId "bytestring-0.10.3.0-9c590669208a87636c23a3d3510a31ff",InstalledPackageId "cereal-0.3.5.2-f30c5cc09d1cc15977a64fe292c53513",InstalledPackageId "conduit-0.5.6-3168abc5ff00ded4bbc15f5915ad8633",InstalledPackageId "containers-0.5.0.0-eaa71ab98116fcd2d322913214739de5",InstalledPackageId "crypto-conduit-0.4.3-7a2968522a5c4748ce5988a2a466061e",InstalledPackageId "cryptohash-0.8.3-0aac68aa3a568ebeb89a354c921feb58",InstalledPackageId "directory-1.2.0.1-ca44c33c2fac281048d0dd7cd29e86c3",InstalledPackageId "file-embed-0.0.4.7-70a8411da82b83a0bbea9ecb291922ca",InstalledPackageId "http-types-0.7.3.0.1-09ea63b109c64a8370a96ee561c3ab2a",InstalledPackageId "old-time-1.1.0.1-9c370bbecb794b4c05408eb17a0038f1",InstalledPackageId "system-filepath-0.4.7-9506cbec38ccb0e49fd3a1dcce66306e",InstalledPackageId "template-haskell-2.9.0.0-60ba2293ffcafe171e54a808fdce5a7c",InstalledPackageId "text-0.11.2.3-948bb4afd264a1a5c0cca04031b4151c",InstalledPackageId "transformers-0.3.0.0-bae5adc5a648f25bafc73de9dc6a08a0",InstalledPackageId "unix-compat-0.4.1.0-0019b5bc860083c9a153099b086619ed",InstalledPackageId "wai-1.3.0.2-0f2b7cd8b8b0d8a776528af2b9f1f4f9",InstalledPackageId "wai-app-static-1.3.1-a32981caae981238524cee9823ccc666",InstalledPackageId "yesod-core-1.1.8-c0a15bfed9cb8f978bdf71ddd343ea18"], hugsOptions = [], ccOptions = [], ldOptions = [], frameworkDirs = [], frameworks = [], haddockInterfaces = ["/home/joey/yesod-static-1.1.2/dist/doc/html/yesod-static/yesod-static.haddock"], haddockHTMLs = ["/home/joey/yesod-static-1.1.2/dist/doc/html/yesod-static"]}
-+]
-\ No newline at end of file
--- 
-1.8.2.rc3
-
diff --git a/standalone/android/install-haskell-packages b/standalone/android/install-haskell-packages
new file mode 100755
index 000000000..3035e43d0
--- /dev/null
+++ b/standalone/android/install-haskell-packages
@@ -0,0 +1,125 @@
+#!/bin/sh
+# Bootstraps from an empty cabal to all the necessary haskell packages
+# being installed, with the necessary patches to work on Android.
+#
+# Packages are installed at specific versions we have patches for. Newer
+# versions often break cross-compilation by adding TH, etc.
+# 
+# Needs some extra C libraries to be installed inside the cross-compiler
+# lib directory: libgnutls libxml2
+
+# lib dir
+set -e
+
+PATH=$HOME/.ghc/android-14/arm-linux-androideabi-4.7/bin:$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/bin:$PATH
+
+# Not run every time because we don't care about the latest versions.
+if [ ! -e $HOME/.ghc/android-14/arm-linux-androideabi-4.7/cabal/packages/hackage.haskell.org ]; then
+	cabal update
+fi
+
+rm -rf tmp
+mkdir tmp
+cd tmp
+
+patched () {
+	pkg=$1
+	version=$2
+	shift 2
+	cabal unpack $pkg-$version
+	cd $pkg-$version
+	for patch in ../../haskell-patches/${pkg}_*; do
+		echo applying $patch
+		patch -p1 < $patch
+	done
+	cabal install "$@"
+	cd ..
+}
+
+unpatched () {
+	echo "cabal install $@"
+	cabal install "$@"
+}
+
+unpatched bytestring-0.10.3.0 text-0.11.2.3 parsec-3.1.3
+patched network 2.4.1.0
+unpatched cereal-0.3.5.2
+patched socks 0.4.2
+unpatched hslogger-1.2.1
+patched MissingH 1.2.0.0
+patched unix-time 0.1.4
+patched async 2.0.1.4
+patched zlib 0.5.4.0
+patched primitive 0.5.0.1
+patched vector 0.10.0.1
+patched distributive 0.3
+unpatched hashable-1.1.2.5
+patched case-insensitive 0.4.0.1
+unpatched nats-0.1 semigroups-0.9 tagged-0.4.4 comonad-3.0.1.1 comonad-transformers-3.0.1
+patched profunctors 3.3
+patched split 0.2.1.2
+unpatched monads-tf-0.1.0.1
+patched gnutls 0.1.4
+unpatched attoparsec-0.10.4.0 blaze-builder-0.3.1.1 
+patched syb 0.3.7
+patched aeson 0.6.1.0
+patched lifted-base 0.2.0.2
+patched resourcet 0.4.4
+patched monad-control 0.3.1.4
+unpatched conduit-0.5.6
+patched monad-logger 0.2.3.2
+unpatched reflection-1.1.7 bifunctors-3.2 semigroupoids-3.0.2
+unpatched bifunctors-3.2 comonads-fd-3.0.1 groupoids-3.0.1.1
+unpatched profunctor-extras-3.3
+patched lens 3.8.5
+unpatched xml-types-0.3.3
+patched libxml-sax 0.7.3
+patched network-conduit 0.6.2.2
+unpatched asn1-data-0.7.1 asn1-types-0.1.3 attoparsec-conduit-0.5.0.3
+unpatched blaze-builder-conduit-0.5.0.3 blaze-markup-0.5.1.5 blaze-html-0.5.1.3
+patched cipher-aes 0.1.7
+unpatched crypto-api-0.10.2
+unpatched cprng-aes-0.3.4
+unpatched http-types-0.8.0 mime-types-0.1.0.3
+unpatched certificate-1.3.7 system-fileio-0.3.11 tls-1.1.2
+unpatched utf8-string-0.3.7
+unpatched publicsuffixlist-0.1
+unpatched xml-conduit-1.0.3.3
+unpatched zlib-bindings-0.1.1.3 zlib-conduit-0.5.0.3
+patched shakespeare 1.0.3
+patched hamlet 1.1.6.1
+patched xml-hamlet 0.4.0.3
+unpatched certificate-1.3.7
+unpatched dataenc-0.12 hxt-charproperties-9.1.1 \
+	hxt-regex-xmlschema-9.1.0 hxt-unicode-9.0.2 hxt-9.3.1.1 
+unpatched -f-templateHaskell QuickCheck-2.5.1.1
+unpatched Crypto-4.2.5.1
+patched HTTP 4000.2.8
+patched hS3 0.5.7
+patched file-embed 0.0.4.7
+patched gsasl 0.3.5 \
+	--ghc-options=-I$HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/sysroot/usr/include/ \
+	--ld-options="-L $HOME/.ghc/android-14/arm-linux-androideabi-4.7/arm-linux-androideabi/sysroot/usr/lib/"
+patched network-protocol-xmpp 0.4.4
+patched shakespeare-css 1.0.2
+patched shakespeare-i18n 1.0.0.2
+patched shakespeare-js 1.1.2
+patched persistent 1.1.5.1
+unpatched largeword-1.0.4 crypto-api-0.10.2 http-date-0.0.4 \
+	cryptohash-0.8.3 vault-0.2.0.4 unix-compat-0.4.1.1 \
+	crypto-conduit-0.4.3 wai-1.3.0.3
+patched wai-app-static 1.3.1
+patched wai-extra 1.3.2.1
+patched yesod-routes 1.1.2
+unpatched http-conduit-1.8.7.1
+patched DAV 0.3
+patched yesod-core 1.1.8
+patched yesod-persistent 1.1.0.1
+patched yesod-form 1.2.1.1
+unpatched warp-1.3.7.2 yaml-0.8.2
+patched yesod-default 1.1.3.2
+patched yesod 1.1.8
+patched yesod-static 1.1.2
+
+cd ..
+rm -rf tmp