[Git][haskell-team/DHG_packages][master] xmonad: untested patch to build with pandoc 2.1

[Clint Adams]

Clint Adams pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
31e83588 by Clint Adams at 2018-04-24T18:28:28-04:00
xmonad: untested patch to build with pandoc 2.1

- - - - -


3 changed files:

- p/xmonad/debian/changelog
- + p/xmonad/debian/patches/newer-pandoc
- p/xmonad/debian/patches/series


Changes:

=====================================
p/xmonad/debian/changelog
=====================================
--- a/p/xmonad/debian/changelog
+++ b/p/xmonad/debian/changelog
@@ -1,3 +1,9 @@
+xmonad (0.13-9) unstable; urgency=medium
+
+  * Untested patch to build with pandoc 2.1.
+
+ -- Clint Adams <clint at debian.org>  Tue, 24 Apr 2018 18:27:42 -0400
+
 xmonad (0.13-8) unstable; urgency=medium
 
   * Bump to Standards-Version 4.1.4.


=====================================
p/xmonad/debian/patches/newer-pandoc
=====================================
--- /dev/null
+++ b/p/xmonad/debian/patches/newer-pandoc
@@ -0,0 +1,57 @@
+--- a/util/GenerateManpage.hs
++++ b/util/GenerateManpage.hs
+@@ -27,6 +27,7 @@
+ import Text.Regex.Posix
+ import Data.Char
+ import Data.List
++import qualified Data.Text as T
+ 
+ import Distribution.PackageDescription.Parse
+ import Distribution.Verbosity
+@@ -35,7 +36,7 @@
+ import Text.PrettyPrint.HughesPJ
+ import Distribution.Text
+ 
+-import Text.Pandoc -- works with 1.15.x
++import Text.Pandoc -- works with 2.1
+ 
+ releaseDate = "31 December 2012"
+ 
+@@ -71,21 +72,23 @@
+     let manHeader = unwords [".TH xmonad 1","\""++releaseDate++"\"",releaseName,"\"xmonad manual\""]
+ 
+     Right parsed <- readMarkdown def
++        . T.pack
+         . unlines
+         . replace "___KEYBINDINGS___" keybindings
+         . lines
+         <$> readFile "./man/xmonad.1.markdown"
+ 
+-    Right template <- getDefaultTemplate Nothing "man"
++    Right template <- runPure getDefaultTemplate "man"
+     writeFile "./man/xmonad.1"
++        . T.unpack
+         . (manHeader ++)
+         . writeMan def{ writerTemplate = Just template }
+         $ parsed
+     putStrLn "Documentation created: man/xmonad.1"
+ 
+-    Right template <- getDefaultTemplate Nothing "html"
++    Right template <- runPure getDefaultTemplate "html"
+     writeFile "./man/xmonad.1.html"
+-        . writeHtmlString def
++        . writeHtml5String def
+             { writerVariables =
+                         [("include-before"
+                             ,"<h1>"++releaseName++"</h1>"++
+--- a/xmonad.cabal
++++ b/xmonad.cabal
+@@ -113,7 +113,7 @@
+     if flag(generatemanpage)
+         build-depends: base,
+                        Cabal,
+-                       pandoc,
++                       pandoc >= 2.1,
+                        pretty,
+                        regex-posix
+     else


=====================================
p/xmonad/debian/patches/series
=====================================
--- a/p/xmonad/debian/patches/series
+++ b/p/xmonad/debian/patches/series
@@ -1,2 +1,3 @@
 use_x-terminal-emulator.patch
 #haddock-fixes.patch
+newer-pandoc



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/31e83588e1161fdc9a4fba54e4c39018eb25b08a

---
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/commit/31e83588e1161fdc9a4fba54e4c39018eb25b08a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20180424/cf6d7b73/attachment-0001.html>