From f0d0f6e6c63a55b8ebfc7de2b3ba930970945489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Reynolds?= Date: Sat, 18 Apr 2015 09:36:53 -0300 Subject: pandoc-static: less patching --- pcr/pandoc-static/PKGBUILD | 31 +--- pcr/pandoc-static/pandoc-citeproc-ghc-7.10.patch | 177 ----------------------- 2 files changed, 8 insertions(+), 200 deletions(-) delete mode 100644 pcr/pandoc-static/pandoc-citeproc-ghc-7.10.patch diff --git a/pcr/pandoc-static/PKGBUILD b/pcr/pandoc-static/PKGBUILD index ab6c69af7..771917b90 100644 --- a/pcr/pandoc-static/PKGBUILD +++ b/pcr/pandoc-static/PKGBUILD @@ -5,7 +5,7 @@ pkgname=pandoc-static _pkgname=pandoc pkgver=1.13.2.1 -pkgrel=1 +pkgrel=2 pkgdesc='Conversion between markup formats (no Haskell libraries)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') @@ -18,12 +18,10 @@ depends=('icu>=55' 'icu<56' 'gmp' 'libffi' 'zlib') makedepends=('ghc' 'sh' 'cabal-install' 'alex' 'happy') optdepends=('texlive-most: for PDF creation') options=(strip !makeflags !distcc !emptydirs) -source=(https://repo.parabola.nu/other/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} - pandoc-citeproc-ghc-7.10.patch) +source=(https://repo.parabola.nu/other/${pkgname}/${pkgname}-${pkgver}-${pkgrel}.tar.xz{,.sig}) validpgpkeys=('49F707A1CB366C580E625B3C456032D717A4CD9C') -sha512sums=('614832f1c96bbdd67a50c8ace76f416d87b9dfeb873a7b2de6d8336a1804f68c53e5460ad62c49097fd8ea052f38a1f66163bc56cc808ac18bc57ce76063ecbc' - 'SKIP' - '22339e9b3dc68151fdf867379bc3b9f600cb5e08b45a26ab755a3d0d2034b461763174d82468fe9f3d6bd8a4a14b1ce30b4ab040c44777f8b99e89915fb4b4ee') +sha512sums=('1368894ff2382a4b5e5461dbc70e7267635a9cf44e2b0b6d4fef7c70556060920e447f9254a9af9ef1c983ba9360116e463299d4d5ec12a08f6f48dde6b26c2e' + 'SKIP') declare -gA _flags _flags[pandoc]='https make-pandoc-man-pages' @@ -44,17 +42,14 @@ mksource() ( cd $pkgname-$pkgver cabal update - cabal fetch "${_packages[@]}" # Get the build order cabal install --dry-run \ --flags="embed_data_files ${_flags[*]}" \ - "${_packages[@]}" > BUILDORDER + "${_packages[@]}" \ + | sed -rn 's/(\S*[0-9]+).*/\1/p' >BUILDORDER - # Place all of the downloaded sources in the target directory - for file in ../.cabal/packages/*/*/*/*.tar.?z; do - bsdtar xf "$file" - done + cabal get $(cat BUILDORDER) ) prepare() { @@ -63,16 +58,6 @@ prepare() { find "${srcdir}/${pkgname}-${pkgver}/${_pkgname}-${pkgver}" \ -name default.latex \ -exec sed "/fontenc/d" -i {} \; - - # https://github.com/hvr/deepseq-generics/issues/2 - sed "s/\(ghc-prim >= 0.2 && < \)0.4/\10.5/" -i \ - "${srcdir}/${pkgname}-${pkgver}/deepseq-generics-0.1.1.2/deepseq-generics.cabal" - - sed "s/\(base <4.\)8/\19/" -i \ - "${srcdir}/${pkgname}-${pkgver}/split-0.2.2/split.cabal" - - pushd "${srcdir}/${pkgname}-${pkgver}/pandoc-citeproc-0.6/" - patch -Np1 -i "${srcdir}/pandoc-citeproc-ghc-7.10.patch" } build() ( @@ -114,7 +99,7 @@ build() ( ;; esac popd >/dev/null - done < <(sed -rn 's/(\S*[0-9]+).*/\1/p' BUILDORDER) + done < BUILDORDER ) package() { diff --git a/pcr/pandoc-static/pandoc-citeproc-ghc-7.10.patch b/pcr/pandoc-static/pandoc-citeproc-ghc-7.10.patch deleted file mode 100644 index abdd40ade..000000000 --- a/pcr/pandoc-static/pandoc-citeproc-ghc-7.10.patch +++ /dev/null @@ -1,177 +0,0 @@ -commit 4e4f9c2f2866c28c01985abdcca82064ed44002e -Author: Mark Wright -Date: Sat Jan 10 12:31:30 2015 +1100 - - ghc 7.10.1 RC1 requires FlexibleContexts https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#Inferredtype-signaturesnowmayrequiretoenableFlexibleContextsGADTsorTypeFamilies - -diff --git a/src/Text/CSL/Util.hs b/src/Text/CSL/Util.hs -index 6e90bf7..bfe5f4c 100644 ---- a/src/Text/CSL/Util.hs -+++ b/src/Text/CSL/Util.hs -@@ -1,4 +1,4 @@ --{-# LANGUAGE ScopedTypeVariables, PatternGuards #-} -+{-# LANGUAGE ScopedTypeVariables, PatternGuards, FlexibleContexts #-} - module Text.CSL.Util - ( safeRead - , readNum - -commit 34cc147f87f2714ff3ad821a7640ef7e80323688 -Author: Mark Wright -Date: Sat Jan 10 12:30:59 2015 +1100 - - ghc 7.10.1 RC1 requires specifying the type of the String literal https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysNoinstanceforFoldable...arisingfromtheuseof... - -diff --git a/src/Text/CSL/Style.hs b/src/Text/CSL/Style.hs -index d5972b3..067a9e0 100644 ---- a/src/Text/CSL/Style.hs -+++ b/src/Text/CSL/Style.hs -@@ -130,7 +130,7 @@ readCSLString s = Walk.walk handleSmallCapsSpans - -- this is needed for versions of pandoc that don't turn - -- a span with font-variant:small-caps into a SmallCaps element: - where handleSmallCapsSpans (Span ("",[],[("style",sty)]) ils) -- | filter (`notElem` " \t;") sty == "font-variant:small-caps" = -+ | filter (`notElem` (" \t;" :: String)) sty == "font-variant:small-caps" = - SmallCaps ils - handleSmallCapsSpans x = x - -@@ -206,15 +206,15 @@ appendWithPunct :: Formatted -> Formatted -> Formatted - appendWithPunct (Formatted left) (Formatted right) = - Formatted $ - case concat [lastleft, firstright] of -- [' ',d] | d `elem` ",.:;" -> initInline left ++ right -- [c,d] | c `elem` " ,.:;", d == c -> left ++ tailInline right -- [c,'.'] | c `elem` ",.!:;?" -> left ++ tailInline right -- [c,':'] | c `elem` ",!:;?" -> left ++ tailInline right -- Mich.: 2005 -- [c,'!'] | c `elem` ",.!:;?" -> left ++ tailInline right -- [c,'?'] | c `elem` ",.!:;?" -> left ++ tailInline right -- [c,';'] | c `elem` ",:;" -> left ++ tailInline right -- et al.; -- [':',c] | c `elem` ",.!:;?" -> left ++ tailInline right -- [';',c] | c `elem` ",.!:;?" -> left ++ tailInline right -+ [' ',d] | d `elem` (",.:;" :: String) -> initInline left ++ right -+ [c,d] | c `elem` (" ,.:;" :: String), d == c -> left ++ tailInline right -+ [c,'.'] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right -+ [c,':'] | c `elem` (",!:;?" :: String) -> left ++ tailInline right -- Mich.: 2005 -+ [c,'!'] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right -+ [c,'?'] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right -+ [c,';'] | c `elem` (",:;" :: String) -> left ++ tailInline right -- et al.; -+ [':',c] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right -+ [';',c] | c `elem` (",.!:;?" :: String) -> left ++ tailInline right - -- ".;" -> right -- e.g. et al.; - _ -> left ++ right - where lastleft = lastInline left - -commit 8242c706af750f15d1f82d663e2be94f0f80dc34 -Author: Mark Wright -Date: Sat Jan 10 12:30:39 2015 +1100 - - ghc 7.10.1 RC1 requires specifying the type of the String literal https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysNoinstanceforFoldable...arisingfromtheuseof... - -diff --git a/src/Text/CSL/Proc.hs b/src/Text/CSL/Proc.hs -index 3575a59..f98e021 100644 ---- a/src/Text/CSL/Proc.hs -+++ b/src/Text/CSL/Proc.hs -@@ -288,7 +288,7 @@ formatCitLayout s (CG co f d cs) - case ys of - Formatted [] -> xs - Formatted (Note _ : _) -> xs <> ys -- Formatted (Str [c]:_) | c `elem` ", ;:" -> xs <> ys -+ Formatted (Str [c]:_) | c `elem` (", ;:" :: String) -> xs <> ys - _ -> xs <> Formatted [Space] <> ys - formatAuth = formatOutput . localMod - formatCits = (if isNote then toNote else id) . -@@ -328,7 +328,7 @@ localModifiers s b c - | otherwise = id - where - isPunct' [] = False -- isPunct' xs = all (`elem` ".,;:!? ") xs -+ isPunct' xs = all (`elem` (".,;:!? " :: String)) xs - check o = case cleanOutput o of - [] -> ONull - x -> case trim' x of - -commit e59f88d317224a76daf7ee152eaacbf7d84fc8a1 -Author: Mark Wright -Date: Sat Jan 10 12:30:15 2015 +1100 - - ghc 7.10.1 RC1 requires specifying the type of the String literal https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysNoinstanceforFoldable...arisingfromtheuseof... - -diff --git a/src/Text/CSL/Parser.hs b/src/Text/CSL/Parser.hs -index a5649bb..ea9b367 100644 ---- a/src/Text/CSL/Parser.hs -+++ b/src/Text/CSL/Parser.hs -@@ -144,7 +144,7 @@ stringAttr t cur = - - parseCslTerm :: Cursor -> CslTerm - parseCslTerm cur = -- let body = unpack $ T.dropAround (`elem` " \t\r\n") $ -+ let body = unpack $ T.dropAround (`elem` (" \t\r\n" :: String)) $ - T.concat $ cur $/ content - in CT - { cslTerm = stringAttr "name" cur - -commit ae6ca8694d9c077f46223a5018dc24d94070491c -Author: Mark Wright -Date: Sat Jan 10 12:29:58 2015 +1100 - - ghc 7.10.1 RC1 requires specifying the type of the String literal https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#GHCsaysNoinstanceforFoldable...arisingfromtheuseof... - -diff --git a/src/Text/CSL/Pandoc.hs b/src/Text/CSL/Pandoc.hs -index ae48cb4..840702a 100644 ---- a/src/Text/CSL/Pandoc.hs -+++ b/src/Text/CSL/Pandoc.hs -@@ -201,10 +201,10 @@ endWithPunct xs@(_:_) = case reverse (stringify xs) of - && isEndPunct c -> True - (c:_) | isEndPunct c -> True - | otherwise -> False -- where isEndPunct c = c `elem` ".,;:!?" -+ where isEndPunct c = c `elem` (".,;:!?" :: String) - - startWithPunct :: [Inline] -> Bool --startWithPunct = and . map (`elem` ".,;:!?") . headInline -+startWithPunct = and . map (`elem` (".,;:!?" :: String)) . headInline - - deNote :: Pandoc -> Pandoc - deNote = topDown go -@@ -324,7 +324,7 @@ pWordWithDigits isfirst = try $ do - sp <- option "" (pSpace >> return " ") - r <- many1 (notFollowedBy pSpace >> notFollowedBy pLocatorPunct >> anyToken) - let s = stringify r -- guard $ any isDigit s || all (`elem` "IVXLCM") s -+ guard $ any isDigit s || all (`elem` ("IVXLCM" :: String)) s - return $ punct ++ sp ++ s - - pDigit :: Parsec [Inline] st () - -commit f5a9fc70951c68b60455a1e2fa7755734c68a357 -Author: Mark Wright -Date: Sat Jan 10 12:28:40 2015 +1100 - - ghc 7.10.1 RC1 requires FlexibleContexts https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#Inferredtype-signaturesnowmayrequiretoenableFlexibleContextsGADTsorTypeFamilies - -diff --git a/src/Text/CSL/Eval/Names.hs b/src/Text/CSL/Eval/Names.hs -index 23e9b8e..5a387a2 100644 ---- a/src/Text/CSL/Eval/Names.hs -+++ b/src/Text/CSL/Eval/Names.hs -@@ -1,4 +1,4 @@ --{-# LANGUAGE PatternGuards #-} -+{-# LANGUAGE PatternGuards, FlexibleContexts #-} - ----------------------------------------------------------------------------- - -- | - -- Module : Text.CSL.Eval.Names - -commit 780a554f9d3dc0c1a53d285de05065bdb36c1b99 -Author: Mark Wright -Date: Sat Jan 10 12:28:24 2015 +1100 - - ghc 7.10.1 RC1 requires FlexibleContexts https://ghc.haskell.org/trac/ghc/wiki/Migration/7.10#Inferredtype-signaturesnowmayrequiretoenableFlexibleContextsGADTsorTypeFamilies - -diff --git a/src/Text/CSL/Eval.hs b/src/Text/CSL/Eval.hs -index 57c10dd..cf1dbb5 100644 ---- a/src/Text/CSL/Eval.hs -+++ b/src/Text/CSL/Eval.hs -@@ -1,4 +1,4 @@ --{-# LANGUAGE PatternGuards #-} -+{-# LANGUAGE PatternGuards, FlexibleContexts #-} - ----------------------------------------------------------------------------- - -- | - -- Module : Text.CSL.Eval -- cgit v1.2.3-2-g168b