| 1 |
kolmodin 09/08/05 18:09:18 |
| 2 |
|
| 3 |
Added: hsql-postgresql-1.7.3-ghc68.patch |
| 4 |
Log: |
| 5 |
Version bump dev-haskell/hsql-postgresql. |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-haskell/hsql-postgresql/files/hsql-postgresql-1.7.3-ghc68.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/hsql-postgresql/files/hsql-postgresql-1.7.3-ghc68.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-haskell/hsql-postgresql/files/hsql-postgresql-1.7.3-ghc68.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: hsql-postgresql-1.7.3-ghc68.patch |
| 15 |
=================================================================== |
| 16 |
diff -rN -u old-hsql-postgresql-1.7.3/Database/HSQL/PostgreSQL.hsc new-hsql-postgresql-1.7.3/Database/HSQL/PostgreSQL.hsc |
| 17 |
--- old-hsql-postgresql-1.7.3/Database/HSQL/PostgreSQL.hsc 2009-07-23 14:10:46.000000000 +0200 |
| 18 |
+++ new-hsql-postgresql-1.7.3/Database/HSQL/PostgreSQL.hsc 2009-07-23 14:10:46.000000000 +0200 |
| 19 |
@@ -21,7 +21,7 @@ |
| 20 |
import Data.Char |
| 21 |
import Foreign |
| 22 |
import Foreign.C |
| 23 |
-import Control.OldException (throwDyn, catchDyn, dynExceptions, Exception(..)) |
| 24 |
+import Control.Exception (throwDyn, catchDyn, dynExceptions, Exception(..)) |
| 25 |
import Control.Monad(when,unless,mplus) |
| 26 |
import Control.Concurrent.MVar |
| 27 |
import System.Time |
| 28 |
diff -rN -u old-hsql-postgresql-1.7.3/Setup.lhs new-hsql-postgresql-1.7.3/Setup.lhs |
| 29 |
--- old-hsql-postgresql-1.7.3/Setup.lhs 2009-07-23 14:10:46.000000000 +0200 |
| 30 |
+++ new-hsql-postgresql-1.7.3/Setup.lhs 2009-07-23 14:10:46.000000000 +0200 |
| 31 |
@@ -16,14 +16,17 @@ |
| 32 |
import System.Process(runInteractiveProcess, waitForProcess) |
| 33 |
import System.IO(hClose, hGetContents, hPutStr, stderr) |
| 34 |
import Control.Monad(when) |
| 35 |
-import Control.OldException(try) |
| 36 |
+ |
| 37 |
+import System.Directory(doesFileExist) |
| 38 |
|
| 39 |
main = defaultMainWithHooks autoconfUserHooks{preConf= preConf |
| 40 |
,postConf= postConf} |
| 41 |
where |
| 42 |
preConf :: [String] -> ConfigFlags -> IO HookedBuildInfo |
| 43 |
preConf args flags = do |
| 44 |
- try (removeFile "PostgreSQL.buildinfo") |
| 45 |
+ exists <- doesFileExist "PostgreSQL.buildinfo" |
| 46 |
+ when exists $ |
| 47 |
+ removeFile "PostgreSQL.buildinfo" |
| 48 |
return emptyHookedBuildInfo |
| 49 |
postConf :: [String] -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO () |
| 50 |
postConf args flags _ localbuildinfo = do |
| 51 |
diff -rN -u old-hsql-postgresql-1.7.3/hsql-postgresql.cabal new-hsql-postgresql-1.7.3/hsql-postgresql.cabal |
| 52 |
--- old-hsql-postgresql-1.7.3/hsql-postgresql.cabal 2009-07-23 14:10:46.000000000 +0200 |
| 53 |
+++ new-hsql-postgresql-1.7.3/hsql-postgresql.cabal 2009-07-23 14:10:46.000000000 +0200 |
| 54 |
@@ -7,8 +7,8 @@ |
| 55 |
Category: Database |
| 56 |
Description: PostgreSQL driver for HSQL. |
| 57 |
Exposed-modules: Database.HSQL.PostgreSQL |
| 58 |
-Build-depends: base >= 4.0.0.0, hsql, old-time |
| 59 |
+Build-depends: base < 4 && >=3, hsql, old-time |
| 60 |
Maintainer: nick.rudnick@××××××××××.com |
| 61 |
Extensions: ForeignFunctionInterface, CPP |
| 62 |
Build-Type: Custom |
| 63 |
-Extra-libraries: pq |
| 64 |
\ No newline at end of file |
| 65 |
+Extra-libraries: pq |
Archives