[gentoo-commits] gentoo-x86 commit in dev-util/darcs/files: darcs-1.1.0pre1-ghc68.patch

[gentoo-commits] gentoo-x86 commit in dev-util/darcs/files: darcs-1.1.0pre1-ghc68.patch

[Lennart Kolmodin (kolmodin)]

kolmodin    07/12/30 19:33:02

  Modified:             darcs-1.1.0pre1-ghc68.patch
  Log:
  Fix old patch to dev-util/darcs. All ghc versions should now be ok.
  (Portage version: 2.1.3.19)

Revision  Changes    Path
1.2                  dev-util/darcs/files/darcs-1.1.0pre1-ghc68.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/darcs/files/darcs-1.1.0pre1-ghc68.patch?rev=1.2&view=markup
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
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

Index: darcs-1.1.0pre1-ghc68.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/darcs/files/darcs-1.1.0pre1-ghc68.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- darcs-1.1.0pre1-ghc68.patch	20 Dec 2007 13:48:35 -0000	1.1
+++ darcs-1.1.0pre1-ghc68.patch	30 Dec 2007 19:33:02 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ur darcs-1.1.0pre1.orig/aclocal.m4 darcs-1.1.0pre1/aclocal.m4
---- darcs-1.1.0pre1.orig/aclocal.m4	2007-12-13 23:20:50.000000000 +1000
-+++ darcs-1.1.0pre1/aclocal.m4	2007-12-13 23:21:18.000000000 +1000
+diff -rN -u old-darcs-1.1.0pre1/aclocal.m4 new-darcs-1.1.0pre1/aclocal.m4
+--- old-darcs-1.1.0pre1/aclocal.m4	2007-12-30 18:13:00.000000000 +0100
++++ new-darcs-1.1.0pre1/aclocal.m4	2007-12-30 18:13:01.000000000 +0100
 @@ -447,6 +447,20 @@
  openFd :: Int -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
  openFd fd x y z a b = GHC.Handle.openFd fd x b y z a
@@ -13,7 +13,7 @@
 +import qualified GHC.IOBase ( FD )
 +])
 +CODE_WORKAROUND([[
-+  {- 
++  {-
 +   Work around change in the GHC.Handle.fdToHandle' API.
 +  -}
 +openFd :: GHC.IOBase.FD -> Maybe FDType -> FilePath -> IOMode -> Bool -> Bool -> IO Handle
@@ -22,17 +22,18 @@
         AC_MSG_RESULT([failed])
         AC_MSG_ERROR([Couldnt figure out how to call GHC.Handle.openFd!])
      )
-Only in darcs-1.1.0pre1/: aclocal.m4~
-diff -ur darcs-1.1.0pre1.orig/autoconf.mk.in darcs-1.1.0pre1/autoconf.mk.in
---- darcs-1.1.0pre1.orig/autoconf.mk.in	2007-12-13 23:20:50.000000000 +1000
-+++ darcs-1.1.0pre1/autoconf.mk.in	2007-12-13 23:21:07.000000000 +1000
-@@ -22,7 +22,7 @@
- OPTCCFLAGS      := $(addprefix -optc,$(CFLAGS) $(CPPFLAGS))
- LDFLAGS		:= @LDFLAGS@ @LIBS@
- OPTLLDFLAGS     := $(addprefix -optl,$(LDFLAGS))
--GHCFLAGS	:= -cpp @GHCFLAGS@
-+GHCFLAGS	:= -package containers -cpp @GHCFLAGS@
- HAVE_CURSES     := @HAVE_CURSES@
- HAVE_LIBCURL    := @HAVE_LIBCURL@
- HAVE_MAPI       := @HAVE_MAPI@
-Only in darcs-1.1.0pre1/: autoconf.mk.in~
+diff -rN -u old-darcs-1.1.0pre1/configure.ac new-darcs-1.1.0pre1/configure.ac
+--- old-darcs-1.1.0pre1/configure.ac	2007-12-30 18:13:00.000000000 +0100
++++ new-darcs-1.1.0pre1/configure.ac	2007-12-30 18:13:01.000000000 +0100
+@@ -135,6 +135,10 @@
+ GHC_CHECK_MODULE(Text.Html, html, text "foo",,
+                  AC_MSG_ERROR(Cannot find Text.Html; try installing package html?))
+ 
++dnl See if we need a package for containers...
++
++GHC_CHECK_MODULE(Data.Map, containers, empty)
++
+ dnl Deal with systems on which getCurrentDirectory uses '\\' rather than '/':
+ 
+ WORKAROUND_getCurrentDirectory
+



-- 
gentoo-commits@gentoo.org mailing list