[arch-commits] Commit in pandoc-citeproc/trunk (PKGBUILD aeson-pretty-0.8.patch)

[Felix Yan]

    Date: Wednesday, July 20, 2016 @ 04:19:38
  Author: felixonmars
Revision: 183401

upgpkg: pandoc-citeproc 0.10.1-1

rebuild with Glob-0.7.10, QuickCheck-2.9.1, aeson-compat-0.3.5.1, bifunctors-5.4.1, clientsession-0.9.1.2, cmark-0.5.3.1, cookie-0.4.2.1, css-text-0.1.2.2, dlist-0.8, dns-2.0.4, extra-1.4.12, fgl-5.5.3.0, generic-deriving-1.10.6, generics-sop-0.2.2.0, graphviz-2999.18.1.2, http-client-0.5.1, http2-1.6.1, js-jquery-3.1.0, math-functions-0.2.0.1, mono-traversable-1.0.0.1, pandoc-1.17.2, pandoc-citeproc-0.10.1, pandoc-crossref-0.2.2.1, path-io-1.2.0, persistent-template-2.5.1.4, retry-0.7.4.1, scientific-0.3.4.9, tasty-rerun-1.1.6, wai-extra-3.0.16.1, yaml-0.8.18.1, zip-archive-0.3.0.4

Modified:
  pandoc-citeproc/trunk/PKGBUILD
Deleted:
  pandoc-citeproc/trunk/aeson-pretty-0.8.patch

------------------------+
 PKGBUILD               |   15 ++++-----------
 aeson-pretty-0.8.patch |   38 --------------------------------------
 2 files changed, 4 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-20 04:16:01 UTC (rev 183400)
+++ PKGBUILD	2016-07-20 04:19:38 UTC (rev 183401)
@@ -4,8 +4,8 @@
 
 pkgbase=pandoc-citeproc
 pkgname=(pandoc-citeproc haskell-pandoc-citeproc)
-pkgver=0.10
-pkgrel=10
+pkgver=0.10.1
+pkgrel=1
 pkgdesc="Supports using pandoc with citeproc"
 url="http://hackage.haskell.org/package/${pkgbase}"
 license=("custom:BSD3")
@@ -16,16 +16,9 @@
              "haskell-rfc5051" "haskell-setenv" "haskell-split" "haskell-syb"
              "haskell-tagsoup" "haskell-temporary" "haskell-text" "haskell-text-icu"
              "haskell-unordered-containers" "haskell-vector" "haskell-xml-conduit" "haskell-yaml")
-source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz"
-        aeson-pretty-0.8.patch)
-sha256sums=('2465117b5e922d8c93f6ebf3b99d76c90d31573d01bd9935f5a1cc7be1cdb702'
-            '7605c9736a9bd284a15446c249324791b9b7b0ad8db4e7113d971d89a5912a6a')
+source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz")
+sha256sums=('ebc3eb3ff95e97ebd46c0918a65db2da021de2a70d02dc85ca5b344ea5c21205')
 
-prepare() {
-    cd "${srcdir}/${pkgbase}-${pkgver}"
-    patch -p1 -i ../aeson-pretty-0.8.patch
-}
-
 build() {
     cd "${srcdir}/${pkgbase}-${pkgver}"
     

Deleted: aeson-pretty-0.8.patch
===================================================================
--- aeson-pretty-0.8.patch	2016-07-20 04:16:01 UTC (rev 183400)
+++ aeson-pretty-0.8.patch	2016-07-20 04:19:38 UTC (rev 183401)
@@ -1,38 +0,0 @@
-diff --git a/pandoc-citeproc.cabal b/pandoc-citeproc.cabal
-index 40c27af..595bb53 100644
---- a/pandoc-citeproc.cabal
-+++ b/pandoc-citeproc.cabal
-@@ -148,7 +148,7 @@ executable pandoc-citeproc
-                       pandoc-types >= 1.16 && < 1.17,
-                       pandoc >= 1.16 && < 1.18,
-                       aeson,
--                      aeson-pretty, yaml, bytestring, syb, attoparsec, text,
-+                      aeson-pretty >= 0.8, yaml, bytestring, syb, attoparsec, text,
-                       filepath
-     other-modules:    Paths_pandoc_citeproc
-                       Prelude
-diff --git a/pandoc-citeproc.hs b/pandoc-citeproc.hs
-index f72fa41..2c1ce27 100644
---- a/pandoc-citeproc.hs
-+++ b/pandoc-citeproc.hs
-@@ -12,7 +12,7 @@ import qualified Data.ByteString.Char8 as B8
- import Data.Attoparsec.ByteString.Char8 as Attoparsec
- import qualified Data.Text as T
- import Data.Text.Encoding (encodeUtf8)
--import Data.Aeson.Encode.Pretty (encodePretty', Config(..))
-+import Data.Aeson.Encode.Pretty (encodePretty', Config(..), Indent(Spaces), NumberFormat(Generic))
- import System.Console.GetOpt
- import Control.Monad
- import System.IO
-@@ -62,8 +62,9 @@ main = do
-                  B8.intercalate (B.singleton 10) .
-                  map (unescapeTags . toByteString . (:[]))
-             else B8.putStrLn . unescapeUnicode . B.concat . BL.toChunks .
--              encodePretty' Config{ confIndent = 2
--                                  , confCompare = compare }
-+              encodePretty' Config{ confIndent = Spaces 2
-+                                  , confCompare = compare
-+                                  , confNumFormat = Generic }
-      else toJSONFilter doCites
- 
- formatFromExtension :: FilePath -> Maybe BibFormat