[Pkg-haskell-commits] darcs: ghc: Refresh patches

[Joachim Breitner]

Mon Dec 10 18:03:25 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh patches
  Ignore-this: 1e7e55c1880f0d4fe928d991767d1b7e

    M ./patches/haddock-hardcode-ghc-paths -46 +8
    M ./patches/haddock-no-library -6 +6

Mon Dec 10 18:03:25 UTC 2012  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh patches
  Ignore-this: 1e7e55c1880f0d4fe928d991767d1b7e
diff -rN -u old-ghc//patches/haddock-hardcode-ghc-paths new-ghc//patches/haddock-hardcode-ghc-paths
--- old-ghc//patches/haddock-hardcode-ghc-paths	2012-12-12 16:53:37.982743556 +0000
+++ new-ghc//patches/haddock-hardcode-ghc-paths	2012-12-12 16:53:38.071752408 +0000
@@ -1,10 +1,10 @@
-Index: ghc-7.6.1/utils/haddock/haddock.cabal
+Index: ghc-7.6.1.20121207/utils/haddock/haddock.cabal
 ===================================================================
---- ghc-7.6.1.orig/utils/haddock/haddock.cabal	2012-09-04 19:10:32.000000000 +0200
-+++ ghc-7.6.1/utils/haddock/haddock.cabal	2012-10-08 13:09:31.951881449 +0200
-@@ -78,10 +78,6 @@
+--- ghc-7.6.1.20121207.orig/utils/haddock/haddock.cabal	2012-12-08 19:10:11.000000000 +0100
++++ ghc-7.6.1.20121207/utils/haddock/haddock.cabal	2012-12-10 19:02:01.388679034 +0100
+@@ -118,10 +118,6 @@
  
- executable haddock
+ library
    default-language:     Haskell2010
 -  -- In a GHC tree - in particular, in a source tarball - we don't
 -  -- require alex or happy
@@ -13,50 +13,12 @@
    build-depends:
      base >= 4.3 && < 4.7,
      filepath,
-@@ -96,8 +92,6 @@
+@@ -135,8 +131,6 @@
  
    if flag(in-ghc-tree)
      cpp-options: -DIN_GHC_TREE
 -  else
 -    build-depends: ghc-paths
  
-   if flag(test)
-     cpp-options: -DTEST
-@@ -157,8 +151,6 @@
- 
-   if flag(in-ghc-tree)
-     cpp-options: -DIN_GHC_TREE
--  else
--    build-depends: ghc-paths
- 
-   if flag(test)
-     cpp-options: -DTEST
-Index: ghc-7.6.1/utils/haddock/src/Main.hs
-===================================================================
---- ghc-7.6.1.orig/utils/haddock/src/Main.hs	2012-09-04 19:10:32.000000000 +0200
-+++ ghc-7.6.1/utils/haddock/src/Main.hs	2012-10-08 13:09:31.951881449 +0200
-@@ -50,7 +50,6 @@
- #ifdef IN_GHC_TREE
- import System.FilePath
- #else
--import qualified GHC.Paths as GhcPaths
- import Paths_haddock
- #endif
- 
-@@ -352,14 +351,14 @@
-       libDir <- getInTreeDir
-       return (ghcPath, libDir)
- #else
--      return (ghcPath, GhcPaths.libdir)
-+      return (ghcPath, "/usr/lib/ghc")
- #endif
-     xs -> return (ghcPath, last xs)
-   where
- #ifdef IN_GHC_TREE
-     ghcPath = "not available"
- #else
--    ghcPath = GhcPaths.ghc
-+    ghcPath = "/usr"
- #endif
- 
- 
+   hs-source-dirs:       src
+   if flag(dev)
diff -rN -u old-ghc//patches/haddock-no-library new-ghc//patches/haddock-no-library
--- old-ghc//patches/haddock-no-library	2012-12-12 16:53:37.958234208 +0000
+++ new-ghc//patches/haddock-no-library	2012-12-12 16:53:38.103750017 +0000
@@ -1,14 +1,14 @@
-Index: ghc-7.6.1/utils/haddock/haddock.cabal
+Index: ghc-7.6.1.20121207/utils/haddock/haddock.cabal
 ===================================================================
---- ghc-7.6.1.orig/utils/haddock/haddock.cabal	2012-10-08 13:09:31.951881449 +0200
-+++ ghc-7.6.1/utils/haddock/haddock.cabal	2012-10-08 13:10:58.139878326 +0200
-@@ -194,8 +194,7 @@
+--- ghc-7.6.1.20121207.orig/utils/haddock/haddock.cabal	2012-12-10 19:02:01.000000000 +0100
++++ ghc-7.6.1.20121207/utils/haddock/haddock.cabal	2012-12-10 19:03:11.056676517 +0100
+@@ -173,8 +173,7 @@
      Haddock.Convert
      Paths_haddock
-   
+ 
 -  if flag(in-ghc-tree)
 -    buildable: False
 +  buildable: False
  
- test-suite html-tests
+ test-suite html-test
    type:             exitcode-stdio-1.0