[arch-commits] Commit in git-annex/trunk (PKGBUILD ghc8.patch)

[Felix Yan]

    Date: Wednesday, May 25, 2016 @ 19:24:11
  Author: fyan
Revision: 177054

upgpkg: git-annex 6.20160511-4

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:
  git-annex/trunk/ghc8.patch
Modified:
  git-annex/trunk/PKGBUILD

------------+
 PKGBUILD   |   17 ++++++++++++-----
 ghc8.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-25 17:18:24 UTC (rev 177053)
+++ PKGBUILD	2016-05-25 17:24:11 UTC (rev 177054)
@@ -4,13 +4,13 @@
 
 pkgname=git-annex
 pkgver=6.20160511
-pkgrel=3
+pkgrel=4
 pkgdesc="Manage files with git, without checking their contents into git"
 url="http://git-annex.branchable.com/"
 license=("AGPL3")
 arch=('i686' 'x86_64')
 depends=('git' 'rsync' 'libxml2' 'gsasl' 'file')
-makedepends=("ghc=7.10.3" "haskell-aeson" "haskell-async" "haskell-aws" "haskell-blaze-builder"
+makedepends=("ghc=8.0.1" "haskell-aeson" "haskell-async" "haskell-aws" "haskell-blaze-builder"
              "haskell-bloomfilter" "haskell-byteable" "haskell-case-insensitive"
              "haskell-clientsession" "haskell-concurrent-output" "haskell-conduit"
              "haskell-conduit-extra" "haskell-crypto-api" "haskell-cryptonite"
@@ -31,10 +31,17 @@
              "haskell-utf8-string" "haskell-uuid" "haskell-wai" "haskell-wai-extra" "haskell-warp"
              "haskell-warp-tls" "haskell-xml-types" "haskell-yesod" "haskell-yesod-core"
              "haskell-yesod-default" "haskell-yesod-form" "haskell-yesod-static")
-options=('staticlibs')
-source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('85fc8853166fe57d91dc2776d5df4acb5911a91815f8aa12881928a1afe8ba01')
+source=("http://hackage.haskell.org/packages/archive/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+        ghc8.patch)
+sha256sums=('85fc8853166fe57d91dc2776d5df4acb5911a91815f8aa12881928a1afe8ba01'
+            '311282f6df5f10488ed0bd0e093757f6fd4c1b8d31c937ddceaa8c4303183542')
 
+prepare() {
+    sed -i 's/base (>= 4.5 && < 4.9),/base (>= 4.5 \&\& < 4.10),/' ${pkgname}-${pkgver}/${pkgname}.cabal
+    cd $pkgname-$pkgver
+    patch -p1 -i ../ghc8.patch
+}
+
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
     

Added: ghc8.patch
===================================================================
--- ghc8.patch	                        (rev 0)
+++ ghc8.patch	2016-05-25 17:24:11 UTC (rev 177054)
@@ -0,0 +1,33 @@
+From fe944a96d3e2b8c755970bd28641925617f19613 Mon Sep 17 00:00:00 2001
+From: ilovezfs <ilovezfs at icloud.com>
+Date: Mon, 23 May 2016 00:53:07 -0700
+Subject: [PATCH] git-annex: GHC compatibility
+
+---
+ Remote/Bup.hs | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/Remote/Bup.hs b/Remote/Bup.hs
+index ac3cc09..a481504 100644
+--- a/Remote/Bup.hs
++++ b/Remote/Bup.hs
+@@ -133,12 +133,13 @@ store r buprepo = byteStorer $ \k b p -> do
+ 	showOutput -- make way for bup output
+ 	let cmd = proc "bup" (toCommand params)
+ 	quiet <- commandProgressDisabled
+-	let runner = if quiet
+-			then feedWithQuietOutput
+-			else withHandle StdinHandle
+-	liftIO $ runner createProcessSuccess cmd $ \h -> do
+-		meteredWrite p h b
+-		return True
++	if quiet
++		then liftIO $ feedWithQuietOutput createProcessSuccess cmd $ \h -> do
++			meteredWrite p h b
++			return True
++		else liftIO $ withHandle StdinHandle createProcessSuccess cmd $ \h -> do
++			meteredWrite p h b
++			return True
+ 
+ retrieve :: BupRepo -> Retriever
+ retrieve buprepo = byteRetriever $ \k sink -> do