Date: Friday, June 9, 2017 @ 14:55:51 Author: felixonmars Revision: 235551
upgpkg: haskell-memory 0.14.5-3 rebuild with foundation,0.0.10 Added: haskell-memory/trunk/foundation-0.0.10.patch Modified: haskell-memory/trunk/PKGBUILD -------------------------+ PKGBUILD | 13 +++++++++--- foundation-0.0.10.patch | 49 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-06-09 14:47:51 UTC (rev 235550) +++ PKGBUILD 2017-06-09 14:55:51 UTC (rev 235551) @@ -5,15 +5,22 @@ _hkgname=memory pkgname=haskell-memory pkgver=0.14.5 -pkgrel=2 +pkgrel=3 pkgdesc="memory and related abstraction stuff" url="https://github.com/vincenthz/hs-memory" license=("custom:BSD3") arch=('i686' 'x86_64') depends=('ghc=8.0.1' 'haskell-foundation') -source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -sha512sums=('ea558144f99d5c8675d53b7eb3f8095e243f1a9db6088c6247e7cbc08bd8301c690f0ef22e790dc3edb44653c2d1284e0f0f5ce869b72e7af753dcffbd53299f') +source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz" + foundation-0.0.10.patch) +sha512sums=('ea558144f99d5c8675d53b7eb3f8095e243f1a9db6088c6247e7cbc08bd8301c690f0ef22e790dc3edb44653c2d1284e0f0f5ce869b72e7af753dcffbd53299f' + '0fc37f462c692971948547048b3831c6d56a8bce1b291fdb2392f1309dad76e52382022b9f6e8b7432e76050286d708d422e17069350c64ef60cfde94b96710c') +prepare() { + cd "${srcdir}/${_hkgname}-${pkgver}" + patch -p1 -i ../foundation-0.0.10.patch +} + build() { cd "${srcdir}/${_hkgname}-${pkgver}" Added: foundation-0.0.10.patch =================================================================== --- foundation-0.0.10.patch (rev 0) +++ foundation-0.0.10.patch 2017-06-09 14:55:51 UTC (rev 235551) @@ -0,0 +1,49 @@ +From 1cf7f077d9fc2cec97677c3892b38ff74b157f07 Mon Sep 17 00:00:00 2001 +From: Nicolas DI PRIMA <nico...@di-prima.fr> +Date: Fri, 9 Jun 2017 14:54:04 +0200 +Subject: [PATCH] bump Foundation dependency minimal version + +fix #33 +--- + Data/ByteArray/Types.hs | 6 +++--- + memory.cabal | 2 +- + stack.yaml | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Data/ByteArray/Types.hs b/Data/ByteArray/Types.hs +index 0ad2797..87fdffe 100644 +--- a/Data/ByteArray/Types.hs ++++ b/Data/ByteArray/Types.hs +@@ -55,16 +55,16 @@ uarrayRecastW8 :: F.PrimType ty => F.UArray ty -> F.UArray F.Word8 + uarrayRecastW8 = F.recast + + instance F.PrimType ty => ByteArrayAccess (F.UArray ty) where +- length = F.length . uarrayRecastW8 ++ length a = let F.CountOf i = F.length (uarrayRecastW8 a) in i + withByteArray a f = F.withPtr (uarrayRecastW8 a) (f . castPtr) + + instance ByteArrayAccess F.String where +- length = F.length ++ length str = let F.CountOf i = F.length str in i + withByteArray s f = withByteArray (F.toBytes F.UTF8 s) f + + instance (Ord ty, F.PrimType ty) => ByteArray (F.UArray ty) where + allocRet sz f = do +- mba <- F.new (F.Size sz) ++ mba <- F.new (F.CountOf sz) + a <- F.withMutablePtr mba (f . castPtr) + ba <- F.unsafeFreeze mba + return (a, ba) +diff --git a/memory.cabal b/memory.cabal +index 759035b..19cc1b4 100644 +--- a/memory.cabal ++++ b/memory.cabal +@@ -96,7 +96,7 @@ Library + Build-depends: deepseq >= 1.1 + if flag(support_foundation) + CPP-options: -DWITH_FOUNDATION_SUPPORT +- Build-depends: foundation >= 0.0.8 ++ Build-depends: foundation >= 0.0.10 + + ghc-options: -Wall -fwarn-tabs + default-language: Haskell2010