[arch-commits] Commit in pandoc-crossref/repos (6 files)

Felix Yan felixonmars at archlinux.org
Mon Jul 4 07:20:13 UTC 2016


    Date: Monday, July 4, 2016 @ 07:20:13
  Author: felixonmars
Revision: 182083

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  pandoc-crossref/repos/community-staging-i686/
  pandoc-crossref/repos/community-staging-i686/PKGBUILD
    (from rev 182082, pandoc-crossref/trunk/PKGBUILD)
  pandoc-crossref/repos/community-staging-i686/ghc8.patch
    (from rev 182082, pandoc-crossref/trunk/ghc8.patch)
  pandoc-crossref/repos/community-staging-x86_64/
  pandoc-crossref/repos/community-staging-x86_64/PKGBUILD
    (from rev 182082, pandoc-crossref/trunk/PKGBUILD)
  pandoc-crossref/repos/community-staging-x86_64/ghc8.patch
    (from rev 182082, pandoc-crossref/trunk/ghc8.patch)

-------------------------------------+
 community-staging-i686/PKGBUILD     |   61 ++++++++++++++++++++++++++++++++++
 community-staging-i686/ghc8.patch   |   24 +++++++++++++
 community-staging-x86_64/PKGBUILD   |   61 ++++++++++++++++++++++++++++++++++
 community-staging-x86_64/ghc8.patch |   24 +++++++++++++
 4 files changed, 170 insertions(+)

Copied: pandoc-crossref/repos/community-staging-i686/PKGBUILD (from rev 182082, pandoc-crossref/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD	                        (rev 0)
+++ community-staging-i686/PKGBUILD	2016-07-04 07:20:13 UTC (rev 182083)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+pkgbase=pandoc-crossref
+pkgname=(pandoc-crossref haskell-pandoc-crossref)
+pkgver=0.2.1.3
+pkgrel=12
+pkgdesc="Pandoc filter for cross-references"
+url="http://hackage.haskell.org/package/${pkgbase}"
+license=("GPL2")
+arch=('i686' 'x86_64')
+makedepends=("ghc=8.0.1" "haskell-data-default" "haskell-data-accessor" "haskell-data-accessor-template"
+             "haskell-data-accessor-transformers" "haskell-mtl" "haskell-pandoc" "haskell-pandoc-types"
+             "haskell-roman-numerals" "haskell-syb" "haskell-yaml")
+source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz"
+        ghc8.patch)
+sha256sums=('d14b78972c48a722b7e53d12fb601e4379d5384f9a58c8ce46ab42b058125471'
+            '2a74124f1652d17da63e6cff5939b02633b0045929b175cc4570f7cadbc8cdc1')
+
+prepare() {
+    sed -i 's/data-default >= 0.4 && <0.7/data-default >= 0.4 \&\& <0.8/' ${pkgbase}-${pkgver}/${pkgbase}.cabal
+    (cd $pkgbase-$pkgver; patch -p1 -i ../ghc8.patch)
+}
+
+build() {
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+    
+    runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+        --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" --datasubdir="$pkgname" \
+        --libsubdir=\$compiler/site-local/\$pkgid
+    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-crossref() {
+    depends=('pandoc')
+
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+    runhaskell Setup copy --destdir="${pkgdir}"
+    rm -r "$pkgdir"/usr/{lib,share}
+}
+
+package_haskell-pandoc-crossref() {
+    pkgdesc="Pandoc filter for cross-references (docs and libraries)"
+    depends=("${makedepends[@]}" 'pandoc-crossref')
+
+    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/${pkgname}"
+    runhaskell Setup copy --destdir="${pkgdir}"
+    rm -r "$pkgdir"/usr/bin
+    rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE.md"
+}

Copied: pandoc-crossref/repos/community-staging-i686/ghc8.patch (from rev 182082, pandoc-crossref/trunk/ghc8.patch)
===================================================================
--- community-staging-i686/ghc8.patch	                        (rev 0)
+++ community-staging-i686/ghc8.patch	2016-07-04 07:20:13 UTC (rev 182083)
@@ -0,0 +1,24 @@
+diff --git a/lib/Text/Pandoc/CrossRef/Util/Settings/Template.hs b/lib/Text/Pandoc/CrossRef/Util/Settings/Template.hs
+index c0f5499..b899f10 100644
+--- a/lib/Text/Pandoc/CrossRef/Util/Settings/Template.hs
++++ b/lib/Text/Pandoc/CrossRef/Util/Settings/Template.hs
+@@ -24,8 +24,8 @@ fromRecDef t cname f c = do
+                   TyConI dec -> return dec
+                   _ -> fail "No cons"
+   (_, cons) <- case reified of
+-               DataD _ _ params cons' _ -> return (params, cons')
+-               NewtypeD _ _ params con' _ -> return (params, [con'])
++               DataD _ _ params _ cons' _ -> return (params, cons')
++               NewtypeD _ _ params _ con' _ -> return (params, [con'])
+                _ -> fail "No cons"
+   decs <- liftM concat . mapM (\ (name,_,_) -> f t name) . nub $ concatMap namedFields cons
+   return $ c cname decs
+@@ -50,7 +50,7 @@ makeCon t cname = fromRecDef t cname makeCon' RecConE
+ 
+ makeCon' :: Name -> Name -> Q [(Name, Exp)]
+ makeCon' t accName = do
+-    VarI _ t' _ _ <- reify accName
++    VarI _ t' _ <- reify accName
+     funT <- [t|$(conT t) -> Bool -> Int -> [Inline]|]
+     inlT <- [t|$(conT t) -> [Inline]|]
+     blkT <- [t|$(conT t) -> [Block]|]

Copied: pandoc-crossref/repos/community-staging-x86_64/PKGBUILD (from rev 182082, pandoc-crossref/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2016-07-04 07:20:13 UTC (rev 182083)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Arch Haskell Team <arch-haskell at haskell.org>
+
+pkgbase=pandoc-crossref
+pkgname=(pandoc-crossref haskell-pandoc-crossref)
+pkgver=0.2.1.3
+pkgrel=12
+pkgdesc="Pandoc filter for cross-references"
+url="http://hackage.haskell.org/package/${pkgbase}"
+license=("GPL2")
+arch=('i686' 'x86_64')
+makedepends=("ghc=8.0.1" "haskell-data-default" "haskell-data-accessor" "haskell-data-accessor-template"
+             "haskell-data-accessor-transformers" "haskell-mtl" "haskell-pandoc" "haskell-pandoc-types"
+             "haskell-roman-numerals" "haskell-syb" "haskell-yaml")
+source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz"
+        ghc8.patch)
+sha256sums=('d14b78972c48a722b7e53d12fb601e4379d5384f9a58c8ce46ab42b058125471'
+            '2a74124f1652d17da63e6cff5939b02633b0045929b175cc4570f7cadbc8cdc1')
+
+prepare() {
+    sed -i 's/data-default >= 0.4 && <0.7/data-default >= 0.4 \&\& <0.8/' ${pkgbase}-${pkgver}/${pkgbase}.cabal
+    (cd $pkgbase-$pkgver; patch -p1 -i ../ghc8.patch)
+}
+
+build() {
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+    
+    runhaskell Setup configure -O --enable-library-profiling --enable-shared \
+        --prefix=/usr --docdir="/usr/share/doc/${pkgbase}" --datasubdir="$pkgname" \
+        --libsubdir=\$compiler/site-local/\$pkgid
+    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-crossref() {
+    depends=('pandoc')
+
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+    runhaskell Setup copy --destdir="${pkgdir}"
+    rm -r "$pkgdir"/usr/{lib,share}
+}
+
+package_haskell-pandoc-crossref() {
+    pkgdesc="Pandoc filter for cross-references (docs and libraries)"
+    depends=("${makedepends[@]}" 'pandoc-crossref')
+
+    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/${pkgname}"
+    runhaskell Setup copy --destdir="${pkgdir}"
+    rm -r "$pkgdir"/usr/bin
+    rm -f "${pkgdir}/usr/share/doc/${pkgname}/LICENSE.md"
+}

Copied: pandoc-crossref/repos/community-staging-x86_64/ghc8.patch (from rev 182082, pandoc-crossref/trunk/ghc8.patch)
===================================================================
--- community-staging-x86_64/ghc8.patch	                        (rev 0)
+++ community-staging-x86_64/ghc8.patch	2016-07-04 07:20:13 UTC (rev 182083)
@@ -0,0 +1,24 @@
+diff --git a/lib/Text/Pandoc/CrossRef/Util/Settings/Template.hs b/lib/Text/Pandoc/CrossRef/Util/Settings/Template.hs
+index c0f5499..b899f10 100644
+--- a/lib/Text/Pandoc/CrossRef/Util/Settings/Template.hs
++++ b/lib/Text/Pandoc/CrossRef/Util/Settings/Template.hs
+@@ -24,8 +24,8 @@ fromRecDef t cname f c = do
+                   TyConI dec -> return dec
+                   _ -> fail "No cons"
+   (_, cons) <- case reified of
+-               DataD _ _ params cons' _ -> return (params, cons')
+-               NewtypeD _ _ params con' _ -> return (params, [con'])
++               DataD _ _ params _ cons' _ -> return (params, cons')
++               NewtypeD _ _ params _ con' _ -> return (params, [con'])
+                _ -> fail "No cons"
+   decs <- liftM concat . mapM (\ (name,_,_) -> f t name) . nub $ concatMap namedFields cons
+   return $ c cname decs
+@@ -50,7 +50,7 @@ makeCon t cname = fromRecDef t cname makeCon' RecConE
+ 
+ makeCon' :: Name -> Name -> Q [(Name, Exp)]
+ makeCon' t accName = do
+-    VarI _ t' _ _ <- reify accName
++    VarI _ t' _ <- reify accName
+     funT <- [t|$(conT t) -> Bool -> Int -> [Inline]|]
+     inlT <- [t|$(conT t) -> [Inline]|]
+     blkT <- [t|$(conT t) -> [Block]|]



More information about the arch-commits mailing list