From 843685ce9dd76d37a4c7b0230eacb6d26bdf30dd Mon Sep 17 00:00:00 2001 From: root Date: Thu, 13 Sep 2012 00:04:38 +0000 Subject: Thu Sep 13 00:04:37 UTC 2012 --- community-staging/alex/PKGBUILD | 31 ++++++++++ .../0001-fix-for-ghc-7.6.1-changes.patch | 69 ++++++++++++++++++++++ community-staging/gtk2hs-buildtools/PKGBUILD | 32 ++++++++++ ...-incorrect-types-in-documentation-haddock.patch | 33 +++++++++++ community-staging/haddock/PKGBUILD | 50 ++++++++++++++++ community-staging/haddock/haddock.install | 25 ++++++++ community-staging/happy/PKGBUILD | 12 ++-- community-staging/haskell-bytestring-show/PKGBUILD | 41 +++++++++++++ .../haskell-bytestring-show.install | 24 ++++++++ .../0001-update-build-deps-for-ghc-7.6.1.patch | 25 ++++++++ community-staging/haskell-dataenc/PKGBUILD | 16 +++-- ...-to-support-extensible-exceptions-no-long.patch | 50 ++++++++++++++++ community-staging/haskell-quickcheck/PKGBUILD | 15 +++-- ...01-update-changed-time-code-for-ghc-7.6.1.patch | 50 ++++++++++++++++ community-staging/haskell-tar/PKGBUILD | 50 ++++++++++++++++ community-staging/haskell-tar/haskell-tar.install | 24 ++++++++ community-staging/haskell-x11-xft/PKGBUILD | 38 ++++++++++++ .../haskell-x11-xft/haskell-x11-xft.install | 18 ++++++ community-staging/haskell-x11/PKGBUILD | 41 +++++++++++++ community-staging/haskell-x11/hsmod.install | 18 ++++++ 20 files changed, 648 insertions(+), 14 deletions(-) create mode 100644 community-staging/alex/PKGBUILD create mode 100644 community-staging/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch create mode 100644 community-staging/gtk2hs-buildtools/PKGBUILD create mode 100644 community-staging/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch create mode 100644 community-staging/haddock/PKGBUILD create mode 100644 community-staging/haddock/haddock.install create mode 100644 community-staging/haskell-bytestring-show/PKGBUILD create mode 100644 community-staging/haskell-bytestring-show/haskell-bytestring-show.install create mode 100644 community-staging/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch create mode 100644 community-staging/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch create mode 100644 community-staging/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch create mode 100644 community-staging/haskell-tar/PKGBUILD create mode 100644 community-staging/haskell-tar/haskell-tar.install create mode 100644 community-staging/haskell-x11-xft/PKGBUILD create mode 100644 community-staging/haskell-x11-xft/haskell-x11-xft.install create mode 100644 community-staging/haskell-x11/PKGBUILD create mode 100644 community-staging/haskell-x11/hsmod.install (limited to 'community-staging') diff --git a/community-staging/alex/PKGBUILD b/community-staging/alex/PKGBUILD new file mode 100644 index 000000000..eadf607c6 --- /dev/null +++ b/community-staging/alex/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 76079 2012-09-11 04:43:36Z tdziedzic $ +# Maintainer: Sergej Pupykin +# Maintainer: Vesa Kaihlavirta +# Contributor: Philip Nilsson + +pkgname=alex +pkgver=3.0.2 +pkgrel=2 +pkgdesc='a lexical analyser generator for Haskell' +arch=('i686' 'x86_64') +url='http://hackage.haskell.org/package/alex' +license=('custom:BSD3') +depends=('gmp') +makedepends=('ghc=7.6.1-1' 'haskell-quickcheck=2.5-2') +source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") +md5sums=('b8f0d831b65d05e5f54ff08bd3d9d10d') + +build() { + cd $srcdir/$pkgname-$pkgver + runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname + runghc Setup.lhs build +} + +package() { + cd $srcdir/$pkgname-$pkgver + runghc Setup.lhs copy --destdir=$pkgdir + install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3 + + # doc/ contains only license which already installed into proper place + rm -rf $pkgdir/usr/share/doc +} diff --git a/community-staging/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch b/community-staging/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch new file mode 100644 index 000000000..1c6a7dd65 --- /dev/null +++ b/community-staging/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch @@ -0,0 +1,69 @@ +From 7d94bcd36eb1d5a2feae182fcb74f9d6ca439a80 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic +Date: Wed, 12 Sep 2012 03:29:46 -0700 +Subject: [PATCH] fix for ghc 7.6.1 changes + +--- + c2hs/base/general/FileOps.hs | 3 ++- + c2hs/base/state/StateTrans.hs | 3 ++- + c2hs/toplevel/C2HSConfig.hs | 2 +- + 3 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/c2hs/base/general/FileOps.hs b/c2hs/base/general/FileOps.hs +index 83ac70c..4914c4b 100644 +--- a/c2hs/base/general/FileOps.hs ++++ b/c2hs/base/general/FileOps.hs +@@ -39,6 +39,7 @@ import Control.Monad (liftM) + import System.Random (newStdGen, randomRs) + + import FNameOps (dirname, stripDirname, addPath) ++import System.IO.Error (catchIOError) + + + -- search for the given file in the given list of directories (EXPORTED) +@@ -89,7 +90,7 @@ mktemp pre post = + in do + h <- openFile fname ReadWriteMode + return (h, fname) +- `catch` \_ -> createLoop (attempts - 1) rs' ++ `catchIOError` \_ -> createLoop (attempts - 1) rs' + -- + sixChars :: [Int] -> ([Int], String) + sixChars is = +diff --git a/c2hs/base/state/StateTrans.hs b/c2hs/base/state/StateTrans.hs +index ada62f4..2ab0ad1 100644 +--- a/c2hs/base/state/StateTrans.hs ++++ b/c2hs/base/state/StateTrans.hs +@@ -84,6 +84,7 @@ import System.IO (fixIO) + import Data.IORef (IORef, newIORef, readIORef, writeIORef) + + import Errors (interr) ++import System.IO.Error (catchIOError) + + infixr 1 +>=, +> + +@@ -337,7 +338,7 @@ fatalsHandledBy m handler = + ioError err + Right a -> return state + ) +- `catch` (\err -> let ++ `catchIOError` (\err -> let + STB handler' = handler err + in + handler' bs gs) +diff --git a/c2hs/toplevel/C2HSConfig.hs b/c2hs/toplevel/C2HSConfig.hs +index e8deddf..af32886 100644 +--- a/c2hs/toplevel/C2HSConfig.hs ++++ b/c2hs/toplevel/C2HSConfig.hs +@@ -46,7 +46,7 @@ import Data.Array (Array, array) + + import Foreign (Ptr, FunPtr) + import Foreign (Storable(sizeOf, alignment), toBool) +-import Foreign.C (CInt) ++import Foreign.C (CInt(..)) + import System.Info (os) + + -- program settings +-- +1.7.12 + diff --git a/community-staging/gtk2hs-buildtools/PKGBUILD b/community-staging/gtk2hs-buildtools/PKGBUILD new file mode 100644 index 000000000..e0e928514 --- /dev/null +++ b/community-staging/gtk2hs-buildtools/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 76136 2012-09-12 03:36:40Z tdziedzic $ +# Maintainer: Sergej Pupykin + +pkgname=gtk2hs-buildtools +pkgver=0.12.3.1 +pkgrel=2 +pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries." +url="http://hackage.haskell.org/package/gtk2hs-buildtools" +license=('GPL2') +arch=('i686' 'x86_64') +makedepends=('ghc=7.6.1-1' 'alex=3.0.2-2' 'happy=1.18.9-6' 'haskell-random=1.0.1.1-3') +depends=('gmp') +options=('strip') +provides=('haskell-gtk2hs-buildtools') +source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz + '0001-fix-for-ghc-7.6.1-changes.patch') +md5sums=('612611d831635024c953d2817b124e29' + 'b6551d8085c97bc2c6600ab397833101') + +build() { + cd ${srcdir}/gtk2hs-buildtools-$pkgver + + patch -Np1 -i ${srcdir}/0001-fix-for-ghc-7.6.1-changes.patch + + runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname} + runhaskell Setup build +} + +package() { + cd ${srcdir}/gtk2hs-buildtools-$pkgver + runhaskell Setup copy --destdir=${pkgdir} +} diff --git a/community-staging/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch b/community-staging/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch new file mode 100644 index 000000000..2e687db21 --- /dev/null +++ b/community-staging/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch @@ -0,0 +1,33 @@ +From c60f2ab90f6e39fdb515cc0305467e534f718a7d Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic +Date: Tue, 11 Sep 2012 07:43:41 -0700 +Subject: [PATCH] fix incorrect types in documentation/haddock + +--- + src/Documentation/Haddock.hs | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Documentation/Haddock.hs b/src/Documentation/Haddock.hs +index 60bb314..8fd9674 100644 +--- a/src/Documentation/Haddock.hs ++++ b/src/Documentation/Haddock.hs +@@ -59,6 +59,7 @@ import Haddock.Types + import Haddock.Options + import Haddock.Utils + import Main ++import GHC (Ghc) + + + -- | Create 'Interface' structures from a given list of Haddock command-line +@@ -68,7 +69,7 @@ import Main + createInterfaces + :: [Flag] -- ^ A list of command-line flags + -> [String] -- ^ File or module names +- -> IO [Interface] -- ^ Resulting list of interfaces ++ -> Ghc [Interface] -- ^ Resulting list of interfaces + createInterfaces flags modules = do + (_, ifaces, _) <- readPackagesAndProcessModules flags modules + return ifaces +-- +1.7.12 + diff --git a/community-staging/haddock/PKGBUILD b/community-staging/haddock/PKGBUILD new file mode 100644 index 000000000..274cc7851 --- /dev/null +++ b/community-staging/haddock/PKGBUILD @@ -0,0 +1,50 @@ +# Maintainer: Alexander Rødseth +# Contributor: Vesa Kaihlavirta +# Contributor: Arch Haskell Team + +pkgname=haddock +pkgver=2.12.0 +pkgrel=1 +pkgdesc="Tool for generating documentation for Haskell libraries" +url="http://hackage.haskell.org/package/haddock" +license=('custom:BSD3') +arch=('x86_64' 'i686') +makedepends=('alex=3.0.2-2' 'happy=1.18.9-6') +depends=('ghc=7.6.1-1' 'haskell-xhtml=3000.2.1-2' 'haskell-ghc-paths=0.1.0.8-9') +install=$pkgname.install +source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz" + '0001-fix-incorrect-types-in-documentation-haddock.patch') +sha256sums=('b6c53c3c2dcfc7604941f81acd8954c7deb101b1341003d2e9c6c26dd4ad6d02' + 'a260b828ddf6e56440209d9631efcd6e1530b8996859528feee37638cc26e92a') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + patch -Np1 -i ${srcdir}/0001-fix-incorrect-types-in-documentation-haddock.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 + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m744 unregister.sh \ + "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s "/usr/share/doc/$pkgname/html" \ + "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname" + runhaskell Setup copy --destdir="$pkgdir" + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" + mv "$pkgdir/usr/bin/haddock" "$pkgdir/usr/bin/haddock-cabal" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/haddock/haddock.install b/community-staging/haddock/haddock.install new file mode 100644 index 000000000..24e27a074 --- /dev/null +++ b/community-staging/haddock/haddock.install @@ -0,0 +1,25 @@ +pkgname=haddock +HS_DIR=usr/share/haskell/haddock + +post_upgrade() { + ${HS_DIR}/register.sh &> /dev/null + post_remove +} + +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null +} + +pre_remove() { + ${HS_DIR}/unregister.sh &> /dev/null +} + +post_install() { + post_upgrade +} + +pre_upgrade() { + pre_remove +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/happy/PKGBUILD b/community-staging/happy/PKGBUILD index 4d239ff86..5bf28a90c 100644 --- a/community-staging/happy/PKGBUILD +++ b/community-staging/happy/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 72226 2012-06-11 03:28:44Z tdziedzic $ +# $Id: PKGBUILD 76087 2012-09-11 06:46:46Z tdziedzic $ # Maintainer: Thomas Dziedzic # Contributor: simo # Contributor: Vesa Kaihlavirta pkgname=happy pkgver=1.18.9 -pkgrel=5 +pkgrel=6 pkgdesc="The Parser Generator for Haskell" -url="http://www.haskell.org/happy/" +url="http://hackage.haskell.org/package/happy" arch=('i686' 'x86_64') license=("custom:BSD3") depends=('gmp') -makedepends=('ghc=7.4.2-1' 'haskell-mtl=2.1.1-1') +makedepends=('ghc=7.6.1-1' 'haskell-mtl=2.1.2-1') source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) md5sums=('aeb565fe572f979f15a24db0df2de37d') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # try was deprecated and removed into control.exception + # we really want tryIOError + sed 's/try/&IOError/' -i Setup.lhs + runhaskell Setup.lhs configure -O --prefix=/usr runhaskell Setup.lhs build } diff --git a/community-staging/haskell-bytestring-show/PKGBUILD b/community-staging/haskell-bytestring-show/PKGBUILD new file mode 100644 index 000000000..3b45dcd16 --- /dev/null +++ b/community-staging/haskell-bytestring-show/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 76081 2012-09-11 04:59:02Z tdziedzic $ +# Maintainer: Sergej Pupykin + +pkgname=haskell-bytestring-show +pkgver=0.3.5.3 +pkgrel=1 +pkgdesc="Efficient conversion of values into readable byte strings." +url="http://hackage.haskell.org/package/bytestring-show" +license=("BSD3") +arch=('i686' 'x86_64') +depends=("ghc=7.6.1-1") +install="${pkgname}.install" +source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz") +md5sums=('cbcc94f57fc754685f428aba003ba058') + +build() { + cd ${srcdir}/bytestring-show-${pkgver} + + # update outdated dependency + sed 's/build-depends: integer-gmp >= 0.2 && < 0.5/build-depends: integer-gmp >= 0.2 \&\& < 0.6/' -i bytestring-show.cabal + + 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 + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd ${srcdir}/bytestring-show-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/bytestring-show + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community-staging/haskell-bytestring-show/haskell-bytestring-show.install b/community-staging/haskell-bytestring-show/haskell-bytestring-show.install new file mode 100644 index 000000000..335fc37cd --- /dev/null +++ b/community-staging/haskell-bytestring-show/haskell-bytestring-show.install @@ -0,0 +1,24 @@ +pkgname=haskell-bytestring-show +HS_DIR=usr/share/haskell/${pkgname} + +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +pre_upgrade() { + ${HS_DIR}/unregister.sh +} + +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +pre_remove() { + ${HS_DIR}/unregister.sh +} + +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community-staging/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch b/community-staging/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch new file mode 100644 index 000000000..9f544bb27 --- /dev/null +++ b/community-staging/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch @@ -0,0 +1,25 @@ +From 961892779b5f5a2f46d6baa44c31d06c39e56470 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic +Date: Tue, 11 Sep 2012 05:06:59 -0700 +Subject: [PATCH] update build deps for ghc 7.6.1 + +--- + dataenc.cabal | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dataenc.cabal b/dataenc.cabal +index 1ad42ca..3a4f5bb 100644 +--- a/dataenc.cabal ++++ b/dataenc.cabal +@@ -21,7 +21,7 @@ flag BuildTests + + library + hs-source-dirs: src +- build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.6, containers >= 0.1.0 && < 0.5 ++ build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.7, containers >= 0.1.0 && < 0.6 + exposed-modules: + Codec.Binary.Base16 + Codec.Binary.Base32 +-- +1.7.12 + diff --git a/community-staging/haskell-dataenc/PKGBUILD b/community-staging/haskell-dataenc/PKGBUILD index bbcbdbb60..7727f7dbd 100644 --- a/community-staging/haskell-dataenc/PKGBUILD +++ b/community-staging/haskell-dataenc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72228 2012-06-11 03:32:24Z tdziedzic $ +# $Id: PKGBUILD 76083 2012-09-11 05:12:24Z tdziedzic $ # Maintainer: Vesa Kaihlavirta # Contributor: Arch Haskell Team # Package generated by cabal2arch 0.7.5 @@ -6,18 +6,24 @@ _hkgname=dataenc pkgname=haskell-dataenc pkgver=0.14.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="Data encoding library" url="http://hackage.haskell.org/package/dataenc" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' sh) -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +depends=('ghc=7.6.1-1' sh) +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz + '0001-update-build-deps-for-ghc-7.6.1.patch') install=${pkgname}.install -md5sums=('643a8c022b9c840f801faf9a661fe637') +md5sums=('643a8c022b9c840f801faf9a661fe637' + '662056adcb79efe8898298c271b49600') build() { cd ${srcdir}/${_hkgname}-${pkgver} + + # update build deps for ghc 7.6.1 + patch -Np1 -i ${srcdir}/0001-update-build-deps-for-ghc-7.6.1.patch + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ --libsubdir=\$compiler/site-local/\$pkgid 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 +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 diff --git a/community-staging/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch b/community-staging/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch new file mode 100644 index 000000000..b8c2264bc --- /dev/null +++ b/community-staging/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch @@ -0,0 +1,50 @@ +From bd14edd6240c72baa22822338fc872e6827af680 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic +Date: Tue, 11 Sep 2012 06:24:09 -0700 +Subject: [PATCH] update changed time code for ghc 7.6.1 + +--- + Codec/Archive/Tar/Pack.hs | 9 +++++---- + tar.cabal | 2 +- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/Codec/Archive/Tar/Pack.hs b/Codec/Archive/Tar/Pack.hs +index 8e43091..0af6103 100644 +--- a/Codec/Archive/Tar/Pack.hs ++++ b/Codec/Archive/Tar/Pack.hs +@@ -28,8 +28,8 @@ import qualified System.FilePath as FilePath.Native + import System.Directory + ( getDirectoryContents, doesDirectoryExist, getModificationTime + , Permissions(..), getPermissions ) +-import System.Time +- ( ClockTime(..) ) ++import Data.Time.Clock.POSIX ++ ( utcTimeToPOSIXSeconds ) + import System.IO + ( IOMode(ReadMode), openBinaryFile, hFileSize ) + import System.IO.Unsafe (unsafeInterleaveIO) +@@ -170,5 +170,6 @@ recurseDirectories base (dir:dirs) = unsafeInterleaveIO $ do + + getModTime :: FilePath -> IO EpochTime + getModTime path = do +- (TOD s _) <- getModificationTime path +- return $! fromIntegral s ++ utcTime <- getModificationTime path ++ let s = truncate . utcTimeToPOSIXSeconds $ utcTime ++ return $! s +diff --git a/tar.cabal b/tar.cabal +index e748b07..d85b0da 100644 +--- a/tar.cabal ++++ b/tar.cabal +@@ -25,7 +25,7 @@ source-repository head + + library + build-depends: base >= 3 && < 5, filepath, +- directory, old-time, bytestring ++ directory, bytestring, time + + exposed-modules: + Codec.Archive.Tar +-- +1.7.12 + diff --git a/community-staging/haskell-tar/PKGBUILD b/community-staging/haskell-tar/PKGBUILD new file mode 100644 index 000000000..438145b82 --- /dev/null +++ b/community-staging/haskell-tar/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 76085 2012-09-11 06:28:53Z tdziedzic $ +# Maintainer: Alexander Rødseth +# Contributor: Arch Haskell Team + +pkgname=haskell-tar +pkgver=0.4.0.0 +pkgrel=3 +pkgdesc="Reading, writing and manipulating \".tar\" archive files." +url="http://hackage.haskell.org/package/tar" +license=('custom:BSD3') +arch=('x86_64' 'i686') +depends=('ghc=7.6.1-1') +source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz" + '0001-update-changed-time-code-for-ghc-7.6.1.patch') +install=haskell-tar.install +sha256sums=('a3d37be1b8666c16c6371d193a0795b8abe7b0216e81870a2666e1e85d931113' + '17b8afc519db5bed5d89807e6e659788f5d9c2f5c569150a9d1c6faac52e98e6') + +build() { + cd "$srcdir/tar-$pkgver" + + # time functions have changed in ghc 7.6.1 + patch -Np1 -i ${srcdir}/0001-update-changed-time-code-for-ghc-7.6.1.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 + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd "$srcdir/tar-$pkgver" + + install -Dm 744 register.sh \ + "$pkgdir/usr/share/haskell/$pkgname/register.sh" + install -m 744 unregister.sh \ + "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" + install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries" + ln -s "/usr/share/doc/$pkgname/html" \ + "$pkgdir/usr/share/doc/ghc/html/libraries/tar" + runhaskell Setup copy --destdir="$pkgdir" + install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/haskell-tar/haskell-tar.install b/community-staging/haskell-tar/haskell-tar.install new file mode 100644 index 000000000..7e0383621 --- /dev/null +++ b/community-staging/haskell-tar/haskell-tar.install @@ -0,0 +1,24 @@ +HS_DIR=usr/share/haskell/haskell-tar + +post_install() { + ${HS_DIR}/register.sh + post_remove +} + +pre_upgrade() { + ${HS_DIR}/unregister.sh +} + +post_upgrade() { + post_install +} + +pre_remove() { + pre_upgrade +} + +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + +# vim:set ts=2 sw=2 et: diff --git a/community-staging/haskell-x11-xft/PKGBUILD b/community-staging/haskell-x11-xft/PKGBUILD new file mode 100644 index 000000000..356821274 --- /dev/null +++ b/community-staging/haskell-x11-xft/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 76130 2012-09-11 20:58:01Z jelle $ +# Maintainer: Sergej Pupykin + +_hkgname=X11-xft +pkgname=haskell-x11-xft +pkgver=0.3.1 +pkgrel=5 +pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts" +url="http://hackage.haskell.org/package/${_hkgname}" +license=('LGPL') +arch=('i686' 'x86_64') +depends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' 'haskell-utf8-string=0.3.7' 'libxft') +options=('strip') +install=haskell-x11-xft.install +source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz) +md5sums=('ad885150a59f63de328e73abe5ffc79e') + +build() { + cd ${srcdir}/${_hkgname}-${pkgver} + 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 + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd ${srcdir}/${_hkgname}-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community-staging/haskell-x11-xft/haskell-x11-xft.install b/community-staging/haskell-x11-xft/haskell-x11-xft.install new file mode 100644 index 000000000..a0ff8dac8 --- /dev/null +++ b/community-staging/haskell-x11-xft/haskell-x11-xft.install @@ -0,0 +1,18 @@ +HS_DIR=/usr/share/haskell/haskell-x11-xft +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community-staging/haskell-x11/PKGBUILD b/community-staging/haskell-x11/PKGBUILD new file mode 100644 index 000000000..ba44c0a70 --- /dev/null +++ b/community-staging/haskell-x11/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 76125 2012-09-11 19:44:43Z jelle $ +# Maintainer: Sergej Pupykin +# Contributor: shild +# Maintainer: Vesa Kaihlavirta + +_hkgname=X11 +pkgname=haskell-x11 +pkgver=1.6.0.2 +pkgrel=1 +pkgdesc="A Haskell binding to the X11 graphics library." +arch=(i686 x86_64) +url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11" +license=('custom:BSD3') +options=('strip') +depends=("ghc=7.6.1-1" "haskell-syb=0.3.7" 'libx11' 'libxinerama' 'libxrandr') +conflicts=(haskell-x11-extras) +install=hsmod.install +source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz) +md5sums=('0227ba7a8788c3cfd146e952a5fafc82') + +build() { + cd ${srcdir}/${_hkgname}-${pkgver} + 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 + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd ${srcdir}/${_hkgname}-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community-staging/haskell-x11/hsmod.install b/community-staging/haskell-x11/hsmod.install new file mode 100644 index 000000000..45c23b979 --- /dev/null +++ b/community-staging/haskell-x11/hsmod.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/haskell-x11 +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} -- cgit v1.2.3-54-g00ecf