summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-6.12.patch')
-rw-r--r--dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-6.12.patch37
1 files changed, 37 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 000000000000..791656b18613
--- /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 =