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