Date: Wednesday, June 8, 2016 @ 10:04:22 Author: fyan Revision: 178189
upgpkg: pandoc-crossref 0.2.1.3-3 rebuild with ghc-8.0.1, base-prelude-1.0.1.1, cabal-install-1.24.0.0, cairo-0.13.2.0, cmark-0.5.2.1, data-default-0.7.0, data-default-class-0.1.0, extra-1.4.7, generic-trie-0.3.0.2, glib-0.13.3.0, gtk3-0.14.3, haddock-api-2.17.2, haddock-library-1.4.1, js-jquery-1.12.4, memory-0.13, microlens-0.4.4.0, network-multicast-0.1.1, pango-0.13.2.0, simple-sendfile-0.2.24, stack-1.1.2, texmath-0.8.6.3, wai-3.2.1.1 Added: pandoc-crossref/trunk/ghc8.patch Modified: pandoc-crossref/trunk/PKGBUILD Deleted: pandoc-crossref/trunk/haskell-pandoc-crossref.install ---------------------------------+ PKGBUILD | 23 +++++++++++++++-------- ghc8.patch | 24 ++++++++++++++++++++++++ haskell-pandoc-crossref.install | 18 ------------------ 3 files changed, 39 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-06-08 08:04:06 UTC (rev 178188) +++ PKGBUILD 2016-06-08 08:04:22 UTC (rev 178189) @@ -5,18 +5,24 @@ pkgbase=pandoc-crossref pkgname=(pandoc-crossref haskell-pandoc-crossref) pkgver=0.2.1.3 -pkgrel=2 +pkgrel=3 pkgdesc="Pandoc filter for cross-references" url="http://hackage.haskell.org/package/${pkgbase}"; license=("GPL2") arch=('i686' 'x86_64') -makedepends=("ghc=7.10.3" "haskell-data-default" "haskell-data-accessor" "haskell-data-accessor-template" +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") -options=('staticlibs') -source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz";) -sha256sums=('d14b78972c48a722b7e53d12fb601e4379d5384f9a58c8ce46ab42b058125471') +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}" @@ -27,6 +33,7 @@ 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 } @@ -41,11 +48,11 @@ package_haskell-pandoc-crossref() { pkgdesc="Pandoc filter for cross-references (docs and libraries)" depends=("${makedepends[@]}" 'pandoc-crossref') - install="haskell-pandoc-crossref.install" cd "${srcdir}/${pkgbase}-${pkgver}" - install -D -m744 register.sh "${pkgdir}/usr/share/haskell/${pkgname}/register.sh" - install -m744 unregister.sh "${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh" + + 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}" Added: ghc8.patch =================================================================== --- ghc8.patch (rev 0) +++ ghc8.patch 2016-06-08 08:04:22 UTC (rev 178189) @@ -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]|] Deleted: haskell-pandoc-crossref.install =================================================================== --- haskell-pandoc-crossref.install 2016-06-08 08:04:06 UTC (rev 178188) +++ haskell-pandoc-crossref.install 2016-06-08 08:04:22 UTC (rev 178189) @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-pandoc-crossref -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -}
