fixes

2 files changed, 12 insertions, 20 deletions

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/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
-