Thu Sep 13 00:04:37 UTC 2012

2 files changed, 60 insertions, 5 deletions

diff --git a/community-staging/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch b/community-staging/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch
new file mode 100644
index 000000000..a25506e67
--- /dev/null
+++ b/community-staging/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch
@@ -0,0 +1,50 @@
+From 554b8dc1439b4dbb5bc9a853fc27efe7b1e111de Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Tue, 11 Sep 2012 03:59:50 -0700
+Subject: [PATCH] update code to support extensible exceptions no longer being
+ a part of ghc >= 7.6.1
+
+---
+ QuickCheck.cabal             | 6 +++++-
+ Test/QuickCheck/Exception.hs | 6 ++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git a/QuickCheck.cabal b/QuickCheck.cabal
+index 1a9126e..5afd6fb 100644
+--- a/QuickCheck.cabal
++++ b/QuickCheck.cabal
+@@ -60,9 +60,13 @@ library
+       Build-depends: ghc
+ 
+   -- We want to use extensible-exceptions even if linking against base-3.
+-  if impl(ghc >= 6.9)
++  if impl(ghc >= 6.9) && impl(ghc < 7.6)
+     Build-depends: extensible-exceptions
+ 
++  -- GHC >= 7.6.1 no longer provides extensible exceptions
++  if impl(ghc >= 7.6)
++    cpp-options: -DNEW_EXCEPTIONS
++
+   -- Modules that are always built.
+   Exposed-Modules:
+     Test.QuickCheck,
+diff --git a/Test/QuickCheck/Exception.hs b/Test/QuickCheck/Exception.hs
+index f895351..d463195 100644
+--- a/Test/QuickCheck/Exception.hs
++++ b/Test/QuickCheck/Exception.hs
+@@ -18,6 +18,12 @@ module Test.QuickCheck.Exception where
+ 
+ #if defined(OLD_EXCEPTIONS)
+ import Control.Exception(evaluate, try, Exception(..), throw)
++#elif defined(NEW_EXCEPTIONS)
++import Control.Exception(evaluate, try, SomeException(SomeException), ErrorCall(..), throw
++#if defined(GHC_INTERRUPT)
++  , AsyncException(UserInterrupt)
++#endif
++  )
+ #else
+ import Control.Exception.Extensible(evaluate, try, SomeException(SomeException), ErrorCall(..), throw
+ #if defined(GHC_INTERRUPT)
+-- 
+1.7.12
+
diff --git a/community-staging/haskell-quickcheck/PKGBUILD b/community-staging/haskell-quickcheck/PKGBUILD
index 70fbf160f..ed4061b1f 100644
--- a/community-staging/haskell-quickcheck/PKGBUILD
+++ b/community-staging/haskell-quickcheck/PKGBUILD
@@ -4,20 +4,25 @@
 
 _hkgname=QuickCheck
 pkgname=haskell-quickcheck
-pkgver=2.4.2
+pkgver=2.5
 pkgrel=2
 pkgdesc="Automatic testing of Haskell programs"
 url="http://hackage.haskell.org/package/QuickCheck"
 license=('custom:BSD3')
 arch=('i686' 'x86_64')
-#depends=('ghc=7.4.2-1' 'haskell-mtl=2.0.1.0-4' 'haskell-random=1.0.1.1-1' 'sh')
-depends=('ghc=7.4.2-1' 'haskell-random=1.0.1.1-2' 'sh')
-source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz)
+depends=('ghc=7.6.1-1' 'haskell-random=1.0.1.1-3' 'sh')
+source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz
+        '0001-update-code-to-support-extensible-exceptions-no-long.patch')
 install=${pkgname}.install
-md5sums=('9e22f9741cbc7d9cd8d52d3928e57b67')
+md5sums=('ad647a3f208092e5d41469369c18185e'
+         '4581c66d2904f19dc53787b19960e569')
 
 build() {
     cd ${srcdir}/${_hkgname}-${pkgver}
+
+    # extensible exceptions no longer provided in ghc >= 7.6.1
+    patch -Np1 -i ${srcdir}/0001-update-code-to-support-extensible-exceptions-no-long.patch
+
     runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \
       --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid
     runhaskell Setup build