[Pkg-haskell-commits] darcs: ghc: * Fix #609445 by actually removing the patch for #566331, not needed any more

[Joachim Breitner]

Wed Aug 31 06:44:30 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * * Fix #609445 by actually removing the patch for #566331, not needed any more
  Ignore-this: d7df1bf462eb7a3adf4e1645aedd9a38

    M ./changelog +11
    R ./patches/getallinfo-nothing-ghci-566331
    M ./patches/series -1
    M ./rules -6 +1

Wed Aug 31 06:44:30 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * * Fix #609445 by actually removing the patch for #566331, not needed any more
  Ignore-this: d7df1bf462eb7a3adf4e1645aedd9a38
diff -rN -u old-ghc//changelog new-ghc//changelog
--- old-ghc//changelog	2011-08-31 07:42:26.469556092 +0000
+++ new-ghc//changelog	2011-08-31 07:42:26.525557625 +0000
@@ -1,3 +1,14 @@
+ghc (7.0.4-6) UNRELEASED; urgency=low
+
+  * Fix #609445 by actually removing the patch for #566331, not needed any
+    more since this upstream commit:
+
+      Sat Jul 31 12:55:06 BST 2010  Ian Lynagh <igloo at earth.li>
+      * Expose the functions haddock needs even when haddock is disabled; #3558
+
+
+ -- Joachim Breitner <nomeata at debian.org>  Wed, 31 Aug 2011 08:43:13 +0200
+
 ghc (7.0.4-5) unstable; urgency=low
 
   * Remove ghc-doc dependency on ghc, it did not have the desired effect.
diff -rN -u old-ghc//patches/getallinfo-nothing-ghci-566331 new-ghc//patches/getallinfo-nothing-ghci-566331
--- old-ghc//patches/getallinfo-nothing-ghci-566331	2011-08-31 07:42:26.465555925 +0000
+++ new-ghc//patches/getallinfo-nothing-ghci-566331	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-Index: ghc-7.0.2/utils/haddock/src/Haddock/Interface/AttachInstances.hs
-===================================================================
---- ghc-7.0.2.orig/utils/haddock/src/Haddock/Interface/AttachInstances.hs	2011-02-28 23:40:13.000000000 +0530
-+++ ghc-7.0.2/utils/haddock/src/Haddock/Interface/AttachInstances.hs	2011-03-05 19:05:51.000000000 +0530
-@@ -31,7 +31,9 @@
- import HscTypes (withSession)
- #endif
- import MonadUtils (liftIO)
-+#ifdef GHCI
- import TcRnDriver (tcRnGetInfo)
-+#endif
- import TypeRep hiding (funTyConName)
- import Var hiding (varName)
- import TyCon
-@@ -56,7 +58,11 @@
- attachToExportItem iface ifaceMap instIfaceMap export =
-   case export of
-     ExportDecl { expItemDecl = L _ (TyClD d) } -> do
-+#ifdef GHCI
-       mb_info <- getAllInfo (unLoc (tcdLName d))
-+#else
-+      let mb_info = Nothing
-+#endif
-       let export' =
-             export {
-               expItemInstances =
-@@ -95,12 +101,14 @@
-     modName = nameModule name
- 
- 
-+#ifdef GHCI
- -- | Like GHC's getInfo but doesn't cut things out depending on the
- -- interative context, which we don't set sufficiently anyway.
- getAllInfo :: GhcMonad m => Name -> m (Maybe (TyThing,Fixity,[Instance]))
- getAllInfo name = withSession $ \hsc_env -> do 
-    (_msgs, r) <- liftIO $ tcRnGetInfo hsc_env name
-    return r
-+#endif
- 
- 
- --------------------------------------------------------------------------------
-Index: ghc-7.0.2/utils/haddock/src/Haddock/Interface/Create.hs
-===================================================================
---- ghc-7.0.2.orig/utils/haddock/src/Haddock/Interface/Create.hs	2011-02-28 23:40:13.000000000 +0530
-+++ ghc-7.0.2/utils/haddock/src/Haddock/Interface/Create.hs	2011-03-05 19:04:57.000000000 +0530
-@@ -514,7 +514,11 @@
-         Nothing -> do
-           -- If we can't find the declaration, it must belong to
-           -- another package
-+#ifdef GHCI
-           mbTyThing <- liftGhcToErrMsgGhc $ lookupName t
-+#else
-+          mbTyThing <- liftGhcToErrMsgGhc $ lookupGlobalName t
-+#endif
-           -- show the name as exported as well as the name's
-           -- defining module (because the latter is where we
-           -- looked for the .hi/.haddock).  It's to help people
diff -rN -u old-ghc//patches/series new-ghc//patches/series
--- old-ghc//patches/series	2011-08-31 07:42:26.465555925 +0000
+++ new-ghc//patches/series	2011-08-31 07:42:26.513559860 +0000
@@ -1,6 +1,5 @@
 system-libffi
 kfreebsd-_gnu_source-565818
-getallinfo-nothing-ghci-566331
 haddock-hardcode-ghc-paths
 use-debian-gen_contents_index
 haddock-no-library
diff -rN -u old-ghc//rules new-ghc//rules
--- old-ghc//rules	2011-08-31 07:42:26.465555925 +0000
+++ new-ghc//rules	2011-08-31 07:42:26.517557691 +0000
@@ -125,12 +125,7 @@
 		../../../inplace/bin/ghc-stage2 --make Setup.lhs; \
 		./Setup configure --prefix=/usr --with-compiler=../../../inplace/bin/ghc-stage2 \
 			--package-db=../../../inplace/lib/package.conf.d/ \
-			--htmldir=/usr/share/doc/ghc-haddock/html/ \
-			$$(if ../../../inplace/bin/ghc-stage2 --info | \
-			      grep -q '"Have interpreter","YES"';\
-			   then echo "--ghc-option=-DGHCI";\
-			   fi) \
-		; \
+			--htmldir=/usr/share/doc/ghc-haddock/html/ ; \
 		./Setup build
 
 	touch $@