[Pkg-haskell-commits] darcs: gitit: Patch for newer pandoc.
Clint Adams
clint at debian.org
Tue Dec 31 17:00:20 UTC 2013
Tue Dec 31 17:00:13 UTC 2013 Clint Adams <clint at debian.org>
* Patch for newer pandoc.
M ./changelog -1 +5
M ./control -6 +6
M ./patches/comment-type-signature -3 +3
A ./patches/newer-pandoc
M ./patches/series +1
Tue Dec 31 17:00:13 UTC 2013 Clint Adams <clint at debian.org>
* Patch for newer pandoc.
diff -rN -u old-gitit/changelog new-gitit/changelog
--- old-gitit/changelog 2013-12-31 17:00:20.288810641 +0000
+++ new-gitit/changelog 2013-12-31 17:00:20.292810641 +0000
@@ -1,7 +1,11 @@
-gitit (0.10.3.1-6) UNRELEASED; urgency=low
+gitit (0.10.3.1-6) unstable; urgency=medium
+ [ Joachim Breitner ]
* Adjust watch file to new hackage layout
+ [ Clint Adams ]
+ * Patch for newer pandoc.
+
-- Joachim Breitner <nomeata at debian.org> Sat, 05 Oct 2013 18:19:28 +0200
gitit (0.10.3.1-5) unstable; urgency=low
diff -rN -u old-gitit/control new-gitit/control
--- old-gitit/control 2013-12-31 17:00:20.284810640 +0000
+++ new-gitit/control 2013-12-31 17:00:20.292810641 +0000
@@ -16,10 +16,10 @@
, libghc-parsec3-dev
, libghc-pretty-dev
, libghc-xhtml-dev
- , libghc-pandoc-dev (>= 1.10.0.5)
- , libghc-pandoc-dev (<< 1.12)
- , libghc-pandoc-types-dev (>= 1.10)
- , libghc-pandoc-types-dev (<< 1.11)
+ , libghc-pandoc-dev (>= 1.12)
+ , libghc-pandoc-dev (<< 1.13)
+ , libghc-pandoc-types-dev (>= 1.12)
+ , libghc-pandoc-types-dev (<< 1.13)
, libghc-mtl-dev
, libghc-cgi-dev
, libghc-highlighting-kate-dev (>= 0.5.0.1)
@@ -56,8 +56,8 @@
, libghc-feed-dev (<< 0.4)
, libghc-xss-sanitize-dev (>= 0.3)
, libghc-xss-sanitize-dev (<< 0.4)
- , libghc-tagsoup-dev (>= 0.12)
- , libghc-tagsoup-dev (<< 0.13)
+ , libghc-tagsoup-dev (>= 0.13)
+ , libghc-tagsoup-dev (<< 0.14)
, libghc-blaze-html-dev (>= 0.4)
, libghc-blaze-html-dev (<< 0.7)
, libghc-json-dev (>= 0.4)
diff -rN -u old-gitit/patches/comment-type-signature new-gitit/patches/comment-type-signature
--- old-gitit/patches/comment-type-signature 2013-12-31 17:00:20.284810640 +0000
+++ new-gitit/patches/comment-type-signature 2013-12-31 17:00:20.300810642 +0000
@@ -7,9 +7,9 @@
Author: Iain Lane <laney at debian.org>
Forwarded: no
---- gitit-0.9.0.1.orig/Network/Gitit/Config.hs
-+++ gitit-0.9.0.1/Network/Gitit/Config.hs
-@@ -50,10 +50,10 @@ getConfigFromFile fname = do
+--- 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.
diff -rN -u old-gitit/patches/newer-pandoc new-gitit/patches/newer-pandoc
--- old-gitit/patches/newer-pandoc 1970-01-01 00:00:00.000000000 +0000
+++ new-gitit/patches/newer-pandoc 2013-12-31 17:00:20.300810642 +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-gitit/patches/series new-gitit/patches/series
--- old-gitit/patches/series 2013-12-31 17:00:20.280810639 +0000
+++ new-gitit/patches/series 2013-12-31 17:00:20.300810642 +0000
@@ -1 +1,2 @@
comment-type-signature
+newer-pandoc
More information about the Pkg-haskell-commits
mailing list