[arch-commits] Commit in haskell-bytestring-tree-builder/trunk (2 files)

[Felix Yan]

    Date: Friday, May 18, 2018 @ 07:02:12
  Author: felixonmars
Revision: 324245

upgpkg: haskell-bytestring-tree-builder 0.2.7.1-14

rebuild with ghc 8.4.2 - real fix

Added:
  haskell-bytestring-tree-builder/trunk/ghc-8.4.patch
Modified:
  haskell-bytestring-tree-builder/trunk/PKGBUILD

---------------+
 PKGBUILD      |   13 ++++++++++---
 ghc-8.4.patch |   23 +++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-18 06:56:02 UTC (rev 324244)
+++ PKGBUILD	2018-05-18 07:02:12 UTC (rev 324245)
@@ -5,7 +5,7 @@
 _hkgname=bytestring-tree-builder
 pkgname=haskell-bytestring-tree-builder
 pkgver=0.2.7.1
-pkgrel=13
+pkgrel=14
 pkgdesc="A very efficient ByteString builder implementation based on the binary tree"
 url="https://github.com/nikita-volkov/bytestring-tree-builder"
 license=("MIT")
@@ -12,9 +12,16 @@
 arch=('x86_64')
 depends=('ghc-libs' "haskell-base-prelude" "haskell-semigroups")
 makedepends=('ghc')
-source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
-sha512sums=('cf522d6c13bb2fd6b23e0b78abec5836c20d19effcceb184646aa885df12c665738a9134b0cf6c8f5b30d05606c1a0880829600181342c678bb8ab32a9f3765d')
+source=("https://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz"
+        ghc-8.4.patch)
+sha512sums=('cf522d6c13bb2fd6b23e0b78abec5836c20d19effcceb184646aa885df12c665738a9134b0cf6c8f5b30d05606c1a0880829600181342c678bb8ab32a9f3765d'
+            'dc21716549a6d0b35a564061130e058b1cd756895985385f16054dc5e4b47b59b71c4044aca14a1b651470cc788f5a1d60f495e534cc6360f992214aaa7e35fb')
 
+prepare() {
+    cd $_hkgname-$pkgver
+    patch -p1 -i ../ghc-8.4.patch
+}
+
 build() {
     cd "${srcdir}/${_hkgname}-${pkgver}"
     

Added: ghc-8.4.patch
===================================================================
--- ghc-8.4.patch	                        (rev 0)
+++ ghc-8.4.patch	2018-05-18 07:02:12 UTC (rev 324245)
@@ -0,0 +1,23 @@
+diff --git a/library/ByteString/TreeBuilder.hs.orig b/library/ByteString/TreeBuilder.hs
+index 18c7f05..5f8ffbb 100644
+--- a/library/ByteString/TreeBuilder.hs.orig
++++ b/library/ByteString/TreeBuilder.hs
+@@ -43,9 +43,6 @@ instance Monoid Builder where
+   {-# INLINE mempty #-}
+   mempty =
+     Builder 0 A.Empty
+-  {-# INLINABLE mappend #-}
+-  mappend (Builder length1 tree1) (Builder length2 tree2) =
+-    Builder (length1 + length2) (A.Branch tree1 tree2)
+   {-# INLINE mconcat #-}
+   mconcat =
+     foldl' mappend mempty
+@@ -54,6 +51,8 @@ instance Semigroup Builder where
+   {-# INLINE sconcat #-}
+   sconcat =
+     foldl' mappend mempty
++  Builder length1 tree1 <> Builder length2 tree2 =
++    Builder (length1 + length2) (A.Branch tree1 tree2)
+ 
+ instance IsString Builder where
+   {-# INLINE fromString #-}