Date: Monday, July 4, 2016 @ 06:01:48
Author: felixonmars
Revision: 182045
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
pandoc-citeproc/repos/community-staging-i686/
pandoc-citeproc/repos/community-staging-i686/PKGBUILD
(from rev 182044, pandoc-citeproc/trunk/PKGBUILD)
pandoc-citeproc/repos/community-staging-i686/aeson-pretty-0.8.patch
(from rev 182044, pandoc-citeproc/trunk/aeson-pretty-0.8.patch)
pandoc-citeproc/repos/community-staging-x86_64/
pandoc-citeproc/repos/community-staging-x86_64/PKGBUILD
(from rev 182044, pandoc-citeproc/trunk/PKGBUILD)
pandoc-citeproc/repos/community-staging-x86_64/aeson-pretty-0.8.patch
(from rev 182044, pandoc-citeproc/trunk/aeson-pretty-0.8.patch)
-------------------------------------------------+
community-staging-i686/PKGBUILD | 65 ++++++++++++++++++++++
community-staging-i686/aeson-pretty-0.8.patch | 38 ++++++++++++
community-staging-x86_64/PKGBUILD | 65 ++++++++++++++++++++++
community-staging-x86_64/aeson-pretty-0.8.patch | 38 ++++++++++++
4 files changed, 206 insertions(+)
Copied: pandoc-citeproc/repos/community-staging-i686/PKGBUILD (from rev 182044,
pandoc-citeproc/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-07-04 06:01:48 UTC (rev 182045)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Felix Yan <[email protected]>
+# Contributor: Arch Haskell Team <[email protected]>
+
+pkgbase=pandoc-citeproc
+pkgname=(pandoc-citeproc haskell-pandoc-citeproc)
+pkgver=0.10
+pkgrel=9
+pkgdesc="Supports using pandoc with citeproc"
+url="http://hackage.haskell.org/package/${pkgbase}";
+license=("custom:BSD3")
+arch=('i686' 'x86_64')
+makedepends=("ghc=8.0.1" "haskell-aeson" "haskell-aeson-pretty"
"haskell-attoparsec"
+ "haskell-data-default" "haskell-hs-bibutils" "haskell-mtl"
+ "haskell-old-locale" "haskell-pandoc" "haskell-pandoc-types"
"haskell-parsec"
+ "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')
+
+prepare() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ patch -p1 -i ../aeson-pretty-0.8.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgbase}"
--datasubdir="$pkgbase" \
+ --libsubdir=\$compiler/site-local/\$pkgid \
+ -f-debug -f-test_citeproc -funicode_collation -f-embed_data_files
-fbibutils
+ runhaskell Setup build
+ runhaskell Setup haddock --hoogle --html
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package_pandoc-citeproc() {
+ depends=('pandoc' 'icu')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ rm -r "$pkgdir"/usr/{lib,share/doc}
+ install -D -m644 "LICENSE"
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_haskell-pandoc-citeproc() {
+ pkgdesc="Supports using pandoc with citeproc (docs and libraries)"
+ depends=("${makedepends[@]}" 'pandoc-citeproc')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ install -D -m744 register.sh
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+ install -D -m744 unregister.sh
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+ install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
+ ln -s "/usr/share/doc/${pkgbase}/html"
"${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgbase}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ rm -r "$pkgdir"/usr/share/{pandoc-citeproc,man} "$pkgdir"/usr/bin
+ rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}
Copied: pandoc-citeproc/repos/community-staging-i686/aeson-pretty-0.8.patch
(from rev 182044, pandoc-citeproc/trunk/aeson-pretty-0.8.patch)
===================================================================
--- community-staging-i686/aeson-pretty-0.8.patch
(rev 0)
+++ community-staging-i686/aeson-pretty-0.8.patch 2016-07-04 06:01:48 UTC
(rev 182045)
@@ -0,0 +1,38 @@
+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
Copied: pandoc-citeproc/repos/community-staging-x86_64/PKGBUILD (from rev
182044, pandoc-citeproc/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2016-07-04 06:01:48 UTC (rev 182045)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Felix Yan <[email protected]>
+# Contributor: Arch Haskell Team <[email protected]>
+
+pkgbase=pandoc-citeproc
+pkgname=(pandoc-citeproc haskell-pandoc-citeproc)
+pkgver=0.10
+pkgrel=9
+pkgdesc="Supports using pandoc with citeproc"
+url="http://hackage.haskell.org/package/${pkgbase}";
+license=("custom:BSD3")
+arch=('i686' 'x86_64')
+makedepends=("ghc=8.0.1" "haskell-aeson" "haskell-aeson-pretty"
"haskell-attoparsec"
+ "haskell-data-default" "haskell-hs-bibutils" "haskell-mtl"
+ "haskell-old-locale" "haskell-pandoc" "haskell-pandoc-types"
"haskell-parsec"
+ "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')
+
+prepare() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ patch -p1 -i ../aeson-pretty-0.8.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+ --prefix=/usr --docdir="/usr/share/doc/${pkgbase}"
--datasubdir="$pkgbase" \
+ --libsubdir=\$compiler/site-local/\$pkgid \
+ -f-debug -f-test_citeproc -funicode_collation -f-embed_data_files
-fbibutils
+ runhaskell Setup build
+ runhaskell Setup haddock --hoogle --html
+ runhaskell Setup register --gen-script
+ runhaskell Setup unregister --gen-script
+ sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh
+ sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh
+}
+
+package_pandoc-citeproc() {
+ depends=('pandoc' 'icu')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ rm -r "$pkgdir"/usr/{lib,share/doc}
+ install -D -m644 "LICENSE"
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_haskell-pandoc-citeproc() {
+ pkgdesc="Supports using pandoc with citeproc (docs and libraries)"
+ depends=("${makedepends[@]}" 'pandoc-citeproc')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ install -D -m744 register.sh
"${pkgdir}/usr/share/haskell/register/${pkgname}.sh"
+ install -D -m744 unregister.sh
"${pkgdir}/usr/share/haskell/unregister/${pkgname}.sh"
+ install -d -m755 "${pkgdir}/usr/share/doc/ghc/html/libraries"
+ ln -s "/usr/share/doc/${pkgbase}/html"
"${pkgdir}/usr/share/doc/ghc/html/libraries/${pkgbase}"
+ runhaskell Setup copy --destdir="${pkgdir}"
+ rm -r "$pkgdir"/usr/share/{pandoc-citeproc,man} "$pkgdir"/usr/bin
+ rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE"
+}
Copied: pandoc-citeproc/repos/community-staging-x86_64/aeson-pretty-0.8.patch
(from rev 182044, pandoc-citeproc/trunk/aeson-pretty-0.8.patch)
===================================================================
--- community-staging-x86_64/aeson-pretty-0.8.patch
(rev 0)
+++ community-staging-x86_64/aeson-pretty-0.8.patch 2016-07-04 06:01:48 UTC
(rev 182045)
@@ -0,0 +1,38 @@
+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
