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-postgresql/files/
Date: Wed, 03 Aug 2016 07:36:37
Message-Id: 1470208914.4ca2514ffd41f20b7c8a1bdb305f924950fae9de.monsieurp@gentoo
1 commit: 4ca2514ffd41f20b7c8a1bdb305f924950fae9de
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Jul 27 16:58:47 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=4ca2514f
7
8 dev-haskell/hdbc-postgresql: remove unused patch
9
10 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
11
12 .../files/HDBC-postgresql-2.3.2.1-ghc-7.6.patch | 53 ----------------------
13 1 file changed, 53 deletions(-)
14
15 diff --git a/dev-haskell/hdbc-postgresql/files/HDBC-postgresql-2.3.2.1-ghc-7.6.patch b/dev-haskell/hdbc-postgresql/files/HDBC-postgresql-2.3.2.1-ghc-7.6.patch
16 deleted file mode 100644
17 index 2f81f35..0000000
18 --- a/dev-haskell/hdbc-postgresql/files/HDBC-postgresql-2.3.2.1-ghc-7.6.patch
19 +++ /dev/null
20 @@ -1,53 +0,0 @@
21 ---- HDBC-postgresql-2.3.2.1-orig/testsrc/TestSbasics.hs 2012-03-04 04:08:01.000000000 +1100
22 -+++ HDBC-postgresql-2.3.2.1/testsrc/TestSbasics.hs 2012-10-13 11:08:27.482597846 +1100
23 -@@ -1,10 +1,14 @@
24 -+{-# LANGUAGE CPP, ScopedTypeVariables #-}
25 - module TestSbasics(tests) where
26 - import Test.HUnit
27 - import Data.List
28 - import Database.HDBC
29 - import TestUtils
30 - import System.IO
31 --import Control.Exception hiding (catch)
32 -+#if !MIN_VERSION_base(4,6,0)
33 -+import Prelude hiding (catch)
34 -+#endif
35 -+import Control.Exception
36 -
37 - openClosedb = sqlTestCase $
38 - do dbh <- connectDB
39 -@@ -142,7 +146,7 @@
40 - -- Let's try a rollback.
41 - catch (withTransaction dbh (\_ -> do sExecuteMany sth rows
42 - fail "Foo"))
43 -- (\_ -> return ())
44 -+ (\(_::IOException) -> return ())
45 - sExecute qrysth []
46 - sFetchAllRows qrysth >>= (assertEqual "rollback" [[Just "0"]])
47 -
48 ---- HDBC-postgresql-2.3.2.1-orig/testsrc/Testbasics.hs 2012-03-04 04:08:01.000000000 +1100
49 -+++ HDBC-postgresql-2.3.2.1/testsrc/Testbasics.hs 2012-10-13 11:07:43.622396904 +1100
50 -@@ -1,9 +1,13 @@
51 -+{-# LANGUAGE CPP, ScopedTypeVariables #-}
52 - module Testbasics(tests) where
53 - import Test.HUnit
54 - import Database.HDBC
55 - import TestUtils
56 - import System.IO
57 --import Control.Exception hiding (catch)
58 -+#if !MIN_VERSION_base(4,6,0)
59 -+import Prelude hiding (catch)
60 -+#endif
61 -+import Control.Exception
62 -
63 - openClosedb = sqlTestCase $
64 - do dbh <- connectDB
65 -@@ -140,7 +144,7 @@
66 - -- Let's try a rollback.
67 - catch (withTransaction dbh (\_ -> do executeMany sth rows
68 - fail "Foo"))
69 -- (\_ -> return ())
70 -+ (\(_::IOException) -> return ())
71 - execute qrysth []
72 - fetchAllRows qrysth >>= (assertEqual "rollback" [[SqlString "0"]])
73 -