diff options
Diffstat (limited to 'standalone/no-th/haskell-patches/yesod-static_hack.patch')
| -rw-r--r-- | standalone/no-th/haskell-patches/yesod-static_hack.patch | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/standalone/no-th/haskell-patches/yesod-static_hack.patch b/standalone/no-th/haskell-patches/yesod-static_hack.patch index 46e4b654c..20e47b5dd 100644 --- a/standalone/no-th/haskell-patches/yesod-static_hack.patch +++ b/standalone/no-th/haskell-patches/yesod-static_hack.patch @@ -1,6 +1,6 @@ -From 606c5f4f4b2d476d274907eb2bb8c12b60fc451f Mon Sep 17 00:00:00 2001 +From 09d7340ff4c9b43f7c8c2ad6529a6c60871d265f Mon Sep 17 00:00:00 2001 From: dummy <dummy@example.com> -Date: Wed, 21 May 2014 04:43:30 +0000 +Date: Fri, 3 Jul 2015 01:39:14 +0000 Subject: [PATCH] remove TH --- @@ -31,7 +31,7 @@ index 08febb9..e3a6d51 100644 -- | Use <https://github.com/mishoo/UglifyJS2 UglifyJS2> to compress javascript. -- Assumes @uglifyjs@ is located in the path and uses options @[\"-m\", \"-c\"]@ diff --git a/Yesod/Static.hs b/Yesod/Static.hs -index 725ebf4..33eaffd 100644 +index a18d88e..afb1cda 100644 --- a/Yesod/Static.hs +++ b/Yesod/Static.hs @@ -37,8 +37,8 @@ module Yesod.Static @@ -99,7 +99,7 @@ index 725ebf4..33eaffd 100644 @@ -267,7 +270,7 @@ staticFilesList dir fs = -- see if their copy is up-to-date. publicFiles :: Prelude.FilePath -> Q [Dec] - publicFiles dir = mkStaticFiles' dir "StaticRoute" False + publicFiles dir = mkStaticFiles' dir False - +-} @@ -111,17 +111,17 @@ index 725ebf4..33eaffd 100644 +{- mkStaticFiles :: Prelude.FilePath -> Q [Dec] - mkStaticFiles fp = mkStaticFiles' fp "StaticRoute" True + mkStaticFiles fp = mkStaticFiles' fp True -@@ -357,6 +361,7 @@ mkStaticFilesList fp fs routeConName makeHash = do - [ Clause [] (NormalB $ (ConE route) `AppE` f' `AppE` qs) [] +@@ -354,6 +358,7 @@ mkStaticFilesList fp fs makeHash = do + [ Clause [] (NormalB $ (ConE 'StaticRoute) `AppE` f' `AppE` qs) [] ] ] +-} base64md5File :: Prelude.FilePath -> IO String base64md5File = fmap (base64 . encode) . hashFile -@@ -395,7 +400,7 @@ base64 = map tr +@@ -392,7 +397,7 @@ base64 = map tr -- single static file at compile time. data CombineType = JS | CSS @@ -130,7 +130,7 @@ index 725ebf4..33eaffd 100644 combineStatics' :: CombineType -> CombineSettings -> [Route Static] -- ^ files to combine -@@ -429,7 +434,7 @@ combineStatics' combineType CombineSettings {..} routes = do +@@ -426,7 +431,7 @@ combineStatics' combineType CombineSettings {..} routes = do case combineType of JS -> "js" CSS -> "css" @@ -139,7 +139,7 @@ index 725ebf4..33eaffd 100644 -- | Data type for holding all settings for combining files. -- -- This data type is a settings type. For more information, see: -@@ -505,6 +510,7 @@ instance Default CombineSettings where +@@ -502,6 +507,7 @@ instance Default CombineSettings where errorIntro :: [FilePath] -> [Char] -> [Char] errorIntro fps s = "Error minifying " ++ show fps ++ ": " ++ s @@ -147,7 +147,7 @@ index 725ebf4..33eaffd 100644 liftRoutes :: [Route Static] -> Q Exp liftRoutes = fmap ListE . mapM go -@@ -551,4 +557,5 @@ combineScripts' :: Bool -- ^ development? if so, perform no combining +@@ -548,4 +554,5 @@ combineScripts' :: Bool -- ^ development? if so, perform no combining -> Q Exp combineScripts' development cs con routes | development = [| mapM_ (addScript . $(return $ ConE con)) $(liftRoutes routes) |] @@ -155,18 +155,18 @@ index 725ebf4..33eaffd 100644 + | otherwise = [| addScript $ $(return $ ConE con) $(combineStatics' JS cs routes) |]a +-} diff --git a/yesod-static.cabal b/yesod-static.cabal -index 2582a95..5df03b3 100644 +index 4ccb0d7..8758aaa 100644 --- a/yesod-static.cabal +++ b/yesod-static.cabal -@@ -49,7 +49,6 @@ library +@@ -50,7 +50,6 @@ library + , system-fileio >= 0.3 , data-default - , shakespeare-css >= 1.0.3 , mime-types >= 0.1 - , hjsmin , filepath >= 1.3 , resourcet >= 0.4 , unordered-containers >= 0.2 -@@ -62,13 +61,6 @@ library +@@ -63,13 +62,6 @@ library , hashable >= 1.1 exposed-modules: Yesod.Static @@ -181,13 +181,13 @@ index 2582a95..5df03b3 100644 ghc-options: -Wall extensions: TemplateHaskell @@ -108,7 +100,6 @@ test-suite tests + , system-fileio , data-default - , shakespeare-css , mime-types - , hjsmin , filepath , resourcet , unordered-containers -- -2.0.0.rc2 +2.1.4 |