[DHG_packages] 01/01: ghc: New upstream release candidate (8.0.1-rc3)
Joachim Breitner
nomeata at moszumanska.debian.org
Tue Apr 19 09:46:38 UTC 2016
This is an automated email from the git hooks/post-receive script.
nomeata pushed a commit to annotated tag ghc_v8.0.0.20160411-1
in repository DHG_packages.
commit f3b08e41856e7450b436c3909830e13e06f233e7
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Tue Apr 19 09:13:11 2016 +0200
ghc: New upstream release candidate (8.0.1-rc3)
---
p/ghc/debian/changelog | 6 +
p/ghc/debian/patches/buildpath-abi-stability.patch | 8 +-
p/ghc/debian/patches/haddock-mathjax-fix | 123 ---------------------
p/ghc/debian/patches/reproducible-tmp-names | 8 +-
p/ghc/debian/patches/series | 1 -
p/ghc/debian/patches/use-debian-gen_contents_index | 12 +-
6 files changed, 20 insertions(+), 138 deletions(-)
diff --git a/p/ghc/debian/changelog b/p/ghc/debian/changelog
index e71d29c..2b912b7 100644
--- a/p/ghc/debian/changelog
+++ b/p/ghc/debian/changelog
@@ -1,3 +1,9 @@
+ghc (8.0.0.20160411-1) experimental; urgency=medium
+
+ * New upstream release candidate (8.0.1-rc3)
+
+ -- Joachim Breitner <nomeata at debian.org> Tue, 19 Apr 2016 09:11:57 +0200
+
ghc (8.0.0.20160204-2) experimental; urgency=medium
* Build-Conflict: Do not bootstrap with ghc-8.0.1-rc1, as this is broken.
diff --git a/p/ghc/debian/patches/buildpath-abi-stability.patch b/p/ghc/debian/patches/buildpath-abi-stability.patch
index 9c2d0a6..8add0fc 100644
--- a/p/ghc/debian/patches/buildpath-abi-stability.patch
+++ b/p/ghc/debian/patches/buildpath-abi-stability.patch
@@ -2,9 +2,9 @@ Forwarded to https://ghc.haskell.org/trac/ghc/ticket/10424
Index: ghc/compiler/iface/MkIface.hs
===================================================================
---- ghc.orig/compiler/iface/MkIface.hs 2016-01-14 16:21:42.065241716 +0100
-+++ ghc/compiler/iface/MkIface.hs 2016-01-14 16:21:42.061241634 +0100
-@@ -557,7 +557,7 @@
+--- ghc.orig/compiler/iface/MkIface.hs 2016-04-19 09:26:40.075170754 +0200
++++ ghc/compiler/iface/MkIface.hs 2016-04-19 09:26:40.071170684 +0200
+@@ -556,7 +556,7 @@
iface_hash <- computeFingerprint putNameLiterally
(mod_hash,
ann_fn (mkVarOcc "module"), -- See mkIfaceAnnCache
@@ -13,7 +13,7 @@ Index: ghc/compiler/iface/MkIface.hs
sorted_deps,
mi_hpc iface0)
-@@ -590,6 +590,9 @@
+@@ -589,6 +589,9 @@
(non_orph_fis, orph_fis) = mkOrphMap ifFamInstOrph (mi_fam_insts iface0)
fix_fn = mi_fix_fn iface0
ann_fn = mkIfaceAnnCache (mi_anns iface0)
diff --git a/p/ghc/debian/patches/haddock-mathjax-fix b/p/ghc/debian/patches/haddock-mathjax-fix
deleted file mode 100644
index 6a955a5..0000000
--- a/p/ghc/debian/patches/haddock-mathjax-fix
+++ /dev/null
@@ -1,123 +0,0 @@
-Index: ghc/utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs
-===================================================================
---- ghc.orig/utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs 2015-12-28 15:44:05.000000000 +0100
-+++ ghc/utils/haddock/haddock-api/src/Haddock/Backends/Xhtml.hs 2016-01-16 08:47:16.347819737 +0100
-@@ -90,11 +90,11 @@
-
- when (isNothing maybe_index_url) $
- ppHtmlIndex odir doctitle maybe_package
-- themes maybe_contents_url maybe_source_url maybe_wiki_url
-+ themes maybe_mathjax_url maybe_contents_url maybe_source_url maybe_wiki_url
- (map toInstalledIface visible_ifaces) debug
-
- mapM_ (ppHtmlModule odir doctitle themes
-- maybe_source_url maybe_wiki_url
-+ maybe_mathjax_url maybe_source_url maybe_wiki_url
- maybe_contents_url maybe_index_url unicode qual debug) visible_ifaces
-
-
-@@ -269,7 +269,7 @@
- writeFile (joinPath [odir, contentsHtmlFile]) (renderToString debug html)
-
- -- XXX: think of a better place for this?
-- ppHtmlContentsFrame odir doctitle themes ifaces debug
-+ ppHtmlContentsFrame odir doctitle themes mathjax_url ifaces debug
-
-
- ppPrologue :: Qualification -> String -> Maybe (MDoc GHC.RdrName) -> Html
-@@ -342,12 +342,12 @@
- << toHtml txt
-
-
--ppHtmlContentsFrame :: FilePath -> String -> Themes
-+ppHtmlContentsFrame :: FilePath -> String -> Themes -> Maybe String
- -> [InstalledInterface] -> Bool -> IO ()
--ppHtmlContentsFrame odir doctitle themes ifaces debug = do
-+ppHtmlContentsFrame odir doctitle themes maybe_mathjax_url ifaces debug = do
- let mods = flatModuleTree ifaces
- html =
-- headHtml doctitle Nothing themes Nothing +++
-+ headHtml doctitle Nothing themes maybe_mathjax_url +++
- miniBody << divModuleList <<
- (sectionName << "Modules" +++
- ulist << [ li ! [theclass "module"] << m | m <- mods ])
-@@ -365,13 +365,14 @@
- -> Maybe String
- -> Themes
- -> Maybe String
-+ -> Maybe String
- -> SourceURLs
- -> WikiURLs
- -> [InstalledInterface]
- -> Bool
- -> IO ()
- ppHtmlIndex odir doctitle _maybe_package themes
-- maybe_contents_url maybe_source_url maybe_wiki_url ifaces debug = do
-+ maybe_mathjax_url maybe_contents_url maybe_source_url maybe_wiki_url ifaces debug = do
- let html = indexPage split_indices Nothing
- (if split_indices then [] else index)
-
-@@ -387,7 +388,7 @@
-
- where
- indexPage showLetters ch items =
-- headHtml (doctitle ++ " (" ++ indexName ch ++ ")") Nothing themes Nothing +++
-+ headHtml (doctitle ++ " (" ++ indexName ch ++ ")") Nothing themes maybe_mathjax_url +++
- bodyHtml doctitle Nothing
- maybe_source_url maybe_wiki_url
- maybe_contents_url Nothing << [
-@@ -487,11 +488,11 @@
-
- ppHtmlModule
- :: FilePath -> String -> Themes
-- -> SourceURLs -> WikiURLs
-+ -> Maybe String -> SourceURLs -> WikiURLs
- -> Maybe String -> Maybe String -> Bool -> QualOption
- -> Bool -> Interface -> IO ()
- ppHtmlModule odir doctitle themes
-- maybe_source_url maybe_wiki_url
-+ maybe_mathjax_url maybe_source_url maybe_wiki_url
- maybe_contents_url maybe_index_url unicode qual debug iface = do
- let
- mdl = ifaceMod iface
-@@ -499,7 +500,7 @@
- mdl_str = moduleString mdl
- real_qual = makeModuleQual qual aliases mdl
- html =
-- headHtml mdl_str (Just $ "mini_" ++ moduleHtmlFile mdl) themes Nothing +++
-+ headHtml mdl_str (Just $ "mini_" ++ moduleHtmlFile mdl) themes maybe_mathjax_url +++
- bodyHtml doctitle (Just iface)
- maybe_source_url maybe_wiki_url
- maybe_contents_url maybe_index_url << [
-@@ -509,14 +510,14 @@
-
- createDirectoryIfMissing True odir
- writeFile (joinPath [odir, moduleHtmlFile mdl]) (renderToString debug html)
-- ppHtmlModuleMiniSynopsis odir doctitle themes iface unicode real_qual debug
-+ ppHtmlModuleMiniSynopsis odir doctitle themes maybe_mathjax_url iface unicode real_qual debug
-
- ppHtmlModuleMiniSynopsis :: FilePath -> String -> Themes
-- -> Interface -> Bool -> Qualification -> Bool -> IO ()
--ppHtmlModuleMiniSynopsis odir _doctitle themes iface unicode qual debug = do
-+ -> Maybe String -> Interface -> Bool -> Qualification -> Bool -> IO ()
-+ppHtmlModuleMiniSynopsis odir _doctitle themes maybe_mathjax_url iface unicode qual debug = do
- let mdl = ifaceMod iface
- html =
-- headHtml (moduleString mdl) Nothing themes Nothing +++
-+ headHtml (moduleString mdl) Nothing themes maybe_mathjax_url +++
- miniBody <<
- (divModuleHeader << sectionName << moduleString mdl +++
- miniSynopsis mdl iface unicode qual)
-Index: ghc/utils/haddock/haddock-api/src/Haddock.hs
-===================================================================
---- ghc.orig/utils/haddock/haddock-api/src/Haddock.hs 2015-12-28 15:44:05.000000000 +0100
-+++ ghc/utils/haddock/haddock-api/src/Haddock.hs 2016-01-17 17:23:38.147511235 +0100
-@@ -292,7 +292,7 @@
-
- when (Flag_GenIndex `elem` flags) $ do
- ppHtmlIndex odir title pkgStr
-- themes opt_contents_url sourceUrls' opt_wiki_urls
-+ themes opt_mathjax opt_contents_url sourceUrls' opt_wiki_urls
- allVisibleIfaces pretty
- copyHtmlBits odir libDir themes
-
diff --git a/p/ghc/debian/patches/reproducible-tmp-names b/p/ghc/debian/patches/reproducible-tmp-names
index 08b852c..0e0ed6e 100644
--- a/p/ghc/debian/patches/reproducible-tmp-names
+++ b/p/ghc/debian/patches/reproducible-tmp-names
@@ -6,8 +6,8 @@ and assume that is going to be unique.
Index: ghc/compiler/main/SysTools.hs
===================================================================
---- ghc.orig/compiler/main/SysTools.hs 2016-02-08 11:31:17.369434835 +0100
-+++ ghc/compiler/main/SysTools.hs 2016-02-08 11:31:17.365434743 +0100
+--- ghc.orig/compiler/main/SysTools.hs 2016-04-19 09:26:40.087170969 +0200
++++ ghc/compiler/main/SysTools.hs 2016-04-19 09:26:40.087170969 +0200
@@ -65,6 +65,7 @@
import Util
import DynFlags
@@ -16,7 +16,7 @@ Index: ghc/compiler/main/SysTools.hs
import LlvmCodeGen.Base (llvmVersionStr, supportedLlvmVersion)
-@@ -1135,8 +1136,8 @@
+@@ -1150,8 +1151,8 @@
mapping <- readIORef dir_ref
case Map.lookup tmp_dir mapping of
Nothing -> do
@@ -27,7 +27,7 @@ Index: ghc/compiler/main/SysTools.hs
mask_ $ mkTempDir prefix
Just dir -> return dir
where
-@@ -1510,6 +1511,13 @@
+@@ -1525,6 +1526,13 @@
getProcessID = System.Posix.Internals.c_getpid >>= return . fromIntegral
#endif
diff --git a/p/ghc/debian/patches/series b/p/ghc/debian/patches/series
index 304fbe4..6dad111 100644
--- a/p/ghc/debian/patches/series
+++ b/p/ghc/debian/patches/series
@@ -4,4 +4,3 @@ no-missing-haddock-file-warning
hurd.diff
buildpath-abi-stability.patch
reproducible-tmp-names
-haddock-mathjax-fix
diff --git a/p/ghc/debian/patches/use-debian-gen_contents_index b/p/ghc/debian/patches/use-debian-gen_contents_index
index 50527b2..47d5ea9 100644
--- a/p/ghc/debian/patches/use-debian-gen_contents_index
+++ b/p/ghc/debian/patches/use-debian-gen_contents_index
@@ -1,8 +1,8 @@
Index: ghc/ghc.mk
===================================================================
---- ghc.orig/ghc.mk 2016-02-08 11:31:04.941151303 +0100
-+++ ghc/ghc.mk 2016-02-08 11:31:04.937151211 +0100
-@@ -808,7 +808,6 @@
+--- ghc.orig/ghc.mk 2016-04-19 09:26:33.795058441 +0200
++++ ghc/ghc.mk 2016-04-19 09:26:33.791058371 +0200
+@@ -823,7 +823,6 @@
# Build the Haddock contents and index
ifeq "$(HADDOCK_DOCS)" "YES"
libraries/dist-haddock/index.html: $(haddock_INPLACE) $(ALL_HADDOCK_FILES)
@@ -10,7 +10,7 @@ Index: ghc/ghc.mk
ifeq "$(phase)" "final"
$(eval $(call all-target,library_doc_index,libraries/dist-haddock/index.html))
endif
-@@ -929,12 +928,8 @@
+@@ -944,12 +943,8 @@
$(INSTALL_DIR) "$(DESTDIR)$(docdir)/html"
$(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html "$(DESTDIR)$(docdir)/html"
ifneq "$(INSTALL_LIBRARY_DOCS)" ""
@@ -23,8 +23,8 @@ Index: ghc/ghc.mk
- $(INSTALL_SCRIPT) $(INSTALL_OPTS) libraries/gen_contents_index "$(DESTDIR)$(docdir)/html/libraries/"
endif
ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
- # We need to filter out the directories so install doesn't choke on them
-@@ -1049,7 +1044,6 @@
+ for i in $(INSTALL_HTML_DOC_DIRS); do \
+@@ -1058,7 +1053,6 @@
mk/project.mk \
mk/install.mk.in \
bindist.mk \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git
More information about the Pkg-haskell-commits
mailing list