[arch-commits] Commit in pandoc-crossref/trunk (PKGBUILD ghc8.patch)

[Felix Yan]

    Date: Wednesday, July 20, 2016 @ 07:23:51
  Author: felixonmars
Revision: 183469

upgpkg: pandoc-crossref 0.2.2.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-crossref/trunk/PKGBUILD
Deleted:
  pandoc-crossref/trunk/ghc8.patch

------------+
 PKGBUILD   |   15 ++++-----------
 ghc8.patch |   24 ------------------------
 2 files changed, 4 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-07-20 07:22:42 UTC (rev 183468)
+++ PKGBUILD	2016-07-20 07:23:51 UTC (rev 183469)
@@ -4,8 +4,8 @@
 
 pkgbase=pandoc-crossref
 pkgname=(pandoc-crossref haskell-pandoc-crossref)
-pkgver=0.2.1.3
-pkgrel=13
+pkgver=0.2.2.1
+pkgrel=1
 pkgdesc="Pandoc filter for cross-references"
 url="http://hackage.haskell.org/package/${pkgbase}"
 license=("GPL2")
@@ -13,16 +13,9 @@
 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')
+source=("http://hackage.haskell.org/packages/archive/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.gz")
+sha256sums=('85da5dff663b578367ed75dcd71d8273a9cd92e8ae4a907ff0b83694d8417abd')
 
-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}"
     

Deleted: ghc8.patch
===================================================================
--- ghc8.patch	2016-07-20 07:22:42 UTC (rev 183468)
+++ ghc8.patch	2016-07-20 07:23:51 UTC (rev 183469)
@@ -1,24 +0,0 @@
-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]|]