[Pkg-haskell-commits] [package-plan] 02/03: Remove gitit patches
Joachim Breitner
nomeata at moszumanska.debian.org
Sun Jul 27 20:03:18 UTC 2014
This is an automated email from the git hooks/post-receive script.
nomeata pushed a commit to branch quickcheck-2.7
in repository package-plan.
commit 6760209344a2d03239b63582ac01610c111fc5c8
Author: Joachim Breitner <mail at joachim-breitner.de>
Date: Sun Jul 27 21:43:35 2014 +0200
Remove gitit patches
---
patches/gitit/0.10.3.1/comment-type-signature | 26 ------
patches/gitit/0.10.3.1/newer-blaze.patch | 13 ---
patches/gitit/0.10.3.1/newer-happstack.patch | 13 ---
patches/gitit/0.10.3.1/newer-pandoc | 125 --------------------------
patches/gitit/0.10.3.1/series | 4 -
5 files changed, 181 deletions(-)
diff --git a/patches/gitit/0.10.3.1/comment-type-signature b/patches/gitit/0.10.3.1/comment-type-signature
deleted file mode 100644
index f7e9aeb..0000000
--- a/patches/gitit/0.10.3.1/comment-type-signature
+++ /dev/null
@@ -1,26 +0,0 @@
-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 --git a/patches/gitit/0.10.3.1/newer-blaze.patch b/patches/gitit/0.10.3.1/newer-blaze.patch
deleted file mode 100644
index f4aa847..0000000
--- a/patches/gitit/0.10.3.1/newer-blaze.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gitit-0.10.3.1/gitit.cabal
-===================================================================
---- gitit-0.10.3.1.orig/gitit.cabal 2014-06-23 21:22:38.657804420 -0700
-+++ gitit-0.10.3.1/gitit.cabal 2014-06-23 21:22:47.577804073 -0700
-@@ -165,7 +165,7 @@
- feed >= 0.3.6 && < 0.4,
- xss-sanitize >= 0.3 && < 0.4,
- tagsoup >= 0.13 && < 0.14,
-- blaze-html >= 0.4 && < 0.7,
-+ blaze-html >= 0.4 && < 0.8,
- json >= 0.4 && < 0.8
- if impl(ghc >= 6.10)
- build-depends: base >= 4, syb
diff --git a/patches/gitit/0.10.3.1/newer-happstack.patch b/patches/gitit/0.10.3.1/newer-happstack.patch
deleted file mode 100644
index 214b0ac..0000000
--- a/patches/gitit/0.10.3.1/newer-happstack.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gitit-0.10.3.1/gitit.cabal
-===================================================================
---- gitit-0.10.3.1.orig/gitit.cabal 2014-06-23 21:22:47.577804073 -0700
-+++ gitit-0.10.3.1/gitit.cabal 2014-06-23 21:26:04.885796390 -0700
-@@ -157,7 +157,7 @@
- filestore >= 0.6 && < 0.7,
- zlib >= 0.5 && < 0.6,
- url >= 2.1 && < 2.2,
-- happstack-server >= 7.0 && < 7.2,
-+ happstack-server >= 7.0 && < 7.4,
- base64-bytestring >= 0.1 && < 1.1,
- xml >= 1.3.5,
- hslogger >= 1 && < 1.3,
diff --git a/patches/gitit/0.10.3.1/newer-pandoc b/patches/gitit/0.10.3.1/newer-pandoc
deleted file mode 100644
index 766eca0..0000000
--- a/patches/gitit/0.10.3.1/newer-pandoc
+++ /dev/null
@@ -1,125 +0,0 @@
-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 --git a/patches/gitit/0.10.3.1/series b/patches/gitit/0.10.3.1/series
deleted file mode 100644
index 1d0feb5..0000000
--- a/patches/gitit/0.10.3.1/series
+++ /dev/null
@@ -1,4 +0,0 @@
-comment-type-signature
-newer-pandoc
-newer-blaze.patch
-newer-happstack.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git
More information about the Pkg-haskell-commits
mailing list