Author: baggins Date: Tue Sep 27 21:43:48 2011 GMT Module: packages Tag: HEAD ---- Log message: - 2.5.2 - patches from gentoo to build it with ghc 7.2
---- Files affected: packages/darcs: darcs.spec (1.36 -> 1.37) , darcs-ghc72.patch (NONE -> 1.1) (NEW), darcs-relax-regex-libs-deps.patch (NONE -> 1.1) (NEW), darcs-tests-ghc72.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/darcs/darcs.spec diff -u packages/darcs/darcs.spec:1.36 packages/darcs/darcs.spec:1.37 --- packages/darcs/darcs.spec:1.36 Thu Sep 1 19:05:40 2011 +++ packages/darcs/darcs.spec Tue Sep 27 23:43:43 2011 @@ -6,13 +6,15 @@ Summary: David's Advanced Revision Control System - yet another replacement for CVS Summary(pl.UTF-8): David's Advanced Revision Control System - jeszcze jeden zamiennik CVS-a Name: darcs -Version: 2.4.4 -Release: 3 +Version: 2.5.2 +Release: 0.1 License: GPL v2 Group: Development/Version Control Source0: http://darcs.net/releases/%{name}-%{version}.tar.gz -# Source0-md5: 1ccd97561e4e0592b44f1989cebeca02 -Patch0: %{name}-issue1753.patch +# Source0-md5: 491b6ca01dec245a16112ad2c7e07dc1 +Patch0: %{name}-ghc72.patch +Patch1: %{name}-relax-regex-libs-deps.patch +Patch2: %{name}-tests-ghc72.patch URL: http://darcs.net/ BuildRequires: curl-devel >= 7.19.1 BuildRequires: ghc >= 6.12.3 @@ -56,6 +58,8 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build runhaskell Setup.lhs configure -v2 \ @@ -107,6 +111,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.37 2011/09/27 21:43:43 baggins +- 2.5.2 +- patches from gentoo to build it with ghc 7.2 + Revision 1.36 2011/09/01 17:05:40 arekm - release 3 ================================================================ Index: packages/darcs/darcs-ghc72.patch diff -u /dev/null packages/darcs/darcs-ghc72.patch:1.1 --- /dev/null Tue Sep 27 23:43:48 2011 +++ packages/darcs/darcs-ghc72.patch Tue Sep 27 23:43:43 2011 @@ -0,0 +1,142 @@ +diff --git a/Distribution/ShellHarness.hs b/Distribution/ShellHarness.hs +index 78a8a9b..949b752 100644 +--- a/Distribution/ShellHarness.hs ++++ b/Distribution/ShellHarness.hs +@@ -12,10 +12,9 @@ import System.Environment ( getEnv, getEnvironment ) + import System.Exit ( ExitCode (..) ) + import System.FilePath + import System.IO +-import System( system ) + import System.Process ( ProcessHandle, + runInteractiveProcess, waitForProcess, +- getProcessExitCode ) ++ getProcessExitCode, system ) + import Data.Maybe + import Data.List ( isInfixOf, isPrefixOf, (\\), nubBy, isSuffixOf ) + import Control.Concurrent +diff --git a/darcs.cabal b/darcs.cabal +index 887a27b..56e36fa 100644 +--- a/darcs.cabal ++++ b/darcs.cabal +@@ -124,7 +124,7 @@ Executable witnesses + else + buildable: True + +- build-tools: ghc >= 6.10 && < 7.2 ++ build-tools: ghc >= 6.10 && < 7.4 + + hs-source-dirs: src + include-dirs: src +@@ -182,7 +182,7 @@ Executable witnesses + text == 0.11.*, + old-time == 1.0.*, + directory >= 1.0.0.0 && < 1.2.0.0, +- process == 1.0.*, ++ process >= 1.0 && < 1.2, + containers >= 0.1 && < 0.5, + array >= 0.1 && < 0.4, + random == 1.0.*, +@@ -192,7 +192,7 @@ Executable witnesses + test-framework >= 0.2.2, + test-framework-quickcheck2 >= 0.2.2 + if !os(windows) +- build-depends: unix >= 1.0 && < 2.5 ++ build-depends: unix >= 1.0 && < 2.6 + if flag(http) + build-depends: network >= 2.2 && < 2.4, + HTTP >= 3000.0 && < 4000.2 +@@ -208,7 +208,7 @@ Library + else + buildable: True + +- build-tools: ghc >= 6.10 && < 7.2 ++ build-tools: ghc >= 6.10 && < 7.4 + + hs-source-dirs: src + include-dirs: src +@@ -385,14 +385,14 @@ Library + tar == 0.3.* + + if !os(windows) +- build-depends: unix >= 1.0 && < 2.5 ++ build-depends: unix >= 1.0 && < 2.6 + + build-depends: base >= 3, + bytestring >= 0.9.0 && < 0.10, + text == 0.11.*, + old-time == 1.0.*, + directory >= 1.0.0.0 && < 1.2.0.0, +- process == 1.0.*, ++ process >= 1.0 && < 1.2, + containers >= 0.1 && < 0.5, + array >= 0.1 && < 0.4, + random == 1.0.* +@@ -483,7 +483,7 @@ Executable darcs + src/umask.c + src/Crypt/sha2.c + +- build-tools: ghc >= 6.10 && < 7.2 ++ build-tools: ghc >= 6.10 && < 7.4 + + -- We need optimizations, regardless of what Hackage says + -- Note: "if true" works around a cabal bug with order of flag composition +@@ -533,14 +533,14 @@ Executable darcs + tar == 0.3.* + + if !os(windows) +- build-depends: unix >= 1.0 && < 2.5 ++ build-depends: unix >= 1.0 && < 2.6 + + build-depends: base >= 3, + bytestring >= 0.9.0 && < 0.10, + text == 0.11.*, + old-time == 1.0.*, + directory >= 1.0.0.0 && < 1.2.0.0, +- process == 1.0.*, ++ process >= 1.0 && < 1.2, + containers >= 0.1 && < 0.5, + array >= 0.1 && < 0.4, + random == 1.0.* +@@ -615,7 +615,7 @@ Executable unit + else + buildable: True + +- build-tools: ghc >= 6.10 && < 7.2 ++ build-tools: ghc >= 6.10 && < 7.4 + + build-depends: base < 5, + extensible-exceptions >= 0.1 && < 0.2, +@@ -678,7 +678,7 @@ Executable unit + cc-options: -DHAVE_SIGINFO_H + + if !os(windows) +- build-depends: unix >= 1.0 && < 2.5 ++ build-depends: unix >= 1.0 && < 2.6 + + build-depends: base >= 3, + bytestring >= 0.9.0 && < 0.10, +@@ -686,7 +686,7 @@ Executable unit + text == 0.11.*, + old-time == 1.0.*, + directory >= 1.0.0.0 && < 1.2.0.0, +- process == 1.0.*, ++ process >= 1.0 && < 1.2, + containers >= 0.1 && < 0.5, + array >= 0.1 && < 0.4, + hashed-storage >= 0.5.2 && < 0.6, +diff --git a/src/Darcs/RepoPath.hs b/src/Darcs/RepoPath.hs +index aa00156..8c5432b 100644 +--- a/src/Darcs/RepoPath.hs ++++ b/src/Darcs/RepoPath.hs +@@ -60,11 +60,9 @@ import qualified Darcs.Patch.FileName as PatchFileName ( FileName, fp2fn, fn2fp + #include "impossible.h" + + class FilePathOrURL a where +- {-# INLINE toPath #-} + toPath :: a -> String + + class FilePathOrURL a => FilePathLike a where +- {-# INLINE toFilePath #-} + toFilePath :: a -> FilePath + + -- | Paths which are relative to the local darcs repository and normalized. ================================================================ Index: packages/darcs/darcs-relax-regex-libs-deps.patch diff -u /dev/null packages/darcs/darcs-relax-regex-libs-deps.patch:1.1 --- /dev/null Tue Sep 27 23:43:48 2011 +++ packages/darcs/darcs-relax-regex-libs-deps.patch Tue Sep 27 23:43:43 2011 @@ -0,0 +1,69 @@ +diff -rN -u old-darcs-2.5.2/darcs.cabal new-darcs-2.5.2/darcs.cabal +--- old-darcs-2.5.2/darcs.cabal 2011-06-03 20:24:32.079482374 +0200 ++++ new-darcs-2.5.2/darcs.cabal 2011-06-03 20:24:32.080482374 +0200 +@@ -166,11 +166,11 @@ + cpp-options: -DWIN32 + c-sources: src/win32/send_email.c + build-depends: unix-compat >= 0.1.2, +- regex-posix >= 0.94.4 && < 0.95 ++ regex-posix >= 0.94.4 && < 0.96 + + build-depends: base < 5, + extensible-exceptions >= 0.1 && < 0.2, +- regex-compat >= 0.71 && < 0.94, ++ regex-compat >= 0.71 && < 0.96, + mtl >= 1.0 && < 2.1, + parsec >= 2.0 && < 3.2, + html == 1.0.*, +@@ -368,14 +368,14 @@ + cpp-options: -DWIN32 + c-sources: src/win32/send_email.c + build-depends: unix-compat >= 0.1.2, +- regex-posix >= 0.94.4 && < 0.95 ++ regex-posix >= 0.94.4 && < 0.96 + + if os(solaris) + cc-options: -DHAVE_SIGINFO_H + + build-depends: base < 5, + extensible-exceptions >= 0.1 && < 0.2, +- regex-compat >= 0.71 && < 0.94, ++ regex-compat >= 0.71 && < 0.96, + mtl >= 1.0 && < 2.1, + parsec >= 2.0 && < 3.2, + html == 1.0.*, +@@ -516,14 +516,14 @@ + cpp-options: -DWIN32 + c-sources: src/win32/send_email.c + build-depends: unix-compat >= 0.1.2, +- regex-posix >= 0.94.4 && < 0.95 ++ regex-posix >= 0.94.4 && < 0.96 + + if os(solaris) + cc-options: -DHAVE_SIGINFO_H + + build-depends: base < 5, + extensible-exceptions >= 0.1 && < 0.2, +- regex-compat >= 0.71 && < 0.94, ++ regex-compat >= 0.71 && < 0.96, + mtl >= 1.0 && < 2.1, + parsec >= 2.0 && < 3.2, + html == 1.0.*, +@@ -619,7 +619,7 @@ + + build-depends: base < 5, + extensible-exceptions >= 0.1 && < 0.2, +- regex-compat >= 0.71 && < 0.94, ++ regex-compat >= 0.71 && < 0.96, + mtl >= 1.0 && < 2.1, + parsec >= 2.0 && < 3.2, + html == 1.0.*, +@@ -672,7 +672,7 @@ + cpp-options: -DWIN32 + c-sources: src/win32/send_email.c + build-depends: unix-compat >= 0.1.2, +- regex-posix >= 0.94.4 && < 0.95 ++ regex-posix >= 0.94.4 && < 0.96 + + if os(solaris) + cc-options: -DHAVE_SIGINFO_H ================================================================ Index: packages/darcs/darcs-tests-ghc72.patch diff -u /dev/null packages/darcs/darcs-tests-ghc72.patch:1.1 --- /dev/null Tue Sep 27 23:43:48 2011 +++ packages/darcs/darcs-tests-ghc72.patch Tue Sep 27 23:43:43 2011 @@ -0,0 +1,26 @@ +diff --git a/tests/hspwd.hs b/tests/hspwd.hs +index b93a7d5..f6fe2dd 100644 +--- a/tests/hspwd.hs ++++ b/tests/hspwd.hs +@@ -1,5 +1,5 @@ + module Main where + +-import Directory ( getCurrentDirectory ) ++import System.Directory ( getCurrentDirectory ) + + main = getCurrentDirectory >>= putStr +diff --git a/tests/trackdown-bisect-helper.hs b/tests/trackdown-bisect-helper.hs +index 5c325c4..7fcb4a4 100644 +--- a/tests/trackdown-bisect-helper.hs ++++ b/tests/trackdown-bisect-helper.hs +@@ -15,8 +15,9 @@ patches with the linear implementation. + + + import Control.Monad ++import System.Environment + import System.IO +-import System ++import System.Process + import System.Random + import Data.List + import Control.Exception ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/darcs/darcs.spec?r1=1.36&r2=1.37&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
