| 1 |
kolmodin 07/12/30 19:33:02 |
| 2 |
|
| 3 |
Modified: darcs-1.1.0pre1-ghc68.patch |
| 4 |
Log: |
| 5 |
Fix old patch to dev-util/darcs. All ghc versions should now be ok. |
| 6 |
(Portage version: 2.1.3.19) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 dev-util/darcs/files/darcs-1.1.0pre1-ghc68.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/darcs/files/darcs-1.1.0pre1-ghc68.patch?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/darcs/files/darcs-1.1.0pre1-ghc68.patch?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/darcs/files/darcs-1.1.0pre1-ghc68.patch?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: darcs-1.1.0pre1-ghc68.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/darcs/files/darcs-1.1.0pre1-ghc68.patch,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- darcs-1.1.0pre1-ghc68.patch 20 Dec 2007 13:48:35 -0000 1.1 |
| 22 |
+++ darcs-1.1.0pre1-ghc68.patch 30 Dec 2007 19:33:02 -0000 1.2 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
-diff -ur darcs-1.1.0pre1.orig/aclocal.m4 darcs-1.1.0pre1/aclocal.m4 |
| 25 |
---- darcs-1.1.0pre1.orig/aclocal.m4 2007-12-13 23:20:50.000000000 +1000 |
| 26 |
-+++ darcs-1.1.0pre1/aclocal.m4 2007-12-13 23:21:18.000000000 +1000 |
| 27 |
+diff -rN -u old-darcs-1.1.0pre1/aclocal.m4 new-darcs-1.1.0pre1/aclocal.m4 |
| 28 |
+--- old-darcs-1.1.0pre1/aclocal.m4 2007-12-30 18:13:00.000000000 +0100 |
| 29 |
++++ new-darcs-1.1.0pre1/aclocal.m4 2007-12-30 18:13:01.000000000 +0100 |
| 30 |
@@ -447,6 +447,20 @@ |
| 31 |
openFd :: Int -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle |
| 32 |
openFd fd x y z a b = GHC.Handle.openFd fd x b y z a |
| 33 |
@@ -13,7 +13,7 @@ |
| 34 |
+import qualified GHC.IOBase ( FD ) |
| 35 |
+]) |
| 36 |
+CODE_WORKAROUND([[ |
| 37 |
-+ {- |
| 38 |
++ {- |
| 39 |
+ Work around change in the GHC.Handle.fdToHandle' API. |
| 40 |
+ -} |
| 41 |
+openFd :: GHC.IOBase.FD -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle |
| 42 |
@@ -22,17 +22,18 @@ |
| 43 |
AC_MSG_RESULT([failed]) |
| 44 |
AC_MSG_ERROR([Couldnt figure out how to call GHC.Handle.openFd!]) |
| 45 |
) |
| 46 |
-Only in darcs-1.1.0pre1/: aclocal.m4~ |
| 47 |
-diff -ur darcs-1.1.0pre1.orig/autoconf.mk.in darcs-1.1.0pre1/autoconf.mk.in |
| 48 |
---- darcs-1.1.0pre1.orig/autoconf.mk.in 2007-12-13 23:20:50.000000000 +1000 |
| 49 |
-+++ darcs-1.1.0pre1/autoconf.mk.in 2007-12-13 23:21:07.000000000 +1000 |
| 50 |
-@@ -22,7 +22,7 @@ |
| 51 |
- OPTCCFLAGS := $(addprefix -optc,$(CFLAGS) $(CPPFLAGS)) |
| 52 |
- LDFLAGS := @LDFLAGS@ @LIBS@ |
| 53 |
- OPTLLDFLAGS := $(addprefix -optl,$(LDFLAGS)) |
| 54 |
--GHCFLAGS := -cpp @GHCFLAGS@ |
| 55 |
-+GHCFLAGS := -package containers -cpp @GHCFLAGS@ |
| 56 |
- HAVE_CURSES := @HAVE_CURSES@ |
| 57 |
- HAVE_LIBCURL := @HAVE_LIBCURL@ |
| 58 |
- HAVE_MAPI := @HAVE_MAPI@ |
| 59 |
-Only in darcs-1.1.0pre1/: autoconf.mk.in~ |
| 60 |
+diff -rN -u old-darcs-1.1.0pre1/configure.ac new-darcs-1.1.0pre1/configure.ac |
| 61 |
+--- old-darcs-1.1.0pre1/configure.ac 2007-12-30 18:13:00.000000000 +0100 |
| 62 |
++++ new-darcs-1.1.0pre1/configure.ac 2007-12-30 18:13:01.000000000 +0100 |
| 63 |
+@@ -135,6 +135,10 @@ |
| 64 |
+ GHC_CHECK_MODULE(Text.Html, html, text "foo",, |
| 65 |
+ AC_MSG_ERROR(Cannot find Text.Html; try installing package html?)) |
| 66 |
+ |
| 67 |
++dnl See if we need a package for containers... |
| 68 |
++ |
| 69 |
++GHC_CHECK_MODULE(Data.Map, containers, empty) |
| 70 |
++ |
| 71 |
+ dnl Deal with systems on which getCurrentDirectory uses '\\' rather than '/': |
| 72 |
+ |
| 73 |
+ WORKAROUND_getCurrentDirectory |
| 74 |
+ |
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
-- |
| 79 |
gentoo-commits@g.o mailing list |
Archives