Date: Thursday, February 27, 2020 @ 10:54:28 Author: felixonmars Revision: 583842
archrelease: copy trunk to community-staging-x86_64 Added: haskell-quickcheck/repos/community-staging-x86_64/0001-update-code-to-support-extensible-exceptions-no-long.patch (from rev 583841, haskell-quickcheck/trunk/0001-update-code-to-support-extensible-exceptions-no-long.patch) haskell-quickcheck/repos/community-staging-x86_64/PKGBUILD (from rev 583841, haskell-quickcheck/trunk/PKGBUILD) Deleted: haskell-quickcheck/repos/community-staging-x86_64/0001-update-code-to-support-extensible-exceptions-no-long.patch haskell-quickcheck/repos/community-staging-x86_64/PKGBUILD -----------------------------------------------------------------+ 0001-update-code-to-support-extensible-exceptions-no-long.patch | 100 +++++----- PKGBUILD | 100 +++++----- 2 files changed, 100 insertions(+), 100 deletions(-) Deleted: 0001-update-code-to-support-extensible-exceptions-no-long.patch =================================================================== --- 0001-update-code-to-support-extensible-exceptions-no-long.patch 2020-02-27 10:54:09 UTC (rev 583841) +++ 0001-update-code-to-support-extensible-exceptions-no-long.patch 2020-02-27 10:54:28 UTC (rev 583842) @@ -1,50 +0,0 @@ -From 554b8dc1439b4dbb5bc9a853fc27efe7b1e111de Mon Sep 17 00:00:00 2001 -From: Thomas Dziedzic <gos...@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 - Copied: haskell-quickcheck/repos/community-staging-x86_64/0001-update-code-to-support-extensible-exceptions-no-long.patch (from rev 583841, haskell-quickcheck/trunk/0001-update-code-to-support-extensible-exceptions-no-long.patch) =================================================================== --- 0001-update-code-to-support-extensible-exceptions-no-long.patch (rev 0) +++ 0001-update-code-to-support-extensible-exceptions-no-long.patch 2020-02-27 10:54:28 UTC (rev 583842) @@ -0,0 +1,50 @@ +From 554b8dc1439b4dbb5bc9a853fc27efe7b1e111de Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gos...@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 + Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-02-27 10:54:09 UTC (rev 583841) +++ PKGBUILD 2020-02-27 10:54:28 UTC (rev 583842) @@ -1,50 +0,0 @@ -# Maintainer: Alexander F Rødseth <xypr...@archlinux.org> -# Contributor: Vesa Kaihlavirta <v...@archlinux.org> -# Contributor: Arch Haskell Team <arch-hask...@haskell.org> - -_hkgname=QuickCheck -pkgname=haskell-quickcheck -pkgver=2.13.2 -pkgrel=21 -pkgdesc='Automatic testing of Haskell programs' -url='https://hackage.haskell.org/package/QuickCheck' -license=('BSD') -arch=('x86_64') -depends=('ghc-libs' 'haskell-erf' 'haskell-random' 'haskell-splitmix') -makedepends=('ghc') -source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz") -sha512sums=('d2c92caec8bdf9089483b1f256f17f3d50e066f57eddb630f1831a232c4e33a0d4f55a0f927aa433cd3379283fa2615fd2937941e6847b234ea00b0fbeb46b98') - -build() { - cd $_hkgname-$pkgver - - runhaskell Setup configure \ - -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \ - --prefix=/usr --docdir="/usr/share/doc/$pkgname" --enable-tests \ - --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \ - -ftemplateHaskell - - runhaskell Setup build - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - - sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -check() { - cd $_hkgname-$pkgver - runhaskell Setup test -} - -package() { - cd $_hkgname-$pkgver - - install -D -m744 register.sh "$pkgdir/usr/share/haskell/register/$pkgname.sh" - install -D -m744 unregister.sh "$pkgdir/usr/share/haskell/unregister/${pkgname}.sh" - runhaskell Setup copy --destdir="$pkgdir" - install -D -m644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE -} - -# vim: ts=2 sw=2 et: Copied: haskell-quickcheck/repos/community-staging-x86_64/PKGBUILD (from rev 583841, haskell-quickcheck/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-02-27 10:54:28 UTC (rev 583842) @@ -0,0 +1,50 @@ +# Maintainer: Alexander F Rødseth <xypr...@archlinux.org> +# Contributor: Vesa Kaihlavirta <v...@archlinux.org> +# Contributor: Arch Haskell Team <arch-hask...@haskell.org> + +_hkgname=QuickCheck +pkgname=haskell-quickcheck +pkgver=2.13.2 +pkgrel=22 +pkgdesc='Automatic testing of Haskell programs' +url='https://hackage.haskell.org/package/QuickCheck' +license=('BSD') +arch=('x86_64') +depends=('ghc-libs' 'haskell-erf' 'haskell-random' 'haskell-splitmix') +makedepends=('ghc') +source=("https://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz") +sha512sums=('d2c92caec8bdf9089483b1f256f17f3d50e066f57eddb630f1831a232c4e33a0d4f55a0f927aa433cd3379283fa2615fd2937941e6847b234ea00b0fbeb46b98') + +build() { + cd $_hkgname-$pkgver + + runhaskell Setup configure \ + -O --enable-shared --enable-executable-dynamic --disable-library-vanilla \ + --prefix=/usr --docdir="/usr/share/doc/$pkgname" --enable-tests \ + --dynlibdir=/usr/lib --libsubdir=\$compiler/site-local/\$pkgid \ + -ftemplateHaskell + + runhaskell Setup build + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + + sed -i -r -e "s|ghc-pkg.*update[^ ]* |&'--force' |" register.sh + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +check() { + cd $_hkgname-$pkgver + runhaskell Setup test +} + +package() { + cd $_hkgname-$pkgver + + install -D -m744 register.sh "$pkgdir/usr/share/haskell/register/$pkgname.sh" + install -D -m744 unregister.sh "$pkgdir/usr/share/haskell/unregister/${pkgname}.sh" + runhaskell Setup copy --destdir="$pkgdir" + install -D -m644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -f "$pkgdir"/usr/share/doc/$pkgname/LICENSE +} + +# vim: ts=2 sw=2 et: