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/hdbc/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/hdbc/files')
-rw-r--r-- | dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-1.patch | 39 | ||||
-rw-r--r-- | dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-2.patch | 43 |
2 files changed, 82 insertions, 0 deletions
diff --git a/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-1.patch b/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-1.patch new file mode 100644 index 000000000000..6b79476b6662 --- /dev/null +++ b/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-1.patch @@ -0,0 +1,39 @@ +diff --git a/Database/HDBC/Locale.hs b/Database/HDBC/Locale.hs +index e62b1c1..976a6a9 100644 +--- a/Database/HDBC/Locale.hs ++++ b/Database/HDBC/Locale.hs +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + module Database.HDBC.Locale + ( + defaultTimeLocale, +@@ -5,7 +6,12 @@ module Database.HDBC.Locale + ) + + where ++ ++#if MIN_VERSION_time(1,5,0) ++import Data.Time.Format (defaultTimeLocale) ++#else + import System.Locale (defaultTimeLocale) ++#endif + + -- | As the semantic of System.Locale.iso8601DateFormat has changed with + -- old-locale-1.0.0.2 in a non-compatible way, we now define our own +diff --git a/Database/HDBC/SqlValue.hs b/Database/HDBC/SqlValue.hs +index 9724f81..0e278cd 100644 +--- a/Database/HDBC/SqlValue.hs ++++ b/Database/HDBC/SqlValue.hs +@@ -17,7 +17,11 @@ import Data.Char(ord,toUpper) + import Data.Word + import Data.Int + import qualified System.Time as ST +-import Data.Time ++import Data.Time ( Day (ModifiedJulianDay), DiffTime, LocalTime, NominalDiffTime, ParseTime ++ , TimeOfDay, TimeZone, UTCTime, ZonedTime, formatTime, localDay, localTimeOfDay ++ , parseTime, timeOfDayToTime, timeToTimeOfDay, toModifiedJulianDay, utc ++ , utcToZonedTime, zonedTimeToLocalTime, zonedTimeToUTC, zonedTimeZone ++ ) + import Data.Time.Clock.POSIX + import Database.HDBC.Locale (defaultTimeLocale, iso8601DateFormat) + import Data.Ratio diff --git a/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-2.patch b/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-2.patch new file mode 100644 index 000000000000..d4e78b6f8cd2 --- /dev/null +++ b/dev-haskell/hdbc/files/hdbc-2.4.0.0-ghc-7.10-2.patch @@ -0,0 +1,43 @@ +diff --git a/Database/HDBC/SqlValue.hs b/Database/HDBC/SqlValue.hs +index 0e278cd..1ebf114 100644 +--- a/Database/HDBC/SqlValue.hs ++++ b/Database/HDBC/SqlValue.hs +@@ -19,8 +19,13 @@ import Data.Int + import qualified System.Time as ST + import Data.Time ( Day (ModifiedJulianDay), DiffTime, LocalTime, NominalDiffTime, ParseTime + , TimeOfDay, TimeZone, UTCTime, ZonedTime, formatTime, localDay, localTimeOfDay +- , parseTime, timeOfDayToTime, timeToTimeOfDay, toModifiedJulianDay, utc ++ , timeOfDayToTime, timeToTimeOfDay, toModifiedJulianDay, utc + , utcToZonedTime, zonedTimeToLocalTime, zonedTimeToUTC, zonedTimeZone ++#if MIN_VERSION_time(1,5,0) ++ , parseTimeM ++#else ++ , parseTime ++#endif + ) + import Data.Time.Clock.POSIX + import Database.HDBC.Locale (defaultTimeLocale, iso8601DateFormat) +@@ -665,7 +670,11 @@ instance Convertible (TimeOfDay, TimeZone) SqlValue where + instance Convertible SqlValue (TimeOfDay, TimeZone) where + safeConvert (SqlString x) = + do tod <- parseTime' "%T%Q %z" x ++#if MIN_VERSION_time(1,5,0) ++ tz <- case parseTimeM True defaultTimeLocale "%T%Q %z" x of ++#else + tz <- case parseTime defaultTimeLocale "%T%Q %z" x of ++#endif + Nothing -> convError "Couldn't extract timezone in" (SqlString x) + Just y -> Right y + return (tod, tz) +@@ -939,7 +948,11 @@ parseTime' _ inpstr = + #else + parseTime' :: (Typeable t, Convertible SqlValue t, ParseTime t) => String -> String -> ConvertResult t + parseTime' fmtstr inpstr = ++#if MIN_VERSION_time(1,5,0) ++ case parseTimeM True defaultTimeLocale fmtstr inpstr of ++#else + case parseTime defaultTimeLocale fmtstr inpstr of ++#endif + Nothing -> convError ("Cannot parse using default format string " ++ show fmtstr) + (SqlString inpstr) + Just x -> Right x |