gienah 15/04/05 10:44:05 Added: gitit-0.10.6.2-ghc-7.10.patch Log: Bump gitit to 0.10.6.2, patched for ghc 7.10.1 (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Revision Changes Path 1.1 www-apps/gitit/files/gitit-0.10.6.2-ghc-7.10.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/gitit/files/gitit-0.10.6.2-ghc-7.10.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-apps/gitit/files/gitit-0.10.6.2-ghc-7.10.patch?rev=1.1&content-type=text/plain Index: gitit-0.10.6.2-ghc-7.10.patch =================================================================== --- gitit-0.10.6.2-orig/Network/Gitit/Authentication.hs 2015-04-03 14:18:02.000000000 +1100 +++ gitit-0.10.6.2/Network/Gitit/Authentication.hs 2015-04-05 20:18:28.239989325 +1000 @@ -1,4 +1,4 @@ -{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE ScopedTypeVariables, FlexibleContexts #-} {- Copyright (C) 2009 John MacFarlane <[email protected]>, Henry Laxen <[email protected]> --- gitit-0.10.6.2-orig/Network/Gitit/Feed.hs 2015-04-03 14:18:02.000000000 +1100 +++ gitit-0.10.6.2/Network/Gitit/Feed.hs 2015-04-05 20:19:13.496945226 +1000 @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {- Copyright (C) 2009 Gwern Branwen <[email protected]> and John MacFarlane <[email protected]> @@ -22,7 +23,11 @@ module Network.Gitit.Feed (FeedConfig(..), filestoreToXmlFeed) where import Data.Time (UTCTime, formatTime, getCurrentTime, addUTCTime) +#if MIN_VERSION_time(1,5,0) +import Data.Time (defaultTimeLocale) +#else import System.Locale (defaultTimeLocale) +#endif import Data.Foldable as F (concatMap) import Data.List (intercalate, sortBy, nub) import Data.Maybe (fromMaybe) --- gitit-0.10.6.2-orig/Network/Gitit/Types.hs 2015-04-03 14:18:02.000000000 +1100 +++ gitit-0.10.6.2/Network/Gitit/Types.hs 2015-04-05 20:17:34.038042036 +1000 @@ -1,4 +1,4 @@ -{-# LANGUAGE TypeSynonymInstances, ScopedTypeVariables, FlexibleInstances #-} +{-# LANGUAGE TypeSynonymInstances, ScopedTypeVariables, FlexibleInstances, CPP #-} {- Copyright (C) 2009 John MacFarlane <[email protected]>, Anton van Straaten <[email protected]> @@ -72,7 +72,11 @@ import Data.Text (Text) import Data.List (intersect) import Data.Time (parseTime) +#if MIN_VERSION_time(1,5,0) +import Data.Time (defaultTimeLocale) +#else import System.Locale (defaultTimeLocale) +#endif import Data.FileStore.Types import Network.Gitit.Server import Text.HTML.TagSoup.Entity (lookupEntity)
