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-odbc/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.xz |
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-odbc/files')
-rw-r--r-- | dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-6.12.patch | 37 | ||||
-rw-r--r-- | dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-7.6.patch | 52 |
2 files changed, 89 insertions, 0 deletions
diff --git a/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-6.12.patch b/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-6.12.patch new file mode 100644 index 00000000000..791656b1861 --- /dev/null +++ b/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-6.12.patch @@ -0,0 +1,37 @@ +--- HDBC-odbc-2.3.1.0-orig/HDBC-odbc.cabal 2011-08-10 07:16:38.000000000 +1000 ++++ HDBC-odbc-2.3.1.0/HDBC-odbc.cabal 2011-08-12 14:51:43.510895477 +1000 +@@ -37,10 +37,10 @@ + ExistentialQuantification, + ForeignFunctionInterface, + ScopedTypeVariables +- Build-Depends: base >= 4.3.1.0 && < 5 ++ Build-Depends: base >= 4.2.0.2 && < 5 + , mtl + , HDBC>=2.1.0 +- , time>=1.2.0.3 ++ , time>=1.1.4 + , utf8-string + , bytestring + GHC-Options: -O2 +--- HDBC-odbc-2.3.1.0-orig/Database/HDBC/ODBC/Statement.hsc 2011-08-10 07:16:38.000000000 +1000 ++++ HDBC-odbc-2.3.1.0/Database/HDBC/ODBC/Statement.hsc 2011-08-12 15:16:11.585672600 +1000 +@@ -17,7 +17,7 @@ + import Database.HDBC.ODBC.Utils + import Database.HDBC.ODBC.TypeConv + +-import Foreign.C.String (castCUCharToChar) ++import GHC.Base (unsafeChr) + import Foreign.C.Types + import Foreign.ForeignPtr + import Foreign.Ptr +@@ -55,6 +55,10 @@ + #let CALLCONV = "ccall" + #endif + ++-- | Convert a C @unsigned char@, representing a Latin-1 character, to ++-- the corresponding Haskell character. ++castCUCharToChar :: CUChar -> Char ++castCUCharToChar ch = unsafeChr (fromIntegral (fromIntegral ch :: Word8)) + fGetQueryInfo :: Conn -> ChildList -> String + -> IO ([SqlColDesc], [(String, SqlColDesc)]) + fGetQueryInfo iconn children query = diff --git a/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-7.6.patch b/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-7.6.patch new file mode 100644 index 00000000000..8092cf16da6 --- /dev/null +++ b/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-7.6.patch @@ -0,0 +1,52 @@ +--- HDBC-odbc-2.3.1.0-orig/testsrc/TestSbasics.hs 2011-08-10 07:16:38.000000000 +1000 ++++ HDBC-odbc-2.3.1.0/testsrc/TestSbasics.hs 2012-10-13 12:30:47.216363898 +1100 +@@ -1,9 +1,13 @@ ++{-# LANGUAGE CPP, ScopedTypeVariables #-} + module TestSbasics(tests) where + import Test.HUnit + import Database.HDBC + import TestUtils + import System.IO +-import Control.Exception hiding (catch) ++#if !MIN_VERSION_base(4,6,0) ++import Prelude hiding (catch) ++#endif ++import Control.Exception + + openClosedb = sqlTestCase $ + do dbh <- connectDB +@@ -123,7 +127,7 @@ + -- Let's try a rollback. + catch (withTransaction dbh (\_ -> do sExecuteMany sth rows + fail "Foo")) +- (\_ -> return ()) ++ (\(_::IOException) -> return ()) + sExecute qrysth [] + sFetchAllRows qrysth >>= (assertEqual "rollback" [[Just "0"]]) + +--- HDBC-odbc-2.3.1.0-orig/testsrc/Testbasics.hs 2011-08-10 07:16:38.000000000 +1000 ++++ HDBC-odbc-2.3.1.0/testsrc/Testbasics.hs 2012-10-13 12:30:10.883415738 +1100 +@@ -1,9 +1,13 @@ ++{-# LANGUAGE CPP, ScopedTypeVariables #-} + module Testbasics(tests) where + import Test.HUnit + import Database.HDBC + import TestUtils + import System.IO +-import Control.Exception hiding (catch) ++#if !MIN_VERSION_base(4,6,0) ++import Prelude hiding (catch) ++#endif ++import Control.Exception + + openClosedb = sqlTestCase $ + do dbh <- connectDB +@@ -140,7 +144,7 @@ + -- Let's try a rollback. + catch (withTransaction dbh (\_ -> do executeMany sth rows + fail "Foo")) +- (\_ -> return ()) ++ (\(_::IOException) -> return ()) + execute qrysth [] + fetchAllRows qrysth >>= (assertEqual "rollback" [[SqlString "0"]]) + |