refreshed android patches

1 files changed, 18 insertions, 17 deletions

diff --git a/standalone/no-th/haskell-patches/yesod-routes_remove-TH.patch b/standalone/no-th/haskell-patches/yesod-routes_remove-TH.patch
index 18c1416de..99d6c9025 100644
--- a/standalone/no-th/haskell-patches/yesod-routes_remove-TH.patch
+++ b/standalone/no-th/haskell-patches/yesod-routes_remove-TH.patch
@@ -1,17 +1,17 @@
-From acebcf203b270d00aac0a29be48832ae2c64ce7e Mon Sep 17 00:00:00 2001
-From: Joey Hess <joey@kitenet.net>
-Date: Tue, 17 Dec 2013 06:57:07 +0000
+From 8ba08c0efc035486a65f2fd33916a5da7e5210e7 Mon Sep 17 00:00:00 2001
+From: dummy <dummy@example.com>
+Date: Thu, 26 Dec 2013 19:32:55 -0400
 Subject: [PATCH] remove TH
 
 ---
- Yesod/Routes/Parse.hs    | 39 +++++----------------------------------
- Yesod/Routes/TH.hs       | 16 ++++++++--------
- Yesod/Routes/TH/Types.hs | 16 ----------------
- yesod-routes.cabal       |  4 ----
- 4 files changed, 13 insertions(+), 62 deletions(-)
+ Yesod/Routes/Parse.hs    |   40 +++++-----------------------------------
+ Yesod/Routes/TH.hs       |   16 ++++++++--------
+ Yesod/Routes/TH/Types.hs |   16 ----------------
+ yesod-routes.cabal       |    4 ----
+ 4 files changed, 13 insertions(+), 63 deletions(-)
 
 diff --git a/Yesod/Routes/Parse.hs b/Yesod/Routes/Parse.hs
-index 3d27980..c2e3e6d 100644
+index 232982d..7df7750 100644
 --- a/Yesod/Routes/Parse.hs
 +++ b/Yesod/Routes/Parse.hs
 @@ -2,11 +2,11 @@
@@ -31,7 +31,7 @@ index 3d27980..c2e3e6d 100644
      , parseTypeTree
      , TypeTree (..)
      ) where
-@@ -19,41 +19,12 @@ import Yesod.Routes.TH
+@@ -19,42 +19,12 @@ import Yesod.Routes.TH
  import Yesod.Routes.Overlap (findOverlapNames)
  import Data.List (foldl')
  
@@ -45,7 +45,7 @@ index 3d27980..c2e3e6d 100644
 -        let res = resourcesFromString s
 -        case findOverlapNames res of
 -            [] -> lift res
--            z -> error $ "Overlapping routes: " ++ unlines (map show z)
+-            z -> error $ unlines $ "Overlapping routes: " : map show z
 -
 -parseRoutesFile :: FilePath -> Q Exp
 -parseRoutesFile = parseRoutesFileWith parseRoutes
@@ -70,9 +70,10 @@ index 3d27980..c2e3e6d 100644
 -parseRoutesNoCheck = QuasiQuoter
 -    { quoteExp = lift . resourcesFromString
 -    }
- 
+-
  -- | Convert a multi-line string to a set of resources. See documentation for
  -- the format of this string. This is a partial function which calls 'error' on
+ -- invalid input.
 diff --git a/Yesod/Routes/TH.hs b/Yesod/Routes/TH.hs
 index 7b2e50b..b05fc57 100644
 --- a/Yesod/Routes/TH.hs
@@ -150,20 +151,20 @@ index d0a0405..3232e99 100644
  resourceMulti Resource { resourceDispatch = Methods (Just t) _ } = Just t
  resourceMulti _ = Nothing
 diff --git a/yesod-routes.cabal b/yesod-routes.cabal
-index 0e44409..e01ea06 100644
+index 61980d1..33d2380 100644
 --- a/yesod-routes.cabal
 +++ b/yesod-routes.cabal
-@@ -28,10 +28,6 @@ library
+@@ -27,10 +27,6 @@ library
+                      Yesod.Routes.Class
                       Yesod.Routes.Parse
                       Yesod.Routes.Overlap
-                      Yesod.Routes.TH.Types
 -    other-modules:   Yesod.Routes.TH.Dispatch
 -                     Yesod.Routes.TH.RenderRoute
 -                     Yesod.Routes.TH.ParseRoute
 -                     Yesod.Routes.TH.RouteAttrs
+                      Yesod.Routes.TH.Types
      ghc-options:     -Wall
  
- test-suite runtests
 -- 
-1.8.5.1
+1.7.10.4