Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/hdbc-odbc/files/
Date: Wed, 03 Aug 2016 07:36:34
Message-Id: 1470208914.7c713ca3da4e9d535c1106fdfe32cccc95bea68f.monsieurp@gentoo
1 commit: 7c713ca3da4e9d535c1106fdfe32cccc95bea68f
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Jul 27 16:57:25 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 3 07:21:54 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c713ca3
7
8 dev-haskell/hdbc-odbc: remove unused patch
9
10 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
11
12 .../files/hdbc-odbc-2.3.1.0-ghc-6.12.patch | 37 ----------------------
13 1 file changed, 37 deletions(-)
14
15 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
16 deleted file mode 100644
17 index 791656b..0000000
18 --- a/dev-haskell/hdbc-odbc/files/hdbc-odbc-2.3.1.0-ghc-6.12.patch
19 +++ /dev/null
20 @@ -1,37 +0,0 @@
21 ---- HDBC-odbc-2.3.1.0-orig/HDBC-odbc.cabal 2011-08-10 07:16:38.000000000 +1000
22 -+++ HDBC-odbc-2.3.1.0/HDBC-odbc.cabal 2011-08-12 14:51:43.510895477 +1000
23 -@@ -37,10 +37,10 @@
24 - ExistentialQuantification,
25 - ForeignFunctionInterface,
26 - ScopedTypeVariables
27 -- Build-Depends: base >= 4.3.1.0 && < 5
28 -+ Build-Depends: base >= 4.2.0.2 && < 5
29 - , mtl
30 - , HDBC>=2.1.0
31 -- , time>=1.2.0.3
32 -+ , time>=1.1.4
33 - , utf8-string
34 - , bytestring
35 - GHC-Options: -O2
36 ---- HDBC-odbc-2.3.1.0-orig/Database/HDBC/ODBC/Statement.hsc 2011-08-10 07:16:38.000000000 +1000
37 -+++ HDBC-odbc-2.3.1.0/Database/HDBC/ODBC/Statement.hsc 2011-08-12 15:16:11.585672600 +1000
38 -@@ -17,7 +17,7 @@
39 - import Database.HDBC.ODBC.Utils
40 - import Database.HDBC.ODBC.TypeConv
41 -
42 --import Foreign.C.String (castCUCharToChar)
43 -+import GHC.Base (unsafeChr)
44 - import Foreign.C.Types
45 - import Foreign.ForeignPtr
46 - import Foreign.Ptr
47 -@@ -55,6 +55,10 @@
48 - #let CALLCONV = "ccall"
49 - #endif
50 -
51 -+-- | Convert a C @unsigned char@, representing a Latin-1 character, to
52 -+-- the corresponding Haskell character.
53 -+castCUCharToChar :: CUChar -> Char
54 -+castCUCharToChar ch = unsafeChr (fromIntegral (fromIntegral ch :: Word8))
55 - fGetQueryInfo :: Conn -> ChildList -> String
56 - -> IO ([SqlColDesc], [(String, SqlColDesc)])
57 - fGetQueryInfo iconn children query =