diff options
author | 2016-03-28 12:33:23 +0100 | |
---|---|---|
committer | 2016-03-28 12:33:23 +0100 | |
commit | 972bae2ce89ff24596bd366dbb3c6d7c77426e41 (patch) | |
tree | 8d468c4b39f2a25dc48ebab382c3d5378cca92e5 /www-apps/gitit/files | |
parent | media-gfx/scantailor: Fix BOOST_JOIN with >=dev-libs/boost-1.58.0 (diff) | |
download | gentoo-972bae2ce89ff24596bd366dbb3c6d7c77426e41.tar.gz gentoo-972bae2ce89ff24596bd366dbb3c6d7c77426e41.tar.bz2 gentoo-972bae2ce89ff24596bd366dbb3c6d7c77426e41.zip |
www-apps/gitit: drop old
Package-Manager: portage-2.2.28
Diffstat (limited to 'www-apps/gitit/files')
-rw-r--r-- | www-apps/gitit/files/gitit-0.10.3.1-pandoc-1.12.patch | 129 | ||||
-rw-r--r-- | www-apps/gitit/files/gitit-0.10.3.1-tagsoup-0.13.patch | 22 | ||||
-rw-r--r-- | www-apps/gitit/files/gitit-0.10.6.2-ghc-7.10.patch | 47 |
3 files changed, 0 insertions, 198 deletions
diff --git a/www-apps/gitit/files/gitit-0.10.3.1-pandoc-1.12.patch b/www-apps/gitit/files/gitit-0.10.3.1-pandoc-1.12.patch deleted file mode 100644 index c1f463ce499f..000000000000 --- a/www-apps/gitit/files/gitit-0.10.3.1-pandoc-1.12.patch +++ /dev/null @@ -1,129 +0,0 @@ -commit 48155008397bdaed4f97c5678d83c70d4bc3f0ff -Author: John MacFarlane <fiddlosopher@gmail.com> -Date: Sat Sep 14 19:24:01 2013 -0700 - - Changes to allow compilation with pandoc 1.12. - - TODO: Better handling of images and other resources in - Docx, ODT, PDF exports. - -diff --git a/Network/Gitit/ContentTransformer.hs b/Network/Gitit/ContentTransformer.hs -index 9bf656a..1489c4f 100644 ---- a/Network/Gitit/ContentTransformer.hs -+++ b/Network/Gitit/ContentTransformer.hs -@@ -85,6 +85,7 @@ import Network.URI (isUnescapedInURI) - 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 :: String -> Pandoc -> ContentTransformer Pandoc - 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 @@ inlinesToString = concatMap go - 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 - -diff --git a/Network/Gitit/Export.hs b/Network/Gitit/Export.hs -index 2eb5c2c..38d5bfa 100644 ---- a/Network/Gitit/Export.hs -+++ b/Network/Gitit/Export.hs -@@ -79,7 +79,7 @@ respondX templ mimetype ext fn opts page doc = do - 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' - -@@ -135,7 +135,7 @@ respondSlides templ slideVariant page doc = do - writerVariables = - ("body",body''):("dzslides-core",dzcore):("highlighting-css",pygmentsCss):variables' - ,writerTemplate = template -- ,writerSourceDirectory = repositoryPath cfg -+ ,writerSourceURL = Just $ baseUrl cfg - ,writerUserDataDir = pandocUserData cfg - } (Pandoc meta []) - h' <- liftIO $ makeSelfContained (pandocUserData cfg) h -diff --git a/Network/Gitit/Types.hs b/Network/Gitit/Types.hs -index a278633..87d6b29 100644 ---- a/Network/Gitit/Types.hs -+++ b/Network/Gitit/Types.hs -@@ -400,7 +400,7 @@ type Handler = GititServerPart Response - 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) -diff --git a/data/default.conf b/data/default.conf -index e2d6cae..8a6d818 100644 ---- a/data/default.conf -+++ b/data/default.conf -@@ -238,8 +238,8 @@ use-feed: no - - 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. -diff --git a/gitit.cabal b/gitit.cabal -index 53bf8fb..07a76f7 100644 ---- a/gitit.cabal -+++ b/gitit.cabal -@@ -117,8 +117,8 @@ Library - 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 @@ Executable gitit - 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 @@ Executable gitit - 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/www-apps/gitit/files/gitit-0.10.3.1-tagsoup-0.13.patch b/www-apps/gitit/files/gitit-0.10.3.1-tagsoup-0.13.patch deleted file mode 100644 index 1c261b8bff79..000000000000 --- a/www-apps/gitit/files/gitit-0.10.3.1-tagsoup-0.13.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/Network/Gitit/Types.hs b/Network/Gitit/Types.hs -index a278633..6f2b65f 100644 ---- a/Network/Gitit/Types.hs -+++ b/Network/Gitit/Types.hs -@@ -1,4 +1,4 @@ --{-# LANGUAGE TypeSynonymInstances, ScopedTypeVariables, FlexibleInstances #-} -+{-# LANGUAGE TypeSynonymInstances, ScopedTypeVariables, FlexibleInstances, CPP #-} - {- - Copyright (C) 2009 John MacFarlane <jgm@berkeley.edu>, - Anton van Straaten <anton@appsolutions.com> -@@ -400,7 +400,11 @@ type Handler = GititServerPart Response - fromEntities :: String -> String - fromEntities ('&':xs) = - case lookupEntity ent of -+#if MIN_VERSION_tagsoup(0,13,0) -+ Just c -> c ++ fromEntities rest -+#else - Just c -> c : fromEntities rest -+#endif - Nothing -> '&' : fromEntities xs - where (ent, rest) = case break (\c -> isSpace c || c == ';') xs of - (zs,';':ys) -> (zs,ys) diff --git a/www-apps/gitit/files/gitit-0.10.6.2-ghc-7.10.patch b/www-apps/gitit/files/gitit-0.10.6.2-ghc-7.10.patch deleted file mode 100644 index 4644ff43ffa7..000000000000 --- a/www-apps/gitit/files/gitit-0.10.6.2-ghc-7.10.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- gitit-0.10.6.2-orig/Network/Gitit/Authentication.hs 2015-04-03 14:18:02.000000000 +1100 -+++ gitit-0.10.6.2/Network/Gitit/Authentication.hs 2015-04-05 20:18:28.239989325 +1000 -@@ -1,4 +1,4 @@ --{-# LANGUAGE ScopedTypeVariables #-} -+{-# LANGUAGE ScopedTypeVariables, FlexibleContexts #-} - {- - Copyright (C) 2009 John MacFarlane <jgm@berkeley.edu>, - Henry Laxen <nadine.and.henry@pobox.com> ---- gitit-0.10.6.2-orig/Network/Gitit/Feed.hs 2015-04-03 14:18:02.000000000 +1100 -+++ gitit-0.10.6.2/Network/Gitit/Feed.hs 2015-04-05 20:19:13.496945226 +1000 -@@ -1,3 +1,4 @@ -+{-# LANGUAGE CPP #-} - {- - Copyright (C) 2009 Gwern Branwen <gwern0@gmail.com> and - John MacFarlane <jgm@berkeley.edu> -@@ -22,7 +23,11 @@ - module Network.Gitit.Feed (FeedConfig(..), filestoreToXmlFeed) where - - import Data.Time (UTCTime, formatTime, getCurrentTime, addUTCTime) -+#if MIN_VERSION_time(1,5,0) -+import Data.Time (defaultTimeLocale) -+#else - import System.Locale (defaultTimeLocale) -+#endif - import Data.Foldable as F (concatMap) - import Data.List (intercalate, sortBy, nub) - import Data.Maybe (fromMaybe) ---- gitit-0.10.6.2-orig/Network/Gitit/Types.hs 2015-04-03 14:18:02.000000000 +1100 -+++ gitit-0.10.6.2/Network/Gitit/Types.hs 2015-04-05 20:17:34.038042036 +1000 -@@ -1,4 +1,4 @@ --{-# LANGUAGE TypeSynonymInstances, ScopedTypeVariables, FlexibleInstances #-} -+{-# LANGUAGE TypeSynonymInstances, ScopedTypeVariables, FlexibleInstances, CPP #-} - {- - Copyright (C) 2009 John MacFarlane <jgm@berkeley.edu>, - Anton van Straaten <anton@appsolutions.com> -@@ -72,7 +72,11 @@ - import Data.Text (Text) - import Data.List (intersect) - import Data.Time (parseTime) -+#if MIN_VERSION_time(1,5,0) -+import Data.Time (defaultTimeLocale) -+#else - import System.Locale (defaultTimeLocale) -+#endif - import Data.FileStore.Types - import Network.Gitit.Server - import Text.HTML.TagSoup.Entity (lookupEntity) |