[Pkg-haskell-commits] darcs: tools: Update tagsoup, patch gitit.
Clint Adams
clint at debian.org
Tue Dec 31 17:03:03 UTC 2013
Tue Dec 31 17:01:35 UTC 2013 Clint Adams <clint at debian.org>
* Update tagsoup, patch gitit.
M ./all-packages/packages.txt -2 +2
A ./all-packages/patches/gitit/
A ./all-packages/patches/gitit/0.10.3.1/
A ./all-packages/patches/gitit/0.10.3.1/comment-type-signature
A ./all-packages/patches/gitit/0.10.3.1/newer-pandoc
A ./all-packages/patches/gitit/0.10.3.1/series
Tue Dec 31 17:01:35 UTC 2013 Clint Adams <clint at debian.org>
* Update tagsoup, patch gitit.
diff -rN -u old-tools/all-packages/packages.txt new-tools/all-packages/packages.txt
--- old-tools/all-packages/packages.txt 2013-12-31 17:03:03.224832764 +0000
+++ new-tools/all-packages/packages.txt 2013-12-31 17:03:03.228832764 +0000
@@ -209,7 +209,7 @@
ghc-syb-utils 0.2.1.1
gio 0.12.4
github 0.7.2
-gitit 0.10.3.1 needs patch for newer pandoc
+gitit 0.10.3.1
gitlib 2.2.0.0
glade 0.12.1
GLFW 0.5.1.0
@@ -565,7 +565,7 @@
tabular 0.2.2.5
taffybar 0.2.1 patched for dbus et al
tagged 0.7
-tagsoup 0.12.8
+tagsoup 0.13
tagstream-conduit 0.5.4
tar 0.4.0.1
tasty 0.7
diff -rN -u old-tools/all-packages/patches/gitit/0.10.3.1/comment-type-signature new-tools/all-packages/patches/gitit/0.10.3.1/comment-type-signature
--- old-tools/all-packages/patches/gitit/0.10.3.1/comment-type-signature 1970-01-01 00:00:00.000000000 +0000
+++ new-tools/all-packages/patches/gitit/0.10.3.1/comment-type-signature 2013-12-31 17:03:03.256832769 +0000
@@ -0,0 +1,26 @@
+Description: Comment out type signature in readFile function
+ When this type signature is present, a bug elsewhere (possibly in Haddock)
+ causes the document generation (and thus the build) to fail with a message
+ about this function's use of the FlexibleContexts extension to Haskell. If we
+ comment it out then the bug is not triggered and everything still works
+ because GHC can infer the type of the function.
+Author: Iain Lane <laney at debian.org>
+Forwarded: no
+
+--- a/Network/Gitit/Config.hs
++++ b/Network/Gitit/Config.hs
+@@ -51,10 +51,10 @@
+ readfile cp fname >>= extractConfig . forceEither
+
+ -- | A version of readfile that treats the file as UTF-8.
+-readfile :: MonadError CPError m
+- => ConfigParser
+- -> FilePath
+- -> IO (m ConfigParser)
++-- readfile :: MonadError CPError m
++-- => ConfigParser
++-- -> FilePath
++-- -> IO (m ConfigParser)
+ readfile cp path' = do
+ contents <- readFileUTF8 path'
+ return $ readstring cp contents
diff -rN -u old-tools/all-packages/patches/gitit/0.10.3.1/newer-pandoc new-tools/all-packages/patches/gitit/0.10.3.1/newer-pandoc
--- old-tools/all-packages/patches/gitit/0.10.3.1/newer-pandoc 1970-01-01 00:00:00.000000000 +0000
+++ new-tools/all-packages/patches/gitit/0.10.3.1/newer-pandoc 2013-12-31 17:03:03.256832769 +0000
@@ -0,0 +1,125 @@
+From 48155008397bdaed4f97c5678d83c70d4bc3f0ff Mon Sep 17 00:00:00 2001
+From: John MacFarlane <fiddlosopher at gmail.com>
+Date: Sat, 14 Sep 2013 19:24:01 -0700
+Subject: [PATCH 2/3] Changes to allow compilation with pandoc 1.12.
+
+TODO: Better handling of images and other resources in
+Docx, ODT, PDF exports.
+---
+ Network/Gitit/ContentTransformer.hs | 8 +++++---
+ Network/Gitit/Export.hs | 4 ++--
+ Network/Gitit/Types.hs | 2 +-
+ data/default.conf | 4 ++--
+ gitit.cabal | 10 +++++-----
+ 5 files changed, 15 insertions(+), 13 deletions(-)
+
+--- a/Network/Gitit/ContentTransformer.hs
++++ b/Network/Gitit/ContentTransformer.hs
+@@ -85,6 +85,7 @@
+ import Network.URL (encString)
+ import Prelude hiding (catch)
+ import System.FilePath
++import qualified Text.Pandoc.Builder as B
+ import Text.HTML.SanitizeXSS (sanitizeBalance)
+ import Text.Highlighting.Kate
+ import Text.Pandoc hiding (MathML, WebTeX, MathJax)
+@@ -452,8 +453,8 @@
+ addPageTitleToPandoc title' (Pandoc _ blocks) = do
+ updateLayout $ \layout -> layout{ pgTitle = title' }
+ return $ if null title'
+- then Pandoc (Meta [] [] []) blocks
+- else Pandoc (Meta [Str title'] [] []) blocks
++ then Pandoc nullMeta blocks
++ else Pandoc (B.setMeta "title" (B.str title') nullMeta) blocks
+
+ -- | Adds javascript links for math support.
+ addMathSupport :: a -> ContentTransformer a
+@@ -553,9 +554,10 @@
+ LineBreak -> " "
+ Math DisplayMath s -> "$$" ++ s ++ "$$"
+ Math InlineMath s -> "$" ++ s ++ "$"
+- RawInline "tex" s -> s
++ RawInline (Format "tex") s -> s
+ RawInline _ _ -> ""
+ Link xs _ -> concatMap go xs
+ Image xs _ -> concatMap go xs
+ Note _ -> ""
++ Span _ xs -> concatMap go xs
+
+--- a/Network/Gitit/Export.hs
++++ b/Network/Gitit/Export.hs
+@@ -78,7 +78,7 @@
+ then fixURLs page doc
+ else return doc
+ respond mimetype ext (fn opts{writerTemplate = template
+- ,writerSourceDirectory = repositoryPath cfg
++ ,writerSourceURL = Just $ baseUrl cfg
+ ,writerUserDataDir = pandocUserData cfg})
+ page doc'
+
+@@ -134,7 +134,7 @@
+ writerVariables =
+ ("body",body''):("dzslides-core",dzcore):variables'
+ ,writerTemplate = template
+- ,writerSourceDirectory = repositoryPath cfg
++ ,writerSourceURL = Just $ baseUrl cfg
+ ,writerUserDataDir = pandocUserData cfg
+ } (Pandoc meta [])
+ h' <- liftIO $ makeSelfContained (pandocUserData cfg) h
+--- a/Network/Gitit/Types.hs
++++ b/Network/Gitit/Types.hs
+@@ -400,7 +400,7 @@
+ fromEntities :: String -> String
+ fromEntities ('&':xs) =
+ case lookupEntity ent of
+- Just c -> c : fromEntities rest
++ Just c -> c ++ fromEntities rest
+ Nothing -> '&' : fromEntities xs
+ where (ent, rest) = case break (\c -> isSpace c || c == ';') xs of
+ (zs,';':ys) -> (zs,ys)
+--- a/data/default.conf
++++ b/data/default.conf
+@@ -238,8 +238,8 @@
+
+ base-url:
+ # the base URL of the wiki, to be used in constructing feed IDs
+-# and RPX token_urls. Set this if use-feed is 'yes' or
+-# authentication-method is 'rpx'.
++# and RPX token_urls, and in exporting docx and pdf.
++# Set this if use-feed is 'yes' or authentication-method is 'rpx'.
+
+ absolute-urls: no
+ # make wikilinks absolute with respect to the base-url.
+--- a/gitit.cabal
++++ b/gitit.cabal
+@@ -117,8 +117,8 @@
+ exposed-modules: Network.Gitit.Interface
+ build-depends: ghc, ghc-paths
+ cpp-options: -D_PLUGINS
+- build-depends: base >= 3, pandoc >= 1.10.0.5 && < 1.12,
+- pandoc-types >= 1.10 && < 1.11, filepath, safe
++ build-depends: base >= 3, pandoc >= 1.12 && < 1.13,
++ pandoc-types >= 1.12 && < 1.13, filepath, safe
+ extensions: CPP
+ if impl(ghc >= 6.12)
+ ghc-options: -Wall -fno-warn-unused-do-bind
+@@ -134,8 +134,8 @@
+ pretty,
+ xhtml,
+ containers,
+- pandoc >= 1.10.0.5 && < 1.12,
+- pandoc-types >= 1.10 && < 1.11,
++ pandoc >= 1.12 && < 1.13,
++ pandoc-types >= 1.12 && < 1.13,
+ process,
+ filepath,
+ directory,
+@@ -164,7 +164,7 @@
+ ConfigFile >= 1 && < 1.2,
+ feed >= 0.3.6 && < 0.4,
+ xss-sanitize >= 0.3 && < 0.4,
+- tagsoup >= 0.12 && < 0.13,
++ tagsoup >= 0.13 && < 0.14,
+ blaze-html >= 0.4 && < 0.7,
+ json >= 0.4 && < 0.8
+ if impl(ghc >= 6.10)
diff -rN -u old-tools/all-packages/patches/gitit/0.10.3.1/series new-tools/all-packages/patches/gitit/0.10.3.1/series
--- old-tools/all-packages/patches/gitit/0.10.3.1/series 1970-01-01 00:00:00.000000000 +0000
+++ new-tools/all-packages/patches/gitit/0.10.3.1/series 2013-12-31 17:03:03.256832769 +0000
@@ -0,0 +1,2 @@
+comment-type-signature
+newer-pandoc
More information about the Pkg-haskell-commits
mailing list