diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-haskell/feed/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-haskell/feed/files')
-rw-r--r-- | dev-haskell/feed/files/feed-0.3.9.2-ghc-7.10.patch | 20 | ||||
-rw-r--r-- | dev-haskell/feed/files/feed-0.3.9.2-utf8-string.patch | 25 |
2 files changed, 45 insertions, 0 deletions
diff --git a/dev-haskell/feed/files/feed-0.3.9.2-ghc-7.10.patch b/dev-haskell/feed/files/feed-0.3.9.2-ghc-7.10.patch new file mode 100644 index 000000000000..41f672c8f910 --- /dev/null +++ b/dev-haskell/feed/files/feed-0.3.9.2-ghc-7.10.patch @@ -0,0 +1,20 @@ +--- feed-0.3.9.2-orig/Text/Feed/Query.hs 2013-10-28 02:48:21.000000000 +1100 ++++ feed-0.3.9.2/Text/Feed/Query.hs 2015-04-04 11:48:36.759173147 +1100 +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + -------------------------------------------------------------------- + -- | + -- Module : Text.Feed.Query +@@ -62,7 +63,12 @@ + import Data.Maybe + + -- for getItemPublishDate rfc822 date parsing. ++#if MIN_VERSION_time(1,5,0) ++import System.Locale ( rfc822DateFormat, iso8601DateFormat ) ++import Data.Time ( defaultTimeLocale ) ++#else + import System.Locale ( rfc822DateFormat, iso8601DateFormat, defaultTimeLocale ) ++#endif + import Data.Time.Format ( ParseTime, parseTime ) + + feedItems :: Feed.Feed -> [Feed.Item] diff --git a/dev-haskell/feed/files/feed-0.3.9.2-utf8-string.patch b/dev-haskell/feed/files/feed-0.3.9.2-utf8-string.patch new file mode 100644 index 000000000000..323ae701cde4 --- /dev/null +++ b/dev-haskell/feed/files/feed-0.3.9.2-utf8-string.patch @@ -0,0 +1,25 @@ +diff --git a/Text/Feed/Import.hs b/Text/Feed/Import.hs +index 8fde5f9..c001cee 100644 +--- a/Text/Feed/Import.hs ++++ b/Text/Feed/Import.hs +@@ -12,6 +12,7 @@ + -- + -------------------------------------------------------------------- + ++{-# LANGUAGE CPP #-} + module Text.Feed.Import + ( parseFeedFromFile -- :: FilePath -> IO Feed + , parseFeedString -- :: String -> IO Feed +@@ -32,7 +33,12 @@ import Text.XML.Light.Lexer ( XmlSource ) + + import Control.Monad + ++#if MIN_VERSION_utf8_string(1,0,0) ++import Prelude as UTF8 (readFile) ++import Prelude ++#else + import System.IO.UTF8 as UTF8 ( readFile ) ++#endif + + -- | 'parseFeedFromFile fp' reads in the contents of the file at @fp@; + -- the assumed encoding is UTF-8. |