diff options
author | root <root@rshg054.dnsready.net> | 2012-10-10 00:43:13 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2012-10-10 00:43:13 -0700 |
commit | 769ba4645df3c2f793bc2d3ee245573b79b206d3 (patch) | |
tree | 13e34d51217ced7053937eb57c7e12664fd881b5 /community | |
parent | 26bcb2409416374f6728bd9b863e4fd147adccb3 (diff) |
Wed Oct 10 00:43:09 PDT 2012
Diffstat (limited to 'community')
50 files changed, 1366 insertions, 265 deletions
diff --git a/community/alex/PKGBUILD b/community/alex/PKGBUILD index b7cc2cb52..380db3bd6 100644 --- a/community/alex/PKGBUILD +++ b/community/alex/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 72380 2012-06-13 13:45:40Z tdziedzic $ +# $Id: PKGBUILD 77336 2012-10-09 04:16:39Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Philip Nilsson <pnilsson@nullref.se> pkgname=alex pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc='a lexical analyser generator for Haskell' arch=('i686' 'x86_64') -url='http://www.haskell.org/alex/' +url='http://hackage.haskell.org/package/alex' license=('custom:BSD3') depends=('gmp') -makedepends=('ghc=7.4.2-1' 'haskell-quickcheck=2.4.2-2') +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') diff --git a/community/avr-gcc/PKGBUILD b/community/avr-gcc/PKGBUILD index 2b28e0904..36ed19ef1 100644 --- a/community/avr-gcc/PKGBUILD +++ b/community/avr-gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75204 2012-08-16 01:56:23Z allan $ +# $Id: PKGBUILD 77419 2012-10-09 18:03:26Z schuay $ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -8,8 +8,8 @@ pkgname=avr-gcc _pkgname=gcc -pkgver=4.7.1 -pkgrel=2 +pkgver=4.7.2 +pkgrel=1 pkgdesc="The GNU AVR Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'custom') @@ -69,4 +69,4 @@ package() { rm -rf ${pkgdir}/usr/share/info } -md5sums=('933e6f15f51c031060af64a9e14149ff') +md5sums=('cc308a0891e778cfda7a151ab8a6e762') diff --git a/community/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch b/community/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch new file mode 100644 index 000000000..1c6a7dd65 --- /dev/null +++ b/community/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 <gostrc@gmail.com> +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/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD index 7f03c504e..f7dedfd1f 100644 --- a/community/gtk2hs-buildtools/PKGBUILD +++ b/community/gtk2hs-buildtools/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 72381 2012-06-13 13:45:43Z tdziedzic $ +# $Id: PKGBUILD 77337 2012-10-09 04:16:44Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=gtk2hs-buildtools pkgver=0.12.3.1 -pkgrel=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' 'alex' 'happy' 'haskell-random') +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) -md5sums=('612611d831635024c953d2817b124e29') +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 } diff --git a/community/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch b/community/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch new file mode 100644 index 000000000..2e687db21 --- /dev/null +++ b/community/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 <gostrc@gmail.com> +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/haddock/PKGBUILD b/community/haddock/PKGBUILD index 81a65961c..274cc7851 100644 --- a/community/haddock/PKGBUILD +++ b/community/haddock/PKGBUILD @@ -1,31 +1,30 @@ -# Maintainer: -# Contributor: Alexander Rødseth <rodseth@gmail.com> +# Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haddock -pkgver=2.10.0 -pkgrel=2 +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' 'happy') -depends=('ghc=7.4.2-1' 'haskell-xhtml=3000.2.1-1' 'haskell-ghc-paths=0.1.0.8-8') +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") -sha256sums=('d107dba15e8aee5abcb540b818b5dcb8ced98bae7d0714f50192dba26cadb410') +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" - - # These doesn't make haddock work for ghc 7.4.1 - #sed -i 's:ghc >= 7.2 && < 7.4:ghc:' haddock.cabal - #sed -i 's:base >= 4.3 && < 4.5:base:' haddock.cabal - #sed -i 's:#elif __GLASGOW_HASKELL__ == 703:#elif __GLASGOW_HASKELL__ == 704:' src/Haddock/InterfaceFile.hs - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/"$pkgname" --libsubdir=\$compiler/site-local/\$pkgid + 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 @@ -37,11 +36,15 @@ 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 -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" + 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/happy/PKGBUILD b/community/happy/PKGBUILD index fb8ecf1f5..99e4581d9 100644 --- a/community/happy/PKGBUILD +++ b/community/happy/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 72383 2012-06-13 13:45:51Z tdziedzic $ +# $Id: PKGBUILD 77339 2012-10-09 04:16:54Z tdziedzic $ # Maintainer: Thomas Dziedzic <gostrc@gmail.com> # Contributor: simo <simo@archlinux.org> # Contributor: Vesa Kaihlavirta <vegai@iki.fi> pkgname=happy -pkgver=1.18.9 -pkgrel=5 +pkgver=1.18.10 +pkgrel=1 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') +md5sums=('a1638e89434427e57f68ef311761dc30') 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/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD index 081f77510..3f0ee6008 100644 --- a/community/haskell-bytestring-show/PKGBUILD +++ b/community/haskell-bytestring-show/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 75911 2012-09-05 10:26:10Z spupykin $ +# $Id: PKGBUILD 77340 2012-10-09 04:16:59Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-bytestring-show -pkgver=0.3.5.2 +pkgver=0.3.5.3 pkgrel=1 pkgdesc="Efficient conversion of values into readable byte strings." -#url="http://code.haskell.org/~dolio/" -url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/bytestring-show" +url="http://hackage.haskell.org/package/bytestring-show" license=("BSD3") arch=('i686' 'x86_64') -depends=("ghc=7.4.2-1") +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=('bd7cc8c9da04814d5c81041f8f087a8c') +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 diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD index a292c37c8..f5053689a 100644 --- a/community/haskell-cairo/PKGBUILD +++ b/community/haskell-cairo/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 72385 2012-06-13 13:46:01Z tdziedzic $ +# $Id: PKGBUILD 77341 2012-10-09 04:17:04Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-cairo pkgver=0.12.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Binding to the cairo library for Gtk2Hs." url="http://hackage.haskell.org/package/cairo" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'cairo' 'haskell-mtl=2.1.1-1') +depends=('ghc=7.6.1-1' 'cairo' 'haskell-mtl=2.1.2-1') makedepends=("gtk2hs-buildtools") options=('strip') conflicts=('gtk2hs-cairo') diff --git a/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch b/community/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch new file mode 100644 index 000000000..9f544bb27 --- /dev/null +++ b/community/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 <gostrc@gmail.com> +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/haskell-dataenc/PKGBUILD b/community/haskell-dataenc/PKGBUILD index 1bedcdbad..758f25719 100644 --- a/community/haskell-dataenc/PKGBUILD +++ b/community/haskell-dataenc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 72386 2012-06-13 13:46:06Z tdziedzic $ +# $Id: PKGBUILD 77342 2012-10-09 04:17:11Z tdziedzic $ # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> # 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/haskell-extensible-exceptions/PKGBUILD b/community/haskell-extensible-exceptions/PKGBUILD new file mode 100644 index 000000000..2f2fbaa3c --- /dev/null +++ b/community/haskell-extensible-exceptions/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 77370 2012-10-09 08:29:13Z foutrelis $ +# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> + +_hkgname=extensible-exceptions +pkgname=haskell-${_hkgname} +pkgver=0.1.1.4 +pkgrel=3 +pkgdesc="extensible exceptions for both new and old versions of GHC" +url="http://hackage.haskell.org/package/extensible-exceptions" +license=('custom:BSD3') +arch=('i686' 'x86_64') +depends=('ghc=7.6.1-1' sh) +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=$pkgname.install +md5sums=('fa1cadd15c1c7aa362618d41c6e17d8b') + +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/haskell-extensible-exceptions/haskell-extensible-exceptions.install b/community/haskell-extensible-exceptions/haskell-extensible-exceptions.install new file mode 100644 index 000000000..20c7dce30 --- /dev/null +++ b/community/haskell-extensible-exceptions/haskell-extensible-exceptions.install @@ -0,0 +1,19 @@ +HS_DIR=usr/share/haskell/haskell-extensible-exceptions +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/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD index 25bb789ee..1e23d3c10 100644 --- a/community/haskell-ghc-paths/PKGBUILD +++ b/community/haskell-ghc-paths/PKGBUILD @@ -4,12 +4,12 @@ pkgname=haskell-ghc-paths pkgver=0.1.0.8 -pkgrel=8 +pkgrel=9 pkgdesc="Knowledge of GHC's installation directories" url="http://hackage.haskell.org/package/ghc-paths" license=('custom:BSD3') arch=('x86_64' 'i686') -depends=('ghc=7.4.2-1') +depends=('ghc=7.6.1-1') source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz") install=haskell-ghc-paths.install md5sums=('d2b23dc563888e380588501d2ce1d82b') diff --git a/community/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch b/community/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch new file mode 100644 index 000000000..845beb2bd --- /dev/null +++ b/community/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch @@ -0,0 +1,55 @@ +From 7e677b1c633d2b426fc956fcfa084a82ef6df861 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Thu, 27 Sep 2012 04:48:10 -0700 +Subject: [PATCH] compatibility with ghc 7.6.1 + +--- + System/Glib/GObject.chs | 4 +--- + System/Glib/MainLoop.chs | 4 ++-- + 2 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/System/Glib/GObject.chs b/System/Glib/GObject.chs +index 5f0fe5c..9925d2c 100644 +--- a/System/Glib/GObject.chs ++++ b/System/Glib/GObject.chs +@@ -127,8 +127,6 @@ makeNewGObject (constr, objectUnref) generator = do + + {#pointer GDestroyNotify as DestroyNotify#} + +-foreign import ccall "wrapper" mkDestroyNotifyPtr :: IO () -> IO DestroyNotify +- + -- | This function wraps any newly created objects that derives from + -- GInitiallyUnowned also known as objects with + -- \"floating-references\". The object will be refSink (for glib +@@ -225,4 +223,4 @@ isA obj gType = + -- at this point we would normally implement the notify signal handler; + -- I've moved this definition into the Object class of the gtk package + -- since there's a quite a bit of machinery missing here (generated signal +--- register functions and the problem of recursive modules) +\ No newline at end of file ++-- register functions and the problem of recursive modules) +diff --git a/System/Glib/MainLoop.chs b/System/Glib/MainLoop.chs +index 72fecb6..feb4c77 100644 +--- a/System/Glib/MainLoop.chs ++++ b/System/Glib/MainLoop.chs +@@ -71,7 +71,7 @@ import System.Glib.GObject (DestroyNotify, destroyFunPtr) + + {#pointer SourceFunc#} + +-foreign import ccall "wrapper" mkSourceFunc :: IO {#type gint#} -> IO SourceFunc ++foreign import ccall "wrapper" mkSourceFunc :: (Ptr () -> IO {#type gint#}) -> IO SourceFunc + + type HandlerId = {#type guint#} + +@@ -79,7 +79,7 @@ type HandlerId = {#type guint#} + -- + makeCallback :: IO {#type gint#} -> IO (SourceFunc, DestroyNotify) + makeCallback fun = do +- funPtr <- mkSourceFunc fun ++ funPtr <- mkSourceFunc (const fun) + return (funPtr, destroyFunPtr) + + -- | Sets a function to be called at regular intervals, with the default +-- +1.7.12.1 + diff --git a/community/haskell-glib/PKGBUILD b/community/haskell-glib/PKGBUILD index 367c45adb..2ea2ff587 100644 --- a/community/haskell-glib/PKGBUILD +++ b/community/haskell-glib/PKGBUILD @@ -1,25 +1,30 @@ -# $Id: PKGBUILD 72388 2012-06-13 13:46:17Z tdziedzic $ +# $Id: PKGBUILD 77344 2012-10-09 04:17:23Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-glib pkgver=0.12.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Binding to the GLIB library for Gtk2Hs." url="http://hackage.haskell.org/package/glib" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'glib2') +depends=('ghc=7.6.1-1' 'glib2') makedepends=("gtk2hs-buildtools") options=('strip') install=gtk2hs-glib.install provides=('gtk2hs-glib') replaces=('gtk2hs-glib') conflicts=('gtk2hs-glib') -source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz) -md5sums=('f2899bd2a2850fe95479ddb63490eb04') +source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz + '0001-compatibility-with-ghc-7.6.1.patch') +md5sums=('f2899bd2a2850fe95479ddb63490eb04' + 'b00660b7102542942b0b9d84b59d1f3c') build() { - cd ${srcdir}/glib-$pkgver + cd glib-$pkgver + + patch -Np1 -i ${srcdir}/0001-compatibility-with-ghc-7.6.1.patch + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/haskell-glib \ --libsubdir=\$compiler/site-local/\$pkgid diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD index 064702b29..89e49dc07 100644 --- a/community/haskell-gtk/PKGBUILD +++ b/community/haskell-gtk/PKGBUILD @@ -1,40 +1,48 @@ -# $Id: PKGBUILD 73280 2012-07-05 11:48:30Z spupykin $ +# $Id: PKGBUILD 77345 2012-10-09 04:17:32Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-gtk pkgver=0.12.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Binding to the gtk library for Gtk2Hs." url="http://hackage.haskell.org/package/gtk" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc' 'gtk2' "haskell-pango=0.12.3-2" 'haskell-mtl=2.1.1-1') +depends=('ghc' 'gtk2' "haskell-pango" 'haskell-mtl') makedepends=("gtk2hs-buildtools") provides=('gtk2hs-gtk') replaces=('gtk2hs-gtk') conflicts=('gtk2hs-gtk') options=('strip') install=gtk2hs-gtk.install -source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz) -md5sums=('b10dfe92d2e4dfe3c0c92dd349489727') +source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz + ghc-7.6.1.patch) +md5sums=('b10dfe92d2e4dfe3c0c92dd349489727' + '5fb93f37fe3f494b30ee682a36b8f1b6') build() { - cd ${srcdir}/gtk-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \ - --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 + cd ${srcdir}/gtk-${pkgver} + patch -p1 <$srcdir/ghc-7.6.1.patch + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \ + --libsubdir=\$compiler/site-local/\$pkgid + sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/UI/Gtk/Types.chs + 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}/gtk-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk - runhaskell Setup copy --destdir=${pkgdir} + _hmtlver=`pacman -Q haskell-mtl | cut -f2 -d\ | cut -f1 -d-` + _hpangover=`pacman -Q haskell-pango | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc" "gtk2" "haskell-pango=${_hpangover}" "haskell-mtl=${_hmtlver}") + + cd ${srcdir}/gtk-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk + runhaskell Setup copy --destdir=${pkgdir} } diff --git a/community/haskell-gtk/ghc-7.6.1.patch b/community/haskell-gtk/ghc-7.6.1.patch new file mode 100644 index 000000000..5e259a38f --- /dev/null +++ b/community/haskell-gtk/ghc-7.6.1.patch @@ -0,0 +1,574 @@ +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs gtk/Graphics/UI/Gtk/Abstract/Object.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Abstract/Object.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -126,7 +126,8 @@ + + {#pointer GWeakNotify#} + +-foreign import ccall "wrapper" mkDestructor :: IO () -> IO GWeakNotify ++foreign import ccall "wrapper" mkDestructor ++ :: (Ptr () -> Ptr GObject -> IO ()) -> IO GWeakNotify + + -- | Attach a callback that will be called after the + -- destroy hooks have been called +@@ -134,7 +135,7 @@ + objectWeakref :: ObjectClass o => o -> IO () -> IO GWeakNotify + objectWeakref obj uFun = do + funPtrContainer <- newIORef nullFunPtr +- uFunPtr <- mkDestructor $ do ++ uFunPtr <- mkDestructor $ \_ _ -> do + uFun + funPtr <- readIORef funPtrContainer + freeHaskellFunPtr funPtr +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs gtk/Graphics/UI/Gtk/Entry/Entry.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Entry/Entry.chs 2012-10-02 16:27:26.000000000 +0400 +@@ -78,6 +78,10 @@ + entrySetCompletion, + entryGetCompletion, + #endif ++#if GTK_CHECK_VERSION (2,18,0) ++ entryGetBuffer, ++ entrySetBuffer, ++#endif + #if GTK_CHECK_VERSION(2,20,0) + entryGetIconWindow, + entryGetTextWindow, +@@ -104,6 +108,9 @@ + entryAlignment, + entryCompletion, + #endif ++#if GTK_CHECK_VERSION (2,18,0) ++ entryBuffer, ++#endif + + -- * Signals + entryActivate, +@@ -157,6 +164,9 @@ + import Graphics.UI.Gtk.Gdk.EventM (EventM, EButton, EKey) + import Control.Monad.Reader ( ask ) + import Control.Monad.Trans ( liftIO ) ++#if GTK_CHECK_VERSION (2,18,0) ++import Graphics.UI.Gtk.Entry.EntryBuffer ++#endif + {#import Graphics.UI.Gtk.Types#} + {#import Graphics.UI.Gtk.Signals#} + +@@ -429,6 +439,23 @@ + (toEntry self) + #endif + ++#if GTK_CHECK_VERSION(2,18,0) ++-- | Get the 'EntryBuffer' object which holds the text for this widget. ++entryGetBuffer :: EntryClass self => self ++ -> IO EntryBuffer ++entryGetBuffer self = ++ makeNewGObject mkEntryBuffer $ ++ {# call gtk_entry_get_buffer #} ++ (toEntry self) ++ ++-- | Set the 'EntryBuffer' object which holds the text for this widget. ++entrySetBuffer :: (EntryClass self, EntryBufferClass buffer) => self ++ -> buffer -> IO () ++entrySetBuffer self = ++ {# call gtk_entry_set_buffer #} ++ (toEntry self) . toEntryBuffer ++#endif ++ + #if GTK_CHECK_VERSION(2,20,0) + -- | Returns the 'Window' which contains the entry's icon at @iconPos@. This function is useful when + -- drawing something to the entry in an 'eventExpose' callback because it enables the callback to +@@ -623,6 +650,15 @@ + entrySetCompletion + #endif + ++#if GTK_CHECK_VERSION(2,18,0) ++entryBuffer :: (EntryClass self, EntryBufferClass buffer) => ++ ReadWriteAttr self EntryBuffer buffer ++entryBuffer = newAttr ++ entryGetBuffer ++ entrySetBuffer ++#endif ++ ++ + -------------------- + -- Signals + +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc gtk/Graphics/UI/Gtk/Gdk/EventM.hsc +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 2012-10-02 16:27:27.000000000 +0400 +@@ -639,14 +639,16 @@ + + + -- | Execute an event handler and assume it handled the event unless it +--- threw a pattern match exception. ++-- threw a pattern match exception or calls mzero (e.g. via guard). + tryEvent :: EventM any () -> EventM any Bool + tryEvent act = do + ptr <- ask + liftIO $ (runReaderT (act >> return True) ptr) + #if __GLASGOW_HASKELL__ >= 610 + `catches` [ Handler (\ (PatternMatchFail _) -> return False) +- , Handler (\ e -> if isUserError e && "Pattern" `isPrefixOf` ioeGetErrorString e ++ , Handler (\ e -> if isUserError e && ++ ("Pattern" `isPrefixOf` ioeGetErrorString e || ++ "mzero" == ioeGetErrorString e) + then return False + else throw e) ] + #else +@@ -654,6 +656,8 @@ + IOException e + | "user error (Pattern" `isPrefixOf` show e -> + return False ++ | "user error (mzero" `isPrefixOf` show e -> ++ return False + PatternMatchFail _ -> return False + _ -> throw e) + #endif +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 2012-10-02 16:27:28.000000000 +0400 +@@ -69,6 +69,7 @@ + + -- * Constructors + pixbufNew, ++ pixbufNewFromData, + pixbufNewFromFile, + #if GTK_CHECK_VERSION(2,4,0) + pixbufNewFromFileAtSize, +@@ -402,6 +403,19 @@ + (fromBool hasAlpha) (fromIntegral bitsPerSample) (fromIntegral width) + (fromIntegral height) + ++pixbufNewFromData :: Ptr CUChar -> Colorspace -> Bool -> Int -> Int -> Int -> Int -> IO Pixbuf ++pixbufNewFromData imData cSpace hasAlpha bitsPerSample width height rowStride ++ = wrapNewGObject mkPixbuf $ ++ {#call pixbuf_new_from_data #} ++ imData ++ (fromIntegral . fromEnum $ cSpace) ++ (fromBool hasAlpha) ++ (fromIntegral bitsPerSample) ++ (fromIntegral width) ++ (fromIntegral height) ++ (fromIntegral rowStride) ++ nullFunPtr nullPtr ++ + -- | Create a new image from a String. + -- + -- * Creates a new pixbuf from a string description. +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs gtk/Graphics/UI/Gtk/General/Clipboard.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/General/Clipboard.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -260,7 +260,7 @@ + -- data succeeded. + clipboardSetWithData self targets getFunc clearFunc = do + gFunPtr <- mkClipboardGetFunc +- (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ()) ++ (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ()) + cFunPtr <- mkClipboardClearFunc + (\_ _ -> clearFunc) + res <- withTargetEntries targets $ \nTargets targets -> +@@ -282,7 +282,7 @@ + {#pointer ClipboardClearFunc#} + + foreign import ccall "wrapper" mkClipboardGetFunc :: +- (Ptr Clipboard -> Ptr () -> {#type guint#} -> IO ()) -> IO ClipboardGetFunc ++ (Ptr Clipboard -> Ptr () -> {#type guint#} -> Ptr () -> IO ()) -> IO ClipboardGetFunc + + foreign import ccall "wrapper" mkClipboardClearFunc :: + (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardClearFunc +@@ -313,7 +313,7 @@ + -- ignored. + clipboardSetWithOwner self targets getFunc clearFunc owner = do + gFunPtr <- mkClipboardGetFunc +- (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ()) ++ (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ()) + cFunPtr <- mkClipboardClearFunc + (\_ _ -> clearFunc) + res <- withTargetEntries targets $ \nTargets targets -> +@@ -404,7 +404,7 @@ + clipboardRequestContents self (Atom target) callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardReceivedFunc +- (\_ sPtr -> do ++ (\_ sPtr _ -> do + freeHaskellFunPtr =<< readIORef cbRef + runReaderT callback sPtr + return ()) +@@ -418,7 +418,7 @@ + {#pointer ClipboardReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardReceivedFunc :: +- (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc ++ (Ptr Clipboard -> Ptr () -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc + + -- %hash c:7bb1 d:4ef1 + -- | Requests the contents of the clipboard as text. When the text is later +@@ -439,7 +439,7 @@ + clipboardRequestText self callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardTextReceivedFunc +- (\_ sPtr -> do ++ (\_ sPtr _ -> do + freeHaskellFunPtr =<< readIORef cbRef + mStr <- if sPtr==nullPtr then return Nothing else + liftM Just $ peekUTFString sPtr +@@ -453,7 +453,7 @@ + {#pointer ClipboardTextReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardTextReceivedFunc :: +- (Ptr Clipboard -> CString -> IO ()) -> IO ClipboardTextReceivedFunc ++ (Ptr Clipboard -> CString -> Ptr () -> IO ()) -> IO ClipboardTextReceivedFunc + + + #if GTK_CHECK_VERSION(2,6,0) +@@ -477,7 +477,7 @@ + clipboardRequestImage self callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardImageReceivedFunc +- (\_ sPtr -> do ++ (\_ sPtr _ -> do + freeHaskellFunPtr =<< readIORef cbRef + mPixbuf <- maybeNull (makeNewGObject mkPixbuf) (return sPtr) + callback mPixbuf) +@@ -490,7 +490,7 @@ + {#pointer ClipboardImageReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardImageReceivedFunc :: +- (Ptr Clipboard -> Ptr Pixbuf -> IO ()) -> IO ClipboardImageReceivedFunc ++ (Ptr Clipboard -> Ptr Pixbuf -> Ptr () -> IO ()) -> IO ClipboardImageReceivedFunc + + #endif + +@@ -513,7 +513,7 @@ + clipboardRequestTargets self callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardTargetsReceivedFunc +- (\_ tPtr len -> do ++ (\_ tPtr len _ -> do + -- We must free Haskell pointer *in* the callback to avoid segfault. + freeHaskellFunPtr =<< readIORef cbRef + mTargets <- if tPtr==nullPtr then return Nothing else +@@ -528,7 +528,7 @@ + {#pointer ClipboardTargetsReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardTargetsReceivedFunc :: +- (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> IO ()) -> IO ClipboardTargetsReceivedFunc ++ (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> Ptr () -> IO ()) -> IO ClipboardTargetsReceivedFunc + + #if GTK_CHECK_VERSION(2,10,0) + -- %hash c:5601 d:d6a6 +@@ -552,10 +552,10 @@ + clipboardRequestRichText self buffer callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardRichTextReceivedFunc +- (\_ tPtr sPtr len -> do ++ (\_ tPtr sPtr len _ -> do + freeHaskellFunPtr =<< readIORef cbRef + mRes <- if sPtr==nullPtr then return Nothing else liftM Just $ do +- str <- peekUTFStringLen (sPtr,fromIntegral len) ++ str <- peekUTFStringLen (castPtr sPtr,fromIntegral len) + return (Atom tPtr, str) + callback mRes) + writeIORef cbRef cbPtr +@@ -568,7 +568,7 @@ + {#pointer ClipboardRichTextReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardRichTextReceivedFunc :: +- (Ptr Clipboard -> Ptr () -> CString -> {#type gsize#} -> IO ()) -> ++ (Ptr Clipboard -> Ptr () -> Ptr CUChar -> {#type gsize#} -> Ptr () -> IO ()) -> + IO ClipboardRichTextReceivedFunc + #endif + #endif +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs gtk/Graphics/UI/Gtk/General/General.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/General/General.chs 2012-10-02 16:27:28.000000000 +0400 +@@ -202,7 +202,7 @@ + -- their arguments from the main loop, that is, from the OS thread of Gtk, + -- thereby ensuring that any Gtk and OS function can be called. + -- +-{#fun unsafe gdk_threads_enter as threadsEnter {} -> `()' #} ++{#fun gdk_threads_enter as threadsEnter {} -> `()' #} + + -- | Release the global Gtk lock. + -- +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -493,17 +493,17 @@ + {# call gtk_combo_box_set_row_separator_func #} + (toComboBox self) nullFunPtr nullPtr nullFunPtr + comboBoxSetRowSeparatorSource self (Just (model, extract)) = do +- funPtr <- mkRowSeparatorFunc $ \_ iterPtr -> do ++ funPtr <- mkRowSeparatorFunc $ \_ iterPtr _ -> do + iter <- peek iterPtr + value <- customStoreGetRow model iter +- return (extract value) ++ return (fromBool $ extract value) + {# call gtk_combo_box_set_row_separator_func #} + (toComboBox self) funPtr (castFunPtrToPtr funPtr) destroyFunPtr + + {#pointer TreeViewRowSeparatorFunc#} + + foreign import ccall "wrapper" mkRowSeparatorFunc :: +- (Ptr TreeModel -> Ptr TreeIter -> IO Bool) -> IO TreeViewRowSeparatorFunc ++ (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean #}) -> IO TreeViewRowSeparatorFunc + + -- %hash c:5bf8 + -- | Sets whether the popup menu should have a tearoff menu item. +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 2012-10-02 16:27:30.000000000 +0400 +@@ -76,6 +76,12 @@ + menuItemNewWithMnemonic, + + -- * Methods ++#if GTK_CHECK_VERSION(2,16,0) ++ menuItemSetLabel, ++ menuItemGetLabel, ++ menuItemSetUseUnderline, ++ menuItemGetUseUnderline, ++#endif + menuItemSetSubmenu, + menuItemGetSubmenu, + menuItemRemoveSubmenu, +@@ -89,6 +95,10 @@ + -- * Attributes + menuItemSubmenu, + menuItemRightJustified, ++#if GTK_CHECK_VERSION(2,16,0) ++ menuItemLabel, ++ menuItemUseUnderline, ++#endif + + -- * Signals + menuItemActivateItem, +@@ -163,7 +173,36 @@ + + -------------------- + -- Methods ++#if GTK_CHECK_VERSION(2,16,0) ++-- | Sets text on the MenuItem label ++ ++menuItemSetLabel :: (MenuItemClass self) => self -> String -> IO () ++menuItemSetLabel self label = ++ withUTFString label $ {# call gtk_menu_item_set_label #} (toMenuItem self) ++ ++-- | Gets text on the MenuItem label ++menuItemGetLabel :: (MenuItemClass self) => self -> IO String ++menuItemGetLabel self = ++ {# call gtk_menu_item_get_label #} ++ (toMenuItem self) ++ >>= \strPtr -> if strPtr == nullPtr ++ then return "" ++ else peekUTFString strPtr ++ ++-- | If True, an underline in the text indicates the next character should be used for the mnemonic accelerator key. ++-- ++menuItemSetUseUnderline :: (MenuItemClass self) => self -> Bool -> IO () ++menuItemSetUseUnderline self = ++ {# call gtk_menu_item_set_use_underline #} (toMenuItem self) . fromBool + ++-- | Checks if an underline in the text indicates the next character should be used for the mnemonic accelerator key. ++-- ++menuItemGetUseUnderline :: (MenuItemClass self) => self -> IO Bool ++menuItemGetUseUnderline self = ++ liftM toBool $ {# call gtk_menu_item_get_use_underline #} ++ (toMenuItem self) ++ ++#endif + -- | Sets the item's submenu, or changes it. + -- + menuItemSetSubmenu :: (MenuItemClass self, MenuClass submenu) => self -> submenu -> IO () +@@ -278,6 +317,22 @@ + menuItemGetRightJustified + menuItemSetRightJustified + ++#if GTK_CHECK_VERSION(2,16,0) ++-- | \'label\' property. See 'menuItemSetLabel' and 'menuItemGetLabel' ++-- ++menuItemLabel :: MenuItemClass self => Attr self String ++menuItemLabel = newAttr ++ menuItemGetLabel ++ menuItemSetLabel ++ ++-- | \'useUnderline\' property. See 'menuItemSetUseUnderline' and ++-- 'menuItemGetUseEUnderline' ++-- ++menuItemUseUnderline :: MenuItemClass self => Attr self Bool ++menuItemUseUnderline = newAttr ++ menuItemGetUseUnderline ++ menuItemSetUseUnderline ++#endif + -------------------- + -- Signals + +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs 2012-10-02 16:27:33.000000000 +0400 +@@ -239,7 +239,7 @@ + customTreeDragSourceIface = fromMaybe dummyDragSource mDragSource, + customTreeDragDestIface = fromMaybe dummyDragDest mDragDest } + privPtr <- newStablePtr priv +- liftM con $ makeNewGObject (CustomStore, objectUnref) $ ++ liftM con $ wrapNewGObject (CustomStore, objectUnref) $ + gtk2hs_store_new implPtr privPtr + + foreign import ccall unsafe "Gtk2HsStore.h gtk2hs_store_new" +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -427,7 +427,7 @@ + {#pointer TreeModelForeachFunc#} + + foreign import ccall "wrapper" mkTreeModelForeachFunc :: +- (Ptr () -> Ptr () -> Ptr TreeIter -> Ptr () -> IO CInt) -> ++ (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO CInt) -> + IO TreeModelForeachFunc + + #if GTK_CHECK_VERSION(2,2,0) +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -160,7 +160,7 @@ + {#pointer TreeModelFilterVisibleFunc #} + + foreign import ccall "wrapper" mkTreeModelFilterVisibleFunc :: +- (Ptr TreeModelFilter -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) -> ++ (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) -> + IO TreeModelFilterVisibleFunc + + -- %hash c:a56d d:b42e +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -151,7 +151,7 @@ + treeSelectionSetSelectFunction :: TreeSelectionClass self => self + -> TreeSelectionCB -> IO () + treeSelectionSetSelectFunction ts fun = do +- fPtr <- mkTreeSelectionFunc (\_ _ tp _ -> do ++ fPtr <- mkTreeSelectionFunc (\_ _ tp _ _ -> do + path <- peekTreePath (castPtr tp) + liftM fromBool $ fun path + ) +@@ -168,7 +168,7 @@ + {#pointer TreeSelectionFunc#} + + foreign import ccall "wrapper" mkTreeSelectionFunc :: +- (Ptr () -> Ptr () -> Ptr TreePath -> Ptr () -> IO CInt)-> ++ (Ptr TreeSelection -> Ptr TreeModel -> Ptr NativeTreePath -> {#type gint#} -> Ptr () -> IO CInt)-> + IO TreeSelectionFunc + + -- | Retrieve the 'TreeView' widget that this 'TreeSelection' works on. +@@ -199,7 +199,7 @@ + -> TreeSelectionForeachCB + -> IO () + treeSelectionSelectedForeach self fun = do +- fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr -> do ++ fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr _ -> do + -- make a deep copy of the iterator. This makes it possible to store this + -- iterator in Haskell land somewhere. The TreeModel parameter is not + -- passed to the function due to performance reasons. But since it is +@@ -219,7 +219,7 @@ + {#pointer TreeSelectionForeachFunc#} + + foreign import ccall "wrapper" mkTreeSelectionForeachFunc :: +- (Ptr () -> Ptr () -> Ptr TreeIter -> IO ()) -> IO TreeSelectionForeachFunc ++ (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO ()) -> IO TreeSelectionForeachFunc + + #if GTK_CHECK_VERSION(2,2,0) + -- | Creates a list of paths of all selected rows. +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs gtk/Graphics/UI/Gtk/ModelView/TreeView.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -582,7 +582,7 @@ + {#pointer TreeViewColumnDropFunc#} + + foreign import ccall "wrapper" mkTreeViewColumnDropFunc :: +- (Ptr () -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> ++ (Ptr TreeView -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> + Ptr () -> IO {#type gboolean#}) -> IO TreeViewColumnDropFunc + + -- | Scroll to a coordinate. +@@ -798,7 +798,7 @@ + {#pointer TreeViewMappingFunc#} + + foreign import ccall "wrapper" mkTreeViewMappingFunc :: +- (Ptr () -> Ptr NativeTreePath -> Ptr () -> IO ()) -> ++ (Ptr TreeView -> Ptr NativeTreePath -> Ptr () -> IO ()) -> + IO TreeViewMappingFunc + + -- | Check if row is expanded. +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs 2012-10-02 16:27:34.000000000 +0400 +@@ -1251,16 +1251,26 @@ + + -- | A 'Pixbuf' is inserted into the buffer. + -- ++-- * See note in 'bufferInsertText'. ++-- + insertPixbuf :: TextBufferClass self => Signal self (TextIter -> Pixbuf -> IO ()) + insertPixbuf = Signal (connect_BOXED_OBJECT__NONE "insert-pixbuf" mkTextIterCopy) + + -- | The 'insertChildAnchor' signal is emitted to insert a 'TextChildAnchor' in a 'TextBuffer'. + -- Insertion actually occurs in the default handler. + -- ++-- * See note in 'bufferInsertText'. ++-- + insertChildAnchor :: TextBufferClass self => Signal self (TextIter -> TextChildAnchor -> IO ()) + insertChildAnchor = Signal (connect_BOXED_OBJECT__NONE "insert-child-anchor" mkTextIterCopy) + +--- | Some text was inserted. ++-- | Some text is inserted. Insertion actually occurs in the default handler. ++-- ++-- * The function connected to this handler may not modify the buffer since ++-- this would invalidate the iterator. If this function replaces the ++-- default handler, it needs to stop the emission of this signal in order ++-- to prevent the default handler from running. If additional text should ++-- be inserted, this can be done using the 'after' function to connect. + -- + bufferInsertText :: TextBufferClass self => Signal self (TextIter -> String -> IO ()) + bufferInsertText = Signal $ \after obj handler -> +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs gtk/Graphics/UI/Gtk/Multiline/TextIter.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Multiline/TextIter.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -797,7 +797,7 @@ + {#pointer TextCharPredicate#} + + foreign import ccall "wrapper" mkTextCharPredicate :: +- ({#type gunichar#} -> Ptr () -> {#type gboolean#}) -> IO TextCharPredicate ++ ({#type gunichar#} -> Ptr () -> IO {#type gboolean#}) -> IO TextCharPredicate + + -- | Move 'TextIter' forward until a + -- predicate function returns True. +@@ -810,7 +810,7 @@ + textIterForwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter -> + IO Bool + textIterForwardFindChar ti pred limit = do +- fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c))) ++ fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c))) + res <- liftM toBool $ {#call text_iter_forward_find_char#} + ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit) + freeHaskellFunPtr fPtr +@@ -827,7 +827,7 @@ + textIterBackwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter -> + IO Bool + textIterBackwardFindChar ti pred limit = do +- fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c))) ++ fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c))) + res <- liftM toBool $ {#call text_iter_backward_find_char#} + ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit) + freeHaskellFunPtr fPtr +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs gtk/Graphics/UI/Gtk/Windows/Assistant.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Windows/Assistant.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -274,7 +274,7 @@ + {#pointer AssistantPageFunc#} + + foreign import ccall "wrapper" mkAssistantPageFunc :: +- ({#type glong#} -> Ptr () -> IO {#type glong#}) ++ ({#type gint#} -> Ptr () -> IO {#type gint#}) + -> IO AssistantPageFunc + + -- | Sets the page type for @page@. The page type determines the page behavior diff --git a/community/haskell-haskeline/PKGBUILD b/community/haskell-haskeline/PKGBUILD index e18e5a596..d0089aa8c 100644 --- a/community/haskell-haskeline/PKGBUILD +++ b/community/haskell-haskeline/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 72390 2012-06-13 13:46:29Z tdziedzic $ +# $Id: PKGBUILD 77346 2012-10-09 04:17:37Z tdziedzic $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> # Package generated by cabal2arch 0.7.6 _hkgname=haskeline pkgname=haskell-haskeline -pkgver=0.6.4.7 +pkgver=0.7.0.3 pkgrel=1 pkgdesc="A command-line interface for user input, written in Haskell." url="http://hackage.haskell.org/package/haskeline" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh' 'haskell-utf8-string=0.3.7-2' 'haskell-mtl=2.1.1-1' 'haskell-terminfo=0.3.2.3-2') +depends=('ghc=7.6.1-1' 'sh' 'haskell-utf8-string=0.3.7-3' 'haskell-mtl=2.1.2-1' 'haskell-terminfo=0.3.2.5-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('d8d0a90a9965f4f68935e76e4e777035') +md5sums=('3a78043dc80b5510202e71e77c0a9923') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD index db574668e..4d8e06c53 100644 --- a/community/haskell-hslogger/PKGBUILD +++ b/community/haskell-hslogger/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 75909 2012-09-05 10:20:43Z spupykin $ +# $Id: PKGBUILD 77347 2012-10-09 04:17:42Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haskell-hslogger pkgver=1.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Versatile logging framework" url="http://hackage.haskell.org/package/hslogger" license=('LGPL') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'haskell-mtl=2.1.1-1' 'haskell-network=2.3.0.14-1') +depends=('ghc=7.6.1-1' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1') install=${pkgname}.install source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz) md5sums=('e0737887b0df75a3781989c8f6689850') diff --git a/community/haskell-html/PKGBUILD b/community/haskell-html/PKGBUILD index f9aaa0f0f..8eb9fc6f4 100644 --- a/community/haskell-html/PKGBUILD +++ b/community/haskell-html/PKGBUILD @@ -5,12 +5,12 @@ _hkgname=html pkgname=haskell-html pkgver=1.0.1.2 -pkgrel=11 +pkgrel=12 pkgdesc="HTML combinator library" url="http://hackage.haskell.org/package/html" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' sh) +depends=('ghc=7.6.1-1' sh) source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('2a7de5a2af9a2f80d39825d6a95ee445') diff --git a/community/haskell-pango/PKGBUILD b/community/haskell-pango/PKGBUILD index aa044c1ad..347c3a31d 100644 --- a/community/haskell-pango/PKGBUILD +++ b/community/haskell-pango/PKGBUILD @@ -1,43 +1,46 @@ -# $Id: PKGBUILD 72393 2012-06-13 13:46:44Z tdziedzic $ +# $Id: PKGBUILD 77349 2012-10-09 04:17:52Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-pango pkgver=0.12.3 -pkgrel=2 +pkgrel=3 pkgdesc="Binding to the pango library for Gtk2Hs." url="http://hackage.haskell.org/package/pango" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'pango' 'haskell-glib=0.12.3.1-1' 'haskell-cairo=0.12.3.1-1') +depends=('ghc' 'pango' 'haskell-glib' 'haskell-cairo') makedepends=("gtk2hs-buildtools") provides=('gtk2hs-pango') replaces=('gtk2hs-pango') conflicts=('gtk2hs-pango') options=('strip') -source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz) install=gtk2hs-pango.install +source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz) md5sums=('1ef3132cb569703d5b1bc262c9d86fe3') build() { - cd ${srcdir}/pango-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/haskell-pango \ - --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 + cd ${srcdir}/pango-${pkgver} + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/haskell-pango \ + --libsubdir=\$compiler/site-local/\$pkgid + sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/Rendering/Pango/Types.chs + 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() { - #_ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - #depends=("ghc=${_ghcver}" 'pango' 'haskell-glib' 'haskell-cairo') + _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + _hglibver=`pacman -Q haskell-glib | cut -f2 -d\ | cut -f1 -d-` + _hcairover=`pacman -Q haskell-cairo | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc=${_ghcver}" "pango" "haskell-glib=${_hglibver}" "haskell-cairo=${_hcairover}") - cd ${srcdir}/pango-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango - runhaskell Setup copy --destdir=${pkgdir} + cd ${srcdir}/pango-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango + runhaskell Setup copy --destdir=${pkgdir} } diff --git a/community/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch b/community/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch new file mode 100644 index 000000000..a25506e67 --- /dev/null +++ b/community/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/haskell-quickcheck/PKGBUILD b/community/haskell-quickcheck/PKGBUILD index 2ee16af54..e96121f81 100644 --- a/community/haskell-quickcheck/PKGBUILD +++ b/community/haskell-quickcheck/PKGBUILD @@ -4,19 +4,20 @@ _hkgname=QuickCheck pkgname=haskell-quickcheck -pkgver=2.5 +pkgver=2.5.1.1 pkgrel=1 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-random=1.0.1.1-2' 'sh') +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) install=${pkgname}.install -md5sums=('ad647a3f208092e5d41469369c18185e') +md5sums=('2631b41c8b6e297b52622d1698387f09') 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 diff --git a/community/haskell-regex-base/PKGBUILD b/community/haskell-regex-base/PKGBUILD index d787c6007..d4e951cc6 100644 --- a/community/haskell-regex-base/PKGBUILD +++ b/community/haskell-regex-base/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=regex-base pkgname=haskell-regex-base pkgver=0.93.2 -pkgrel=6 +pkgrel=7 pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa" url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' sh 'haskell-mtl=2.1.1-1') +depends=('ghc=7.6.1-1' sh 'haskell-mtl=2.1.2-1') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3') diff --git a/community/haskell-regex-compat/PKGBUILD b/community/haskell-regex-compat/PKGBUILD index f1e91b553..c546442ec 100644 --- a/community/haskell-regex-compat/PKGBUILD +++ b/community/haskell-regex-compat/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=regex-compat pkgname=haskell-regex-compat pkgver=0.95.1 -pkgrel=2 +pkgrel=3 pkgdesc="Replaces and enhances Text.Regex" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh' 'haskell-regex-base=0.93.2-6' 'haskell-regex-posix=0.95.2-1') +depends=('ghc=7.6.1-1' 'sh' 'haskell-regex-base=0.93.2-7' 'haskell-regex-posix=0.95.2-2') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('d0573ab4e2f3de5faa61380b67333320') diff --git a/community/haskell-regex-posix/PKGBUILD b/community/haskell-regex-posix/PKGBUILD index f49daf3b2..3c570e4d1 100644 --- a/community/haskell-regex-posix/PKGBUILD +++ b/community/haskell-regex-posix/PKGBUILD @@ -4,12 +4,12 @@ _hkgname=regex-posix pkgname=haskell-regex-posix pkgver=0.95.2 -pkgrel=1 +pkgrel=2 pkgdesc="The posix regex backend for regex-base" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh' 'haskell-regex-base=0.93.2-6') +depends=('ghc=7.6.1-1' 'sh' 'haskell-regex-base=0.93.2-7') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('1df0f9494aab110c7231f36393285c7c') diff --git a/community/haskell-stm/PKGBUILD b/community/haskell-stm/PKGBUILD index 8eba45641..fec52e949 100644 --- a/community/haskell-stm/PKGBUILD +++ b/community/haskell-stm/PKGBUILD @@ -3,16 +3,16 @@ # Package generated by cabal2arch 0.7.5 _hkgname=stm pkgname=haskell-stm -pkgver=2.3 +pkgver=2.4 pkgrel=1 pkgdesc="A modular composable concurrency abstraction." url="http://hackage.haskell.org/package/stm" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh') +depends=('ghc=7.6.1-1' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install -md5sums=('fcaf091a492974045cc04b231a3b7c9c') +md5sums=('fe8ab1a8231202f1748da53454cf55fc') build() { cd ${srcdir}/${_hkgname}-$pkgver diff --git a/community/haskell-syb/PKGBUILD b/community/haskell-syb/PKGBUILD index 301c463b5..a2595bf2c 100644 --- a/community/haskell-syb/PKGBUILD +++ b/community/haskell-syb/PKGBUILD @@ -2,17 +2,17 @@ # Contributor: Arch Haskell Team <arch-haskell@haskell.org> _hkgname=syb pkgname=haskell-syb -pkgver=0.3.6.1 +pkgver=0.3.7 pkgrel=1 pkgdesc="A library for client-side HTTP" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' sh) +depends=('ghc=7.6.1-1' sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('50e0a755fcc735cccd0d77a89714ae38') +md5sums=('fa653976a4ee43918cc7546089f94b60') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch b/community/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch new file mode 100644 index 000000000..b8c2264bc --- /dev/null +++ b/community/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 <gostrc@gmail.com> +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/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD index 3bee1826d..629285c73 100644 --- a/community/haskell-tar/PKGBUILD +++ b/community/haskell-tar/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 72400 2012-06-13 13:47:19Z tdziedzic $ +# $Id: PKGBUILD 77356 2012-10-09 04:18:31Z tdziedzic $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> pkgname=haskell-tar pkgver=0.4.0.0 -pkgrel=2 +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.4.2-1') -options=('strip') -source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz") +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') +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 diff --git a/community/haskell-terminfo/PKGBUILD b/community/haskell-terminfo/PKGBUILD index 7c57260e3..1576e8dd8 100644 --- a/community/haskell-terminfo/PKGBUILD +++ b/community/haskell-terminfo/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 72401 2012-06-13 13:47:24Z tdziedzic $ +# $Id: PKGBUILD 77357 2012-10-09 04:18:36Z tdziedzic $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> _hkgname=terminfo pkgname=haskell-terminfo -pkgver=0.3.2.3 -pkgrel=2 +pkgver=0.3.2.5 +pkgrel=1 pkgdesc="Haskell bindings to the terminfo library." url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh') +depends=('ghc=7.6.1-1' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('706f546c629ac100a402c9c2629c25fa') +md5sums=('7ef09acfac9f6fc499ed3bb804ae2ab3') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-utf8-string/PKGBUILD b/community/haskell-utf8-string/PKGBUILD index 13123d4c8..0c5cc75d0 100644 --- a/community/haskell-utf8-string/PKGBUILD +++ b/community/haskell-utf8-string/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 72402 2012-06-13 13:47:29Z tdziedzic $ +# $Id: PKGBUILD 77358 2012-10-09 04:18:41Z tdziedzic $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> # Package generated by cabal2arch 0.7.6 _hkgname=utf8-string pkgname=haskell-utf8-string pkgver=0.3.7 -pkgrel=2 +pkgrel=3 pkgdesc="Support for reading and writing UTF8 Strings" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.2-1' 'sh') +depends=('ghc=7.6.1-1' 'sh') install=${pkgname}.install source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) md5sums=('50e5c395713e716e0e4a56da73f87ccd') diff --git a/community/haskell-x11-xft/PKGBUILD b/community/haskell-x11-xft/PKGBUILD index 5afddd050..97ee3a2ed 100644 --- a/community/haskell-x11-xft/PKGBUILD +++ b/community/haskell-x11-xft/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 72404 2012-06-13 13:47:39Z tdziedzic $ +# $Id: PKGBUILD 77360 2012-10-09 04:18:51Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> _hkgname=X11-xft pkgname=haskell-x11-xft pkgver=0.3.1 -pkgrel=4 +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.4.2-1' 'haskell-x11=1.6.0' 'haskell-utf8-string=0.3.7' 'libxft') +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) diff --git a/community/haskell-x11/PKGBUILD b/community/haskell-x11/PKGBUILD index ded1012e2..e03a1fb93 100644 --- a/community/haskell-x11/PKGBUILD +++ b/community/haskell-x11/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 72403 2012-06-13 13:47:34Z tdziedzic $ +# $Id: PKGBUILD 77359 2012-10-09 04:18:46Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: shild <sxp@bk.ru> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> _hkgname=X11 pkgname=haskell-x11 -pkgver=1.6.0 +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.4.2-1" "haskell-syb=0.3.6.1" 'libx11' 'libxinerama' 'libxrandr') +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=('8199520ce58e91762d31d54ed081b99c') +md5sums=('0227ba7a8788c3cfd146e952a5fafc82') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-xhtml/PKGBUILD b/community/haskell-xhtml/PKGBUILD index 68041976a..7ccfca159 100644 --- a/community/haskell-xhtml/PKGBUILD +++ b/community/haskell-xhtml/PKGBUILD @@ -1,38 +1,49 @@ # Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 +# Contributor: Alexander Rødseth <rodseth@gmail.com> _hkgname=xhtml pkgname=haskell-xhtml pkgver=3000.2.1 -pkgrel=1 -pkgdesc="Combinators for producing XHTML 1.0, including the Strict, Transitional and Frameset variants." -url="http://hackage.haskell.org/package/xhtml" +pkgrel=2 +pkgdesc='Combinators for producing XHTML 1.0' +url='http://hackage.haskell.org/package/xhtml' 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) -install=${pkgname}.install -md5sums=('c63487bea16cbf0ecf252d6ed73106bf') +arch=('x86_64' 'i686') +depends=('ghc=7.6.1-1' 'sh') +source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz") +install=$pkgname.install +sha256sums=('33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8') 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 + 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 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 + cd "$srcdir/$_hkgname-$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/$_hkgname" + runhaskell Setup copy --destdir="$pkgdir" + install -Dm644 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/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index 1da471ef9..57a320a7a 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 75756 2012-08-30 21:02:59Z spupykin $ +# $Id: PKGBUILD 77362 2012-10-09 04:19:03Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars pkgver=0.9.17 -pkgrel=4 +pkgrel=5 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64') url="http://hedgewars.org" license=('GPL' 'custom') depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua') makedepends=('fpc' 'cmake' - # haskell specific - 'ghc=7.4.2-1' - 'haskell-network=2.3.0.14-1' 'haskell-bytestring-show=0.3.5.1-3' - 'haskell-utf8-string=0.3.7-2' 'haskell-dataenc=0.14.0.3-2' - 'haskell-hslogger=1.1.5-7') + # haskell specific + 'ghc' + 'haskell-network' 'haskell-bytestring-show' + 'haskell-utf8-string' 'haskell-dataenc' + 'haskell-hslogger') source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 hedgewars.desktop hedgewars.png) @@ -26,6 +26,7 @@ build() { cd $pkgname-src-$pkgver # sed -i 's|.*misc/liblua.*||' CMakeLists.txt + sed -i 's|instance NFData B.ByteString||' gameServer/Actions.hs cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/community/libnetfilter_acct/PKGBUILD b/community/libnetfilter_acct/PKGBUILD index 3f105d946..3ab673656 100644 --- a/community/libnetfilter_acct/PKGBUILD +++ b/community/libnetfilter_acct/PKGBUILD @@ -1,12 +1,13 @@ # $Id: PKGBUILD 71613 2012-05-31 08:51:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> # Maintainer: Filip Wojciechowski, filip at loka dot pl pkgname=libnetfilter_acct -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 -pkgdesc="userspace library providing interface to extended accounting infrastructure" +pkgdesc='userspace library providing interface to extended accounting infrastructure' arch=('i686' 'x86_64') url="http://www.netfilter.org/projects/libnetfilter_acct/index.html" license=('GPL') @@ -14,11 +15,15 @@ depends=('libnfnetlink' 'libmnl') makedepends=('pkgconfig') options=('!libtool') source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) -md5sums=('246e97feb9cf98f7ddf70d71a3813336') +md5sums=('4755429cbd46ad0ed32bb30f84da0dee') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr make - make DESTDIR=$pkgdir install +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/community/libnetfilter_conntrack/PKGBUILD b/community/libnetfilter_conntrack/PKGBUILD index 6fbc80694..1592d9027 100644 --- a/community/libnetfilter_conntrack/PKGBUILD +++ b/community/libnetfilter_conntrack/PKGBUILD @@ -1,24 +1,30 @@ -# $Id: PKGBUILD 70936 2012-05-20 08:39:06Z spupykin $ +# $Id: PKGBUILD 77383 2012-10-09 10:14:26Z seblu $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Alessandro Sagratini <ale_sagra@hotmail.com> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> pkgname=libnetfilter_conntrack -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 -pkgdesc="userspace library providing a programming interface (API) to the in-kernel connection tracking state table" +pkgdesc='Library providing an API to the in-kernel connection tracking state table' arch=('i686' 'x86_64') -depends=(libnfnetlink) -makedepends=(pkgconfig) -url="http://www.netfilter.org/projects/libnetfilter_conntrack/index.html" -license=("GPL") +depends=('libnfnetlink' 'libmnl') +url='http://www.netfilter.org/projects/libnetfilter_conntrack/' +license=('GPL') options=('!libtool') -source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) -md5sums=('2d17d9da1404728d61a29b4a8338ad0c') +source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") +md5sums=('447114b5d61bb9a9617ead3217c3d3ff') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr make - make DESTDIR=$pkgdir install } +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + + +# vim:set ts=2 sw=2 et: diff --git a/community/libnetfilter_queue/PKGBUILD b/community/libnetfilter_queue/PKGBUILD index e7b74f128..fa219ba98 100644 --- a/community/libnetfilter_queue/PKGBUILD +++ b/community/libnetfilter_queue/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 71614 2012-05-31 08:52:14Z spupykin $ +# $Id: PKGBUILD 77377 2012-10-09 09:50:14Z seblu $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> # Maintainer: Filip Wojciechowski, filip at loka dot pl pkgname=libnetfilter_queue -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 -pkgdesc="userspace library providing an API to packets that have been queued by the kernel packet filter" +pkgdesc='Userspace API to packets that have been queued by the kernel packet filter' arch=('i686' 'x86_64') -url="http://www.netfilter.org/projects/libnetfilter_queue/index.html" +url='http://www.netfilter.org/projects/libnetfilter_queue/' license=('GPL') -depends=(libnfnetlink) -makedepends=(pkgconfig) +depends=('libnfnetlink' 'libmnl') options=('!libtool') -source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) -md5sums=('08b968cb2d36c24deb7f26a69f5d8602') +source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") +md5sums=('df09befac35cb215865b39a36c96a3fa') build() { - cd $srcdir/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr - make - make DESTDIR=$pkgdir install } + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/libnfnetlink/PKGBUILD b/community/libnfnetlink/PKGBUILD index fc8e6d8dd..5bb6c345d 100644 --- a/community/libnfnetlink/PKGBUILD +++ b/community/libnfnetlink/PKGBUILD @@ -1,27 +1,30 @@ -# $Id: PKGBUILD 55539 2011-09-14 08:04:26Z andrea $ +# $Id: PKGBUILD 77381 2012-10-09 10:06:36Z seblu $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Kevin Edmonds <edmondskevin@hotmail.com> # Contributor: Filip Wojciechowski, filip at loka dot pl pkgname=libnfnetlink -pkgver=1.0.0 -pkgrel=2 -pkgdesc="low-level library for netfilter related kernel/userspace communication" +pkgver=1.0.1 +pkgrel=1 +pkgdesc='Low-level library for netfilter related kernel/userspace communication' arch=('i686' 'x86_64') -url="http://www.netfilter.org/projects/libnfnetlink/index.html" +url='http://www.netfilter.org/projects/libnfnetlink/' license=('GPL') depends=('glibc') options=('!libtool') source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") -md5sums=('016fdec8389242615024c529acc1adb8') +md5sums=('98927583d2016a9fb1936fed992e2c5e') build() { - cd "${srcdir}"/$pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr make } package() { - cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/sfk/PKGBUILD b/community/sfk/PKGBUILD index 10e7381bf..494390ff0 100644 --- a/community/sfk/PKGBUILD +++ b/community/sfk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 67087 2012-03-03 17:34:42Z seblu $ +# $Id: PKGBUILD 77369 2012-10-09 06:40:23Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Baumi <baumi@gmx.com> pkgname=sfk -pkgver=1.6.5 +pkgver=1.6.6 pkgrel=1 pkgdesc='Swiss File Knife - A Command Line Tools Collection' arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url='http://stahlforce.com/dev/?tool=sfk' license=('custom: BSD') depends=('gcc-libs') source=("http://downloads.sourceforge.net/swissfileknife/${pkgname}${pkgver//./}.zip") -md5sums=('b40c0c01785d40e7cde7cba3e4227f0b') +md5sums=('d32f487d783356eb15e23f5e26bf7ac7') build() { cd ${pkgname}${pkgver//./} diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD index bed484f6c..84e674e1e 100644 --- a/community/ulogd/PKGBUILD +++ b/community/ulogd/PKGBUILD @@ -1,36 +1,34 @@ -# $Id: PKGBUILD 75920 2012-09-05 14:02:57Z spupykin $ +# $Id: PKGBUILD 77404 2012-10-09 16:01:10Z seblu $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Sebastien Luttringer <seblu+arch@seblu.net> # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Sergej Pupykin <ps@lx-ltd.ru> pkgname=ulogd -pkgver=2.0.0 -pkgrel=5 +pkgver=2.0.1 +pkgrel=2 pkgdesc='Userspace Packet Logging for netfilter' arch=('i686' 'x86_64') url='http://www.netfilter.org/projects/ulogd/index.html' license=('GPL2') -depends=('libmnl') +depends=('libmnl' 'libnfnetlink') backup=('etc/ulogd.conf') -makedepends=('libmysqlclient' 'postgresql-libs' 'sqlite' 'libpcap' 'libdbi' - 'libnetfilter_acct' 'libnetfilter_log' 'libnetfilter_conntrack' - 'linuxdoc-tools' 'groff' 'texlive-core') -optdepends=('postgresql-libs' - 'sqlite' - 'libpcap' - 'libmysqlclient' - 'libdbi' - 'libnetfilter_acct' - 'libnetfilter_log' - 'libnetfilter_conntrack') +makedepends=('libmysqlclient' + 'libnetfilter_acct' + 'libnetfilter_conntrack' + 'libnetfilter_log' + 'libpcap' + 'libdbi' + 'postgresql-libs' + 'sqlite') +optdepends=("${makedepends[@]}") options=('!libtool') source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" - 'rc' - 'logrotate' - 'ulogd.conf.min' - 'ulogd.service') -md5sums=('211e68781e3860959606fc94b97cf22e' + "$pkgname.rc" + "$pkgname.logrotate" + "$pkgname.conf" + "$pkgname.service") +md5sums=('2f4b1a58955fcad4ebf22f0d00885fc9' 'c42230c1cabf5dd9b80bf9a0fd87ca7e' 'dd32eeee0949adff4188544419acd17e' 'c21531312f95e790ed19aa267a17d35a' @@ -40,23 +38,19 @@ build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --with-mysql --with-pgsql --with-dbi make - (cd doc && make) } package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - - install -dm0755 "$pkgdir/usr/share/doc/ulogd" - install -Dm0644 ulogd.conf $pkgdir/usr/share/doc/ulogd/ulogd.conf.sample - install -Dm0644 doc/ulogd.{dvi,html,ps,sgml,txt} "$pkgdir/usr/share/doc/ulogd" - - install -dm0755 "$pkgdir/usr/share/ulogd" - install -m644 doc/*.{table,sql} "$pkgdir/usr/share/ulogd" - - install -D -m644 "$srcdir/logrotate" "$pkgdir/etc/logrotate.d/ulogd" - install -D -m755 "$srcdir/rc" "$pkgdir/etc/rc.d/ulogd" - - install -Dm0644 $srcdir/ulogd.conf.min $pkgdir/etc/ulogd.conf - install -Dm0644 $srcdir/ulogd.service $pkgdir/usr/lib/systemd/system/ulogd.service + install -dm755 "$pkgdir/usr/share/doc/ulogd" + install -Dm644 ulogd.conf "$pkgdir/usr/share/doc/ulogd/ulogd.conf" + install -m644 doc/*.{table,sql} "$pkgdir/usr/share/doc/ulogd" + cd "$srcdir" + install -Dm755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" + install -Dm644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service" + install -Dm644 $pkgname.logrotate "$pkgdir/etc/logrotate.d/$pkgname" + install -Dm644 $pkgname.conf "$pkgdir/etc/$pkgname.conf" } + +# vim:set ts=2 sw=2 et: diff --git a/community/ulogd/ulogd.conf b/community/ulogd/ulogd.conf new file mode 100644 index 000000000..822575613 --- /dev/null +++ b/community/ulogd/ulogd.conf @@ -0,0 +1,20 @@ +[global] +nlgroup=1 +logfile="/var/log/ulogd.log" +loglevel=5 +rmem=131071 +bufsize=150000 + +plugin="/usr/lib/ulogd/ulogd_inppkt_ULOG.so" +plugin="/usr/lib/ulogd/ulogd_raw2packet_BASE.so" +plugin="/usr/lib/ulogd/ulogd_filter_IP2STR.so" +plugin="/usr/lib/ulogd/ulogd_filter_PRINTPKT.so" +plugin="/usr/lib/ulogd/ulogd_output_LOGEMU.so" + +stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU + +[ulog1] +nlgroup=1 + +[emu1] +file=/var/log/ulogd.syslogemu diff --git a/community/ulogd/ulogd.logrotate b/community/ulogd/ulogd.logrotate new file mode 100644 index 000000000..312c71acb --- /dev/null +++ b/community/ulogd/ulogd.logrotate @@ -0,0 +1,10 @@ +/var/log/ulogd.log /var/log/ulogd.syslogemu { + missingok + notifempty + sharedscripts + create 0640 root root + + postrotate + [ -e /var/run/ulogd.pid ] && /etc/rc.d/ulogd restart > /dev/null + endscript +} diff --git a/community/ulogd/ulogd.rc b/community/ulogd/ulogd.rc new file mode 100644 index 000000000..83f0550cc --- /dev/null +++ b/community/ulogd/ulogd.rc @@ -0,0 +1,54 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +get_pid() { + pidof /usr/sbin/ulogd +} + +case "$1" in + start) + stat_busy "Starting ulogd daemon" + + [ -f /var/run/ulog.pid ] && rm -f /var/run/ulog.pid + PID=`get_pid` + if [ -z "$PID" ]; then + /usr/sbin/ulogd -d &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + echo `get_pid` > /var/run/ulogd.pid + add_daemon ulogd + stat_done + fi + else + stat_fail + exit 1 + fi + ;; + + stop) + stat_busy "Stopping ulog daemon" + PID=`get_pid` + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + exit 1 + else + rm -f /var/run/ulogd.pid &> /dev/null + rm_daemon ulogd + stat_done + fi + ;; + + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch b/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch new file mode 100644 index 000000000..d4508c916 --- /dev/null +++ b/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch @@ -0,0 +1,34 @@ +From b7345a790e8026a2075ce636ac377d8f049b4b7c Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic <gostrc@gmail.com> +Date: Wed, 3 Oct 2012 06:51:21 -0700 +Subject: [PATCH] Update usage of catch to catchIOError since catch has been + removed from System.IO.Error in ghc 7.6.1 + +--- + src/Plugins/Monitors/Bright.hs | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Plugins/Monitors/Bright.hs b/src/Plugins/Monitors/Bright.hs +index 499e5bc..b5ec4c0 100644 +--- a/src/Plugins/Monitors/Bright.hs ++++ b/src/Plugins/Monitors/Bright.hs +@@ -20,6 +20,7 @@ import Data.Char + import System.FilePath ((</>)) + import System.Posix.Files (fileExist) + import System.Console.GetOpt ++import System.IO.Error (catchIOError) + + data BrightOpts = BrightOpts + { subDir :: String +@@ -101,7 +102,7 @@ readBright files = + maxVal <- grab $ (fMax files) + return $ (currVal / maxVal) + where +- grab f = catch (fmap (read . B.unpack) $ B.readFile f)(\_ -> return 0) ++ grab f = catchIOError (fmap (read . B.unpack) $ B.readFile f)(\_ -> return 0) + + + showHorizontalBar :: Float -> Monitor String +-- +1.7.12.2 + diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD index 608dbbe08..0fcb9e753 100644 --- a/community/xmobar/PKGBUILD +++ b/community/xmobar/PKGBUILD @@ -1,35 +1,37 @@ -# $Id: PKGBUILD 72497 2012-06-15 14:00:57Z jelle $ +# $Id: PKGBUILD 77363 2012-10-09 04:19:10Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.4 pkgname=xmobar -pkgver=0.15 -pkgrel=2 +pkgver=0.16 +pkgrel=1 pkgdesc="A Minimalistic Text Based Status Bar" url="http://hackage.haskell.org/package/xmobar" license=('custom:BSD3') arch=('i686' 'x86_64') depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr') -makedepends=('ghc=7.4.2-1' 'haskell-x11=1.6.0' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string' +makedepends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string' 'haskell-stm>=2.3' 'haskell-parsec>=3.1' 'haskell-mtl>=2') options=('strip') -source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz xmobar-0.15-haskell-mtl.patch) +#source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz xmobar-0.15-builddep.patch) +# Use Git snapshot for Ghc 7.6.1 rebuild +source=(ftp://ftp.archlinux.org/other/community/xmobar/xmobar-$pkgver.tar.gz +0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch) build() { - cd ${srcdir}/xmobar-$pkgver - # Fix haskell mtl dep - patch -Np1 -i $srcdir/xmobar-0.15-haskell-mtl.patch + cd ${srcdir}/xmobar + patch -Np1 -i $srcdir/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_utf8 with_xft with_iwlib" runhaskell Setup build } package() { - cd ${srcdir}/xmobar-$pkgver + cd ${srcdir}/xmobar runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE + install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } -md5sums=('0658679b39168f49d32fe178029ff9f1' - '0d9fb64557233c3a349feb53097c7b09') +md5sums=('b470f8253f8d2b014f59e9d657cc7ddd' + 'ffd6079c879f3b6ff7208a846d6ee241' + '149583c19ac3d0ad829f3138342bb9db') diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD index dbb48f0a2..095158c1d 100644 --- a/community/xmonad-contrib/PKGBUILD +++ b/community/xmonad-contrib/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 72409 2012-06-13 13:48:15Z tdziedzic $ +# $Id: PKGBUILD 77365 2012-10-09 04:19:28Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: orbisvicis <gmail.com> pkgname=xmonad-contrib pkgver=0.10 -pkgrel=4 +pkgrel=5 pkgdesc="Add-ons for xmonad" arch=('i686' 'x86_64') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.4.2-1' 'xmonad=0.10-4' 'sh' 'haskell-x11=1.6.0' 'haskell-x11-xft=0.3.1-4' 'haskell-utf8-string=0.3.7-2' 'haskell-random=1.0.1.1-2') +depends=('ghc=7.6.1' 'xmonad=0.10-5' 'sh' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-random=1.0.1.1-3') install='xmonad-contrib.install' source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-0.10-x11-1.6.patch) md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81' diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD index a64c266dd..d513338e3 100644 --- a/community/xmonad/PKGBUILD +++ b/community/xmonad/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 72408 2012-06-13 13:48:08Z tdziedzic $ +# $Id: PKGBUILD 77364 2012-10-09 04:19:21Z tdziedzic $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: shild <shildv@gmail.com> pkgname=xmonad pkgver=0.10 -pkgrel=4 +pkgrel=5 pkgdesc="Lightweight X11 tiled window manager written in Haskell" arch=('i686' 'x86_64') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.4.2-1' 'gmp' 'haskell-x11=1.6.0' 'sh' 'haskell-mtl=2.1.1-1' 'haskell-utf8-string=0.3.7') +depends=('ghc=7.6.1-1' 'gmp' 'haskell-x11=1.6.0.2' 'sh' 'haskell-mtl=2.1.2' 'haskell-utf8-string=0.3.7' 'haskell-extensible-exceptions') makedepends=('setconf' 'gendesk') optdepends=('xorg-xmessage: for displaying visual error messages') install='xmonad.install' @@ -19,6 +19,7 @@ source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$p build() { cd "$srcdir" + ghc-pkg list gendesk cd $srcdir/$pkgname-$pkgver @@ -39,7 +40,7 @@ package() { install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh runhaskell Setup.lhs copy --destdir=$pkgdir - # runhaskell util/GenerateManpage.hs + #runhaskell util/GenerateManpage.hs install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1 |