[arch-commits] Commit in idris/trunk (PKGBUILD cheapskate-0.1.1.patch)

[Felix Yan]

    Date: Thursday, August 3, 2017 @ 13:53:24
  Author: felixonmars
Revision: 247768

upgpkg: idris 1.1.0-3

rebuild with cheapskate,0.1.1

Added:
  idris/trunk/cheapskate-0.1.1.patch
Modified:
  idris/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   13 +++++++++----
 cheapskate-0.1.1.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-08-03 11:49:09 UTC (rev 247767)
+++ PKGBUILD	2017-08-03 13:53:24 UTC (rev 247768)
@@ -4,7 +4,7 @@
 
 pkgname=idris
 pkgver=1.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Functional Programming Language with Dependent Types"
 url="http://www.idris-lang.org/"
 license=("custom:BSD3")
@@ -17,12 +17,17 @@
          "haskell-split" "haskell-terminal-size" "haskell-text" "haskell-transformers-compat"
          "haskell-trifecta" "haskell-uniplate" "haskell-unordered-containers" "haskell-utf8-string"
          "haskell-vector" "haskell-vector-binary-instances" "haskell-zip-archive")
-source=("$pkgname-$pkgver.tar.gz::https://github.com/idris-lang/Idris-dev/archive/v$pkgver.tar.gz")
-sha512sums=('689f98315a835a623d5bfdb8419ff6888ab82e357f243f0adad47f496ee388cf521172d147855ccf63f5d95c6d4ef0977b1ec99c61b755772bd316d49daa1c44')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/idris-lang/Idris-dev/archive/v$pkgver.tar.gz"
+        cheapskate-0.1.1.patch)
+sha512sums=('689f98315a835a623d5bfdb8419ff6888ab82e357f243f0adad47f496ee388cf521172d147855ccf63f5d95c6d4ef0977b1ec99c61b755772bd316d49daa1c44'
+            'bbde8342befd769657e5b1e19e52abd190d18c4512bec26a8431090d9e9bb97b59c4395ad89fa54990332c34b2933aee0643e46f3b37a1f747d2e12c30e549a0')
 
 prepare() {
+    cd Idris-dev-$pkgver
+    patch -p1 -i ../cheapskate-0.1.1.patch
+
     sed -i '1ioverride IDRIS := env LD_PRELOAD=$(shell ls ../../dist/build/libHSidris-*-ghc*.so) $(IDRIS)' \
-        Idris-dev-$pkgver/libs/*/Makefile
+        libs/*/Makefile
 }
 
 build() {

Added: cheapskate-0.1.1.patch
===================================================================
--- cheapskate-0.1.1.patch	                        (rev 0)
+++ cheapskate-0.1.1.patch	2017-08-03 13:53:24 UTC (rev 247768)
@@ -0,0 +1,36 @@
+commit eb932ec422ecbe9ce7835b5143a40c0be882ccb7
+Author: Felix Yan <felixonmars at archlinux.org>
+Date:   Thu Aug 3 21:17:39 2017 +0800
+
+    Fix compatibility with cheapskate-0.1.1
+    
+    Only define instances for older cheapskate
+
+diff --git a/src/Idris/DeepSeq.hs b/src/Idris/DeepSeq.hs
+index 8d44075e..234e5ce6 100644
+--- a/src/Idris/DeepSeq.hs
++++ b/src/Idris/DeepSeq.hs
+@@ -5,6 +5,7 @@ Copyright   :
+ License     : BSD3
+ Maintainer  : The Idris Community.
+ -}
++{-# LANGUAGE CPP #-}
+ {-# OPTIONS_GHC -fwarn-incomplete-patterns #-}
+ 
+ module Idris.DeepSeq(
+@@ -29,6 +30,7 @@ import Control.DeepSeq
+ import Network.Socket (PortNumber)
+ 
+ -- These types don't have Generic instances
++#if !MIN_VERSION_cheapskate(0,1,1)
+ instance NFData CT.Options where
+   rnf (CT.Options x1 x2 x3 x4) = rnf x1 `seq` rnf x2 `seq` rnf x3 `seq` rnf x4 `seq` ()
+ 
+@@ -42,6 +44,7 @@ instance NFData CT.CodeAttr where
+ instance NFData CT.NumWrapper where
+   rnf CT.PeriodFollowing = ()
+   rnf CT.ParenFollowing = ()
++#endif
+ 
+ instance NFData DynamicLib where
+     rnf (Lib x _) = rnf x `seq` ()