From 63a600a5f9102d817332db9fb746a4153ed62b51 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 15 Jun 2012 00:01:47 +0000 Subject: Fri Jun 15 00:01:47 UTC 2012 --- community/alex/PKGBUILD | 8 ++-- community/go/PKGBUILD | 21 ++++++++-- community/go/go.install | 25 ------------ community/gtk2hs-buildtools/PKGBUILD | 6 +-- community/haddock/PKGBUILD | 4 +- community/happy/PKGBUILD | 6 +-- community/haskell-bytestring-show/PKGBUILD | 7 ++-- community/haskell-cairo/PKGBUILD | 11 ++---- community/haskell-dataenc/PKGBUILD | 6 +-- community/haskell-ghc-paths/PKGBUILD | 4 +- community/haskell-glib/PKGBUILD | 8 ++-- community/haskell-gtk/PKGBUILD | 22 +++++++---- community/haskell-gtk/gtk-gthread.h-include.patch | 15 +++++++ community/haskell-haskeline/PKGBUILD | 8 ++-- community/haskell-hslogger/PKGBUILD | 6 +-- community/haskell-html/PKGBUILD | 4 +- community/haskell-pango/PKGBUILD | 10 ++--- community/haskell-quickcheck/PKGBUILD | 5 ++- community/haskell-regex-base/PKGBUILD | 4 +- community/haskell-regex-compat/PKGBUILD | 4 +- community/haskell-regex-posix/PKGBUILD | 6 +-- community/haskell-stm/PKGBUILD | 8 ++-- community/haskell-syb/PKGBUILD | 6 +-- community/haskell-tar/PKGBUILD | 6 +-- community/haskell-terminfo/PKGBUILD | 6 +-- community/haskell-utf8-string/PKGBUILD | 6 +-- community/haskell-x11-xft/PKGBUILD | 6 +-- community/haskell-x11/PKGBUILD | 10 ++--- community/haskell-xhtml/PKGBUILD | 8 ++-- community/hedgewars/PKGBUILD | 12 +++--- community/kpartsplugin/PKGBUILD | 6 +-- community/mingw32-gcc-base/PKGBUILD | 6 +-- community/mingw32-gcc/PKGBUILD | 6 +-- community/vidalia/PKGBUILD | 9 +++-- community/xmobar/PKGBUILD | 21 ++++++---- community/xmobar/xmobar-0.15-haskell-mtl.patch | 12 ++++++ community/xmonad-contrib/PKGBUILD | 14 ++++--- .../xmonad-contrib-0.10-x11-1.6.patch | 46 ++++++++++++++++++++++ community/xmonad/PKGBUILD | 31 ++++++++------- community/xmonad/xmonad-0.10-x11-1.6.patch | 19 +++++++++ community/xmonad/xmonad-gnome-session.session | 6 +++ 41 files changed, 269 insertions(+), 165 deletions(-) create mode 100644 community/haskell-gtk/gtk-gthread.h-include.patch create mode 100644 community/xmobar/xmobar-0.15-haskell-mtl.patch create mode 100644 community/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch create mode 100644 community/xmonad/xmonad-0.10-x11-1.6.patch create mode 100644 community/xmonad/xmonad-gnome-session.session (limited to 'community') diff --git a/community/alex/PKGBUILD b/community/alex/PKGBUILD index 4f078a8ca..b7cc2cb52 100644 --- a/community/alex/PKGBUILD +++ b/community/alex/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 67160 2012-03-05 00:29:42Z pschmitz $ +# $Id: PKGBUILD 72380 2012-06-13 13:45:40Z tdziedzic $ # Maintainer: Sergej Pupykin # Maintainer: Vesa Kaihlavirta # Contributor: Philip Nilsson pkgname=alex -pkgver=3.0.1 +pkgver=3.0.2 pkgrel=1 pkgdesc='a lexical analyser generator for Haskell' arch=('i686' 'x86_64') url='http://www.haskell.org/alex/' license=('custom:BSD3') depends=('gmp') -makedepends=('ghc=7.4.1-2' 'haskell-quickcheck=2.4.2-1') +makedepends=('ghc=7.4.2-1' 'haskell-quickcheck=2.4.2-2') source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") -md5sums=('5dec239c89165d159faa2154bc0724cd') +md5sums=('b8f0d831b65d05e5f54ff08bd3d9d10d') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index ab6e73e97..941892808 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70799 2012-05-16 17:49:57Z arodseth $ +# $Id: PKGBUILD 72413 2012-06-13 22:11:36Z arodseth $ # Maintainer: Vesa Kaihlavirta # Maintainer: Alexander Rødseth # Contributor: Rémy Oudompheng @@ -10,7 +10,7 @@ pkgname=go pkgver=1.0.1 -pkgrel=5 +pkgrel=6 epoch=2 pkgdesc='Google Go compiler and tools (release version)' arch=('x86_64' 'i686') @@ -20,10 +20,11 @@ depends=('perl' 'gawk') makedepends=('inetutils') options=('!strip' '!emptydirs') install=go.install +backup=('usr/lib/go/bin') source=("http://go.googlecode.com/files/${pkgname}$pkgver.src.tar.gz" "$pkgname.sh") -sha1sums=('fc8a6d6725f7f2bf7c94685c5fd0880c9b7f67f6' - '0e8c7edc9d788be3518367bf04bdb5ff8b6bbdcf') +sha256sums=('29cdba7bc909df7091d81f52049de023502b5b3351cd206094f2c2d9961c0315' + 'a03db71d323ed2794123bb31b5c8ad5febd551c490b5c0b341052c8e5f0ba892') build() { cd "$srcdir/$pkgname" @@ -91,6 +92,18 @@ package() { # For packages that source /etc/profile.d/go.sh install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/etc/profile.d/$pkgname.sh" + # This is to make go get code.google.com/p/go-tour/gotour and + # then running the gotour executable work out of the box. + # + # Also, /usr/bin is the place for system-wide executables, + # not /usr/lib/go/bin. Users should use different paths by + # setting the appropriate environment variables. + # + ln -sf /usr/bin "$pkgdir/usr/lib/go/bin" + + # For godoc + install -Dm644 favicon.ico "$pkgdir/usr/lib/go/favicon.ico" + rm -f "$pkgdir/usr/share/go/doc/articles/wiki/get.bin" } diff --git a/community/go/go.install b/community/go/go.install index 25b9690ac..755f0a442 100644 --- a/community/go/go.install +++ b/community/go/go.install @@ -1,20 +1,4 @@ post_upgrade() { - # Backup any previous /usr/lib/go/bin directory - if [ -d /usr/lib/go/bin -a ! -L /usr/lib/go/bin ]; then - mv /usr/lib/go/bin /usr/lib/go/bin.pacnew - fi - - # Point /usr/lib/go/bin to /usr/bin instead - # - # This is to make go get code.google.com/p/go-tour/gotour and - # then running the gotour executable work out of the box. - # - # Also, /usr/bin is the place for system-wide executables, - # not /usr/lib/go/bin. Users should use different paths by - # setting the appropriate environment variables. - # - ln -sf /usr/bin /usr/lib/go/bin - # Friendly message to the user echo "Example use of the \"go\" tool as a user:" echo " mkdir ~/go" @@ -26,13 +10,4 @@ post_install() { post_upgrade } -pre_remove() { - if [ -c /usr/lib/go/bin ]; then - rmdir --ignore-fail-on-non-empty /usr/lib/go/bin - fi - if [ -L /usr/lib/go/bin ]; then - rm /usr/lib/go/bin - fi -} - # vim:set ts=2 sw=2 et: diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD index 5f9816df0..7f03c504e 100644 --- a/community/gtk2hs-buildtools/PKGBUILD +++ b/community/gtk2hs-buildtools/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 67585 2012-03-13 12:44:00Z spupykin $ +# $Id: PKGBUILD 72381 2012-06-13 13:45:43Z tdziedzic $ # Maintainer: Sergej Pupykin pkgname=gtk2hs-buildtools -pkgver=0.12.3 +pkgver=0.12.3.1 pkgrel=1 pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries." url="http://hackage.haskell.org/package/gtk2hs-buildtools" @@ -13,7 +13,7 @@ depends=('gmp') options=('strip') provides=('haskell-gtk2hs-buildtools') source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz) -md5sums=('18b6eefca1db8898aa9f790bfc9b5ad0') +md5sums=('612611d831635024c953d2817b124e29') build() { cd ${srcdir}/gtk2hs-buildtools-$pkgver diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD index b7f9b44bc..81a65961c 100644 --- a/community/haddock/PKGBUILD +++ b/community/haddock/PKGBUILD @@ -5,13 +5,13 @@ pkgname=haddock pkgver=2.10.0 -pkgrel=1 +pkgrel=2 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.1-2' 'haskell-xhtml=3000.2.0.5-2' 'haskell-ghc-paths=0.1.0.8-7') # 'haskell-mtl' +depends=('ghc=7.4.2-1' 'haskell-xhtml=3000.2.1-1' 'haskell-ghc-paths=0.1.0.8-8') install=$pkgname.install source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") sha256sums=('d107dba15e8aee5abcb540b818b5dcb8ced98bae7d0714f50192dba26cadb410') diff --git a/community/happy/PKGBUILD b/community/happy/PKGBUILD index 783bb51d6..fb8ecf1f5 100644 --- a/community/happy/PKGBUILD +++ b/community/happy/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 67990 2012-03-16 18:40:06Z tdziedzic $ +# $Id: PKGBUILD 72383 2012-06-13 13:45:51Z tdziedzic $ # Maintainer: Thomas Dziedzic # Contributor: simo # Contributor: Vesa Kaihlavirta pkgname=happy pkgver=1.18.9 -pkgrel=4 +pkgrel=5 pkgdesc="The Parser Generator for Haskell" url="http://www.haskell.org/happy/" arch=('i686' 'x86_64') license=("custom:BSD3") depends=('gmp') -makedepends=('ghc=7.4.1' 'haskell-mtl=2.0.1.0-4') +makedepends=('ghc=7.4.2-1' 'haskell-mtl=2.1.1-1') source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) md5sums=('aeb565fe572f979f15a24db0df2de37d') diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD index 576ac74a3..d59b21995 100644 --- a/community/haskell-bytestring-show/PKGBUILD +++ b/community/haskell-bytestring-show/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 67048 2012-03-03 16:09:42Z tdziedzic $ +# $Id: PKGBUILD 72384 2012-06-13 13:45:56Z tdziedzic $ # Maintainer: Sergej Pupykin pkgname=haskell-bytestring-show pkgver=0.3.5.1 -pkgrel=2 +pkgrel=3 pkgdesc="Efficient conversion of values into readable byte strings." url="http://code.haskell.org/~dolio/" license=("BSD3") arch=('i686' 'x86_64') -makedepends=() -depends=("ghc=7.4.1-2") +depends=("ghc=7.4.2-1") install="${pkgname}.install" source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz") md5sums=('7396bc2e8f88dedc3374c3f12f24e4bd') diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD index 9af4c4cd4..a292c37c8 100644 --- a/community/haskell-cairo/PKGBUILD +++ b/community/haskell-cairo/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 67618 2012-03-13 14:21:56Z spupykin $ +# $Id: PKGBUILD 72385 2012-06-13 13:46:01Z tdziedzic $ # Maintainer: Sergej Pupykin pkgname=haskell-cairo -pkgver=0.12.3 +pkgver=0.12.3.1 pkgrel=1 pkgdesc="Binding to the cairo library for Gtk2Hs." url="http://hackage.haskell.org/package/cairo" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc' 'cairo' 'haskell-mtl') +depends=('ghc=7.4.2-1' 'cairo' 'haskell-mtl=2.1.1-1') makedepends=("gtk2hs-buildtools") options=('strip') conflicts=('gtk2hs-cairo') @@ -16,7 +16,7 @@ provides=('gtk2hs-cairo') replaces=('gtk2hs-cairo') install=gtk2hs-cairo.install source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz) -md5sums=('cdb322086f5b78a7611650b2b29826b3') +md5sums=('9d489fbb6cadb3d109543fe25c50195e') build() { cd ${srcdir}/cairo-$pkgver @@ -31,9 +31,6 @@ build() { } package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" 'cairo' 'haskell-mtl=2.0.1.0') - cd ${srcdir}/cairo-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/unregister.sh diff --git a/community/haskell-dataenc/PKGBUILD b/community/haskell-dataenc/PKGBUILD index 729f0b7d4..1bedcdbad 100644 --- a/community/haskell-dataenc/PKGBUILD +++ b/community/haskell-dataenc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67052 2012-03-03 16:10:16Z tdziedzic $ +# $Id: PKGBUILD 72386 2012-06-13 13:46:06Z tdziedzic $ # Maintainer: Vesa Kaihlavirta # Contributor: Arch Haskell Team # Package generated by cabal2arch 0.7.5 @@ -6,12 +6,12 @@ _hkgname=dataenc pkgname=haskell-dataenc pkgver=0.14.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="Data encoding library" url="http://hackage.haskell.org/package/dataenc" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' sh) +depends=('ghc=7.4.2-1' sh) source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('643a8c022b9c840f801faf9a661fe637') diff --git a/community/haskell-ghc-paths/PKGBUILD b/community/haskell-ghc-paths/PKGBUILD index 73dd03a21..25bb789ee 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=7 +pkgrel=8 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.1-2') +depends=('ghc=7.4.2-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/PKGBUILD b/community/haskell-glib/PKGBUILD index 0b74ceec2..367c45adb 100644 --- a/community/haskell-glib/PKGBUILD +++ b/community/haskell-glib/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 67605 2012-03-13 14:06:20Z spupykin $ +# $Id: PKGBUILD 72388 2012-06-13 13:46:17Z tdziedzic $ # Maintainer: Sergej Pupykin pkgname=haskell-glib -pkgver=0.12.3 +pkgver=0.12.3.1 pkgrel=1 pkgdesc="Binding to the GLIB library for Gtk2Hs." url="http://hackage.haskell.org/package/glib" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc' 'glib2') +depends=('ghc=7.4.2-1' 'glib2') makedepends=("gtk2hs-buildtools") options=('strip') install=gtk2hs-glib.install @@ -16,7 +16,7 @@ provides=('gtk2hs-glib') replaces=('gtk2hs-glib') conflicts=('gtk2hs-glib') source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz) -md5sums=('ace7b5a3ae64dc10886c701e3a7684cb') +md5sums=('f2899bd2a2850fe95479ddb63490eb04') build() { cd ${srcdir}/glib-$pkgver diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD index 060c24cd4..9b1e2ba62 100644 --- a/community/haskell-gtk/PKGBUILD +++ b/community/haskell-gtk/PKGBUILD @@ -1,25 +1,33 @@ -# $Id: PKGBUILD 67620 2012-03-13 14:23:58Z spupykin $ +# $Id: PKGBUILD 72389 2012-06-13 13:46:24Z tdziedzic $ # Maintainer: Sergej Pupykin pkgname=haskell-gtk pkgver=0.12.3 -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=$pkgver" 'haskell-mtl=2.0.1.0') +depends=('ghc' 'gtk2' "haskell-pango=0.12.3-2" 'haskell-mtl=2.1.1-1') 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=('65a65b5cc1e1db0fbf722779a7044ded') +source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz + 'gtk-gthread.h-include.patch') +md5sums=('65a65b5cc1e1db0fbf722779a7044ded' + '5277990f8ca28d2b12e77dac97c10354') build() { cd ${srcdir}/gtk-${pkgver} + + # fix compile error with latest glib2 >= 2.32 + # http://hackage.haskell.org/trac/gtk2hs/ticket/1253 + # got the patch from fedora + patch -Np1 -i ${srcdir}/gtk-gthread.h-include.patch + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \ --libsubdir=\$compiler/site-local/\$pkgid @@ -31,8 +39,8 @@ build() { } package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" 'gtk2' "haskell-pango=$pkgver" 'haskell-mtl=2.0.1.0') + #_ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + #depends=("ghc=${_ghcver}" 'gtk2' "haskell-pango=$pkgver" 'haskell-mtl=2.0.1.0') cd ${srcdir}/gtk-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh diff --git a/community/haskell-gtk/gtk-gthread.h-include.patch b/community/haskell-gtk/gtk-gthread.h-include.patch new file mode 100644 index 000000000..fc600d6be --- /dev/null +++ b/community/haskell-gtk/gtk-gthread.h-include.patch @@ -0,0 +1,15 @@ +diff -u gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c\~ gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c +--- gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c~ 2011-11-14 07:15:41.000000000 +0900 ++++ gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c 2012-01-08 14:58:45.849209318 +0900 +@@ -26,7 +26,8 @@ + */ + + #include +-#include ++/* f17 gives Error "Only can be included directly." ++ #include */ + #include + #include "hsgthread.h" + + +Diff finished. Sun Jan 8 14:58:54 2012 diff --git a/community/haskell-haskeline/PKGBUILD b/community/haskell-haskeline/PKGBUILD index eacb744ee..e18e5a596 100644 --- a/community/haskell-haskeline/PKGBUILD +++ b/community/haskell-haskeline/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 67058 2012-03-03 16:10:40Z tdziedzic $ +# $Id: PKGBUILD 72390 2012-06-13 13:46:29Z tdziedzic $ # Maintainer: Vesa Kaihlavirta # Contributor: Arch Haskell Team # Package generated by cabal2arch 0.7.6 _hkgname=haskeline pkgname=haskell-haskeline -pkgver=0.6.4.6 +pkgver=0.6.4.7 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.1-2' 'sh' 'haskell-utf8-string=0.3.7-1' 'haskell-mtl=2.0.1.0-4' 'haskell-terminfo=0.3.2.3-1') +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') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('c43d01e3ea23eed266060391ca680a76') +md5sums=('d8d0a90a9965f4f68935e76e4e777035') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD index 76e4d10a8..4840f72b8 100644 --- a/community/haskell-hslogger/PKGBUILD +++ b/community/haskell-hslogger/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 67060 2012-03-03 16:10:47Z tdziedzic $ +# $Id: PKGBUILD 72391 2012-06-13 13:46:34Z tdziedzic $ # Maintainer: Sergej Pupykin # Maintainer: Arch Haskell Team pkgname=haskell-hslogger pkgver=1.1.5 -pkgrel=6 +pkgrel=7 pkgdesc="Versatile logging framework" url="http://hackage.haskell.org/package/hslogger" license=('LGPL') arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-network=2.3.0.11-1') +depends=('ghc=7.4.2-1' 'haskell-mtl=2.1.1-1' 'haskell-network=2.3.0.14-1') install=${pkgname}.install source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz) md5sums=('cd3dfd6f88176bd53b333ea29130a857') diff --git a/community/haskell-html/PKGBUILD b/community/haskell-html/PKGBUILD index 44a3ea50b..f9aaa0f0f 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=10 +pkgrel=11 pkgdesc="HTML combinator library" url="http://hackage.haskell.org/package/html" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' sh) +depends=('ghc=7.4.2-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 bf74c6d06..aa044c1ad 100644 --- a/community/haskell-pango/PKGBUILD +++ b/community/haskell-pango/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 67607 2012-03-13 14:08:52Z spupykin $ +# $Id: PKGBUILD 72393 2012-06-13 13:46:44Z tdziedzic $ # Maintainer: Sergej Pupykin pkgname=haskell-pango pkgver=0.12.3 -pkgrel=1 +pkgrel=2 pkgdesc="Binding to the pango library for Gtk2Hs." url="http://hackage.haskell.org/package/pango" license=('LGPL2.1') arch=('i686' 'x86_64') -depends=('ghc' 'pango' 'haskell-glib' 'haskell-cairo') +depends=('ghc=7.4.2-1' 'pango' 'haskell-glib=0.12.3.1-1' 'haskell-cairo=0.12.3.1-1') makedepends=("gtk2hs-buildtools") provides=('gtk2hs-pango') replaces=('gtk2hs-pango') @@ -31,8 +31,8 @@ build() { } 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-` + #depends=("ghc=${_ghcver}" 'pango' 'haskell-glib' 'haskell-cairo') cd ${srcdir}/pango-${pkgver} install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh diff --git a/community/haskell-quickcheck/PKGBUILD b/community/haskell-quickcheck/PKGBUILD index 7b27cfb0c..70fbf160f 100644 --- a/community/haskell-quickcheck/PKGBUILD +++ b/community/haskell-quickcheck/PKGBUILD @@ -5,12 +5,13 @@ _hkgname=QuickCheck pkgname=haskell-quickcheck pkgver=2.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="Automatic testing of Haskell programs" url="http://hackage.haskell.org/package/QuickCheck" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' 'haskell-mtl=2.0.1.0-4' 'haskell-random=1.0.1.1-1' 'sh') +#depends=('ghc=7.4.2-1' 'haskell-mtl=2.0.1.0-4' 'haskell-random=1.0.1.1-1' 'sh') +depends=('ghc=7.4.2-1' 'haskell-random=1.0.1.1-2' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install md5sums=('9e22f9741cbc7d9cd8d52d3928e57b67') diff --git a/community/haskell-regex-base/PKGBUILD b/community/haskell-regex-base/PKGBUILD index 3b8ecb4bb..d787c6007 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=5 +pkgrel=6 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.1-2' sh 'haskell-mtl=2.0.1.0-4') +depends=('ghc=7.4.2-1' sh 'haskell-mtl=2.1.1-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 c880ff4f2..f1e91b553 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=1 +pkgrel=2 pkgdesc="Replaces and enhances Text.Regex" url="http://hackage.haskell.org/package/${_hkgname}" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' 'sh' 'haskell-regex-base=0.93.2-5' 'haskell-regex-posix=0.95.1-1') +depends=('ghc=7.4.2-1' 'sh' 'haskell-regex-base=0.93.2-6' 'haskell-regex-posix=0.95.2-1') 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 1bed15490..f49daf3b2 100644 --- a/community/haskell-regex-posix/PKGBUILD +++ b/community/haskell-regex-posix/PKGBUILD @@ -3,16 +3,16 @@ _hkgname=regex-posix pkgname=haskell-regex-posix -pkgver=0.95.1 +pkgver=0.95.2 pkgrel=1 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.1-2' 'sh' 'haskell-regex-base=0.93.2-5') +depends=('ghc=7.4.2-1' 'sh' 'haskell-regex-base=0.93.2-6') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('41cbc6d2b99837b64e0cc457c2737cc8') +md5sums=('1df0f9494aab110c7231f36393285c7c') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-stm/PKGBUILD b/community/haskell-stm/PKGBUILD index fa9819d51..8eba45641 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.2.0.1 -pkgrel=3 +pkgver=2.3 +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.1' 'sh') +depends=('ghc=7.4.2-1' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install -md5sums=('b1cf03ed315e00c33160746feeee8682') +md5sums=('fcaf091a492974045cc04b231a3b7c9c') build() { cd ${srcdir}/${_hkgname}-$pkgver diff --git a/community/haskell-syb/PKGBUILD b/community/haskell-syb/PKGBUILD index 9223379b2..301c463b5 100644 --- a/community/haskell-syb/PKGBUILD +++ b/community/haskell-syb/PKGBUILD @@ -2,17 +2,17 @@ # Contributor: Arch Haskell Team _hkgname=syb pkgname=haskell-syb -pkgver=0.3.6 +pkgver=0.3.6.1 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.1' sh) +depends=('ghc=7.4.2-1' sh) options=('strip') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install -md5sums=('0d807bb244fdeb95fa546b4311fcd8df') +md5sums=('50e0a755fcc735cccd0d77a89714ae38') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-tar/PKGBUILD b/community/haskell-tar/PKGBUILD index deaccdaf3..3bee1826d 100644 --- a/community/haskell-tar/PKGBUILD +++ b/community/haskell-tar/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 67068 2012-03-03 16:11:12Z tdziedzic $ +# $Id: PKGBUILD 72400 2012-06-13 13:47:19Z tdziedzic $ # Maintainer: Alexander Rødseth # Contributor: Arch Haskell Team pkgname=haskell-tar pkgver=0.4.0.0 -pkgrel=1 +pkgrel=2 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.1') +depends=('ghc=7.4.2-1') options=('strip') source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz") install=haskell-tar.install diff --git a/community/haskell-terminfo/PKGBUILD b/community/haskell-terminfo/PKGBUILD index eb1f1fc2c..7c57260e3 100644 --- a/community/haskell-terminfo/PKGBUILD +++ b/community/haskell-terminfo/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 67070 2012-03-03 16:11:18Z tdziedzic $ +# $Id: PKGBUILD 72401 2012-06-13 13:47:24Z tdziedzic $ # Maintainer: Vesa Kaihlavirta # Contributor: Arch Haskell Team _hkgname=terminfo pkgname=haskell-terminfo pkgver=0.3.2.3 -pkgrel=1 +pkgrel=2 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.1-2' 'sh') +depends=('ghc=7.4.2-1' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) install=${pkgname}.install md5sums=('706f546c629ac100a402c9c2629c25fa') diff --git a/community/haskell-utf8-string/PKGBUILD b/community/haskell-utf8-string/PKGBUILD index 03160c647..13123d4c8 100644 --- a/community/haskell-utf8-string/PKGBUILD +++ b/community/haskell-utf8-string/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 67072 2012-03-03 16:11:24Z tdziedzic $ +# $Id: PKGBUILD 72402 2012-06-13 13:47:29Z tdziedzic $ # Maintainer: Vesa Kaihlavirta # Contributor: Arch Haskell Team # Package generated by cabal2arch 0.7.6 _hkgname=utf8-string pkgname=haskell-utf8-string pkgver=0.3.7 -pkgrel=1 +pkgrel=2 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.1' 'sh') +depends=('ghc=7.4.2-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 54771e0f1..5afddd050 100644 --- a/community/haskell-x11-xft/PKGBUILD +++ b/community/haskell-x11-xft/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 67076 2012-03-03 16:11:39Z tdziedzic $ +# $Id: PKGBUILD 72404 2012-06-13 13:47:39Z tdziedzic $ # Maintainer: Sergej Pupykin _hkgname=X11-xft pkgname=haskell-x11-xft pkgver=0.3.1 -pkgrel=3 +pkgrel=4 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.1' 'haskell-x11=1.5.0.1' 'haskell-utf8-string=0.3.7' 'libxft') +depends=('ghc=7.4.2-1' 'haskell-x11=1.6.0' '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 bea74da61..ded1012e2 100644 --- a/community/haskell-x11/PKGBUILD +++ b/community/haskell-x11/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 69214 2012-04-10 04:17:58Z spupykin $ +# $Id: PKGBUILD 72403 2012-06-13 13:47:34Z tdziedzic $ # Maintainer: Sergej Pupykin # Contributor: shild # Maintainer: Vesa Kaihlavirta _hkgname=X11 pkgname=haskell-x11 -pkgver=1.5.0.1 -pkgrel=3 +pkgver=1.6.0 +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.1" "haskell-syb=0.3.6" 'libx11' 'libxinerama' 'libxrandr') +depends=("ghc=7.4.2-1" "haskell-syb=0.3.6.1" 'libx11' 'libxinerama' 'libxrandr') conflicts=(haskell-x11-extras) install=hsmod.install source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz) -md5sums=('7d69b204f773a0335828ced0e1e069f2') +md5sums=('8199520ce58e91762d31d54ed081b99c') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/haskell-xhtml/PKGBUILD b/community/haskell-xhtml/PKGBUILD index b3762851d..68041976a 100644 --- a/community/haskell-xhtml/PKGBUILD +++ b/community/haskell-xhtml/PKGBUILD @@ -4,16 +4,16 @@ _hkgname=xhtml pkgname=haskell-xhtml -pkgver=3000.2.0.5 -pkgrel=2 +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" license=('custom:BSD3') arch=('i686' 'x86_64') -depends=('ghc=7.4.1-2' 'sh') +depends=('ghc=7.4.2-1' 'sh') source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) install=${pkgname}.install -md5sums=('d51e20de416b825aba6b874a221acfc4') +md5sums=('c63487bea16cbf0ecf252d6ed73106bf') build() { cd ${srcdir}/${_hkgname}-${pkgver} diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD index 30c3347e3..7bb03e77d 100644 --- a/community/hedgewars/PKGBUILD +++ b/community/hedgewars/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 67078 2012-03-03 16:11:51Z tdziedzic $ +# $Id: PKGBUILD 72406 2012-06-13 13:47:51Z tdziedzic $ # Maintainer: Sergej Pupykin pkgname=hedgewars pkgver=0.9.17 -pkgrel=2 +pkgrel=3 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64') url="http://hedgewars.org" @@ -11,10 +11,10 @@ license=('GPL' 'custom') depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua') makedepends=('fpc' 'cmake' # haskell specific - 'ghc=7.4.1-2' - 'haskell-network=2.3.0.11-1' 'haskell-bytestring-show=0.3.5.1-2' - 'haskell-utf8-string=0.3.7-1' 'haskell-dataenc=0.14.0.3-1' - 'haskell-hslogger=1.1.5-6') + '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') source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 hedgewars.desktop hedgewars.png) diff --git a/community/kpartsplugin/PKGBUILD b/community/kpartsplugin/PKGBUILD index 14460add9..7c4ece00b 100644 --- a/community/kpartsplugin/PKGBUILD +++ b/community/kpartsplugin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71596 2012-05-30 14:38:44Z tredaelli $ +# $Id: PKGBUILD 72379 2012-06-13 10:58:19Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: birdflesh # Contributor: Frikilinux pkgname=kpartsplugin -pkgver=20120529 +pkgver=20120605 pkgrel=1 pkgdesc="This plugin uses KDE's KParts to embed file viewers into non-KDE browsers" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL3' 'BSD') depends=('kdelibs') makedepends=('automoc4' 'cmake') source=("${url}${pkgname}-${pkgver}.tar.bz2" "LICENSE") -md5sums=('ad6b0f146f6b1c6bf1db4ff21ba95dda' +md5sums=('c6deb7b58b0bac9e5ef89afee83ef17c' 'c4cc811349e40e9f34e77e27b902ad96') build(){ diff --git a/community/mingw32-gcc-base/PKGBUILD b/community/mingw32-gcc-base/PKGBUILD index 08da00e6d..17a0b9a57 100644 --- a/community/mingw32-gcc-base/PKGBUILD +++ b/community/mingw32-gcc-base/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61843 2012-01-08 20:32:16Z spupykin $ +# $Id: PKGBUILD 72373 2012-06-13 10:03:53Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Ondrej Jirman pkgname=mingw32-gcc-base -pkgver=4.6.2 +pkgver=4.7.0 _w32apiver=3.17 _runtimever=3.20 _uprel=1 @@ -21,7 +21,7 @@ source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge http://downloads.sourceforge.net/project/mingw/MinGW/Base/w32api/w32api-${_w32apiver}/w32api-${_w32apiver}-${_upw32rel}-mingw32-src.tar.lzma http://downloads.sourceforge.net/project/mingw/MinGW/Base/mingw-rt/mingwrt-${_runtimever}/mingwrt-${_runtimever}-mingw32-src.tar.gz gcc-1-mingw-float.patch) -md5sums=('1f71a7f486bdf7a9875b7932f628b2b4' +md5sums=('9a4ecdacdc6dc83a4a43ef0693e2295d' '89e5800096aa334009f98e7c1743d825' '26c0886cc60729b94956cc6d81cd076c' '2407123c35c0aa92ee5ffc27decca9a7') diff --git a/community/mingw32-gcc/PKGBUILD b/community/mingw32-gcc/PKGBUILD index 058236e68..bf61f872b 100644 --- a/community/mingw32-gcc/PKGBUILD +++ b/community/mingw32-gcc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 61845 2012-01-08 21:08:39Z spupykin $ +# $Id: PKGBUILD 72371 2012-06-13 10:02:07Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Ondrej Jirman pkgname=mingw32-gcc -pkgver=4.6.2 +pkgver=4.7.0 pkgrel=1 _uprel=1 arch=(i686 x86_64) @@ -17,7 +17,7 @@ url="http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/" license=(GPL LGPL) source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma gcc-1-mingw-float.patch) -md5sums=('1f71a7f486bdf7a9875b7932f628b2b4' +md5sums=('9a4ecdacdc6dc83a4a43ef0693e2295d' '2407123c35c0aa92ee5ffc27decca9a7') build() diff --git a/community/vidalia/PKGBUILD b/community/vidalia/PKGBUILD index cd943c4cd..4b2805e9f 100644 --- a/community/vidalia/PKGBUILD +++ b/community/vidalia/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64515 2012-02-15 15:45:44Z tredaelli $ +# $Id: PKGBUILD 72377 2012-06-13 10:27:38Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: Rorschach pkgname=vidalia -pkgver=0.2.17 +pkgver=0.2.19 pkgrel=1 pkgdesc="Controller GUI for Tor" url="https://www.torproject.org/vidalia" @@ -12,8 +12,9 @@ license=('GPL') depends=('qt' 'tor') makedepends=('cmake') install=vidalia.install -source=("https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz") -md5sums=(dcfd49e7f2ff73702e6007091cbe33d6) +source=(https://www.torproject.org/vidalia/dist/$pkgname-$pkgver.tar.gz{,.asc}) +md5sums=('caf92b44ad2932bbc1c40d6405951c39' + '1ba45d7c91797e880d79a3fc85818dee') build() { [[ -f /etc/profile.d/qt4.sh ]] && source /etc/profile.d/qt4.sh diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD index 2df798cad..d3afe6262 100644 --- a/community/xmobar/PKGBUILD +++ b/community/xmobar/PKGBUILD @@ -1,25 +1,26 @@ -# $Id: PKGBUILD 67080 2012-03-03 16:12:00Z tdziedzic $ +# $Id: PKGBUILD 72407 2012-06-13 13:47:57Z tdziedzic $ # Maintainer: Sergej Pupykin # Contributor: Arch Haskell Team # Package generated by cabal2arch 0.4 pkgname=xmobar -pkgver=0.14 -pkgrel=2 +pkgver=0.15 +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.0.2' 'haskell-x11>=1.3.0' 'haskell-x11-xft>=0.2' 'haskell-utf8-string' - 'haskell-stm' 'haskell-parsec>=3' 'haskell-mtl>=2') +makedepends=('ghc=7.4.2-1' 'haskell-x11=1.6.0' '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) -md5sums=('b965e2db0555c741db96945210995777') +source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz xmobar-0.15-haskell-mtl.patch) build() { cd ${srcdir}/xmobar-$pkgver -# runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_xft with_alsa with_inotify with_iwlib" + # Fix haskell mtl dep + patch -Np1 -i $srcdir/xmobar-0.15-haskell-mtl.patch + runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_xft with_iwlib" runhaskell Setup build } @@ -29,3 +30,7 @@ package() { runhaskell Setup copy --destdir=${pkgdir} install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE } +md5sums=('0658679b39168f49d32fe178029ff9f1') + +md5sums=('0658679b39168f49d32fe178029ff9f1' + '0d9fb64557233c3a349feb53097c7b09') diff --git a/community/xmobar/xmobar-0.15-haskell-mtl.patch b/community/xmobar/xmobar-0.15-haskell-mtl.patch new file mode 100644 index 000000000..bee3dc354 --- /dev/null +++ b/community/xmobar/xmobar-0.15-haskell-mtl.patch @@ -0,0 +1,12 @@ +diff -aur xmobar-0.15.old/xmobar.cabal xmobar-0.15/xmobar.cabal +--- xmobar-0.15.old/xmobar.cabal 2012-06-11 17:04:21.422444926 +0000 ++++ xmobar-0.15/xmobar.cabal 2012-06-11 17:05:16.772001865 +0000 +@@ -112,7 +112,7 @@ + time, + filepath, + X11 == 1.6.*, +- mtl == 2.0.*, ++ mtl >= 2.0 && <2.2, + parsec == 3.1.*, + stm == 2.3.* + diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD index 91a537576..dbb48f0a2 100644 --- a/community/xmonad-contrib/PKGBUILD +++ b/community/xmonad-contrib/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 69222 2012-04-10 09:03:48Z bluewind $ +# $Id: PKGBUILD 72409 2012-06-13 13:48:15Z tdziedzic $ # Maintainer: Sergej Pupykin # Maintainer: Vesa Kaihlavirta # Contributor: orbisvicis pkgname=xmonad-contrib pkgver=0.10 -pkgrel=3 +pkgrel=4 pkgdesc="Add-ons for xmonad" arch=('i686' 'x86_64') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.4.1-2' 'xmonad=0.10-3' 'sh' 'haskell-x11=1.5.0.1-3' 'haskell-x11-xft=0.3.1-3' 'haskell-utf8-string=0.3.7-1' 'haskell-random=1.0.1.1-1') +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') install='xmonad-contrib.install' -source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81') +source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-0.10-x11-1.6.patch) +md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81' + '32163aaeb3424cf73bf831640c162a8a') build() { cd $srcdir/$pkgname-$pkgver + # Patch xmonad-contrib to support haskell-x11 + patch -Np1 -i $srcdir/xmonad-contrib-0.10-x11-1.6.patch + runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \ --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build diff --git a/community/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch b/community/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch new file mode 100644 index 000000000..8372b4144 --- /dev/null +++ b/community/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch @@ -0,0 +1,46 @@ +Tue Mar 20 03:53:11 FET 2012 Adam Vogt + * Bump version to 0.10.1 + + Raising the X11 dependency while keeping the xmonad version the same leads to + problems where cabal install uses the dependency versions following hackage, + not what is installed. +diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal +index 743bdc8..0fbf4ac 100644 +--- a/xmonad-contrib.cabal ++++ b/xmonad-contrib.cabal +@@ -61,7 +61,7 @@ library + extensions: ForeignFunctionInterface + cpp-options: -DXFT + +- build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.6, xmonad>=0.10, xmonad<0.11, utf8-string ++ build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.7, xmonad>=0.10, xmonad<0.11, utf8-string + + if true + ghc-options: -fwarn-tabs -Wall +diff --git a/XMonad/Layout/Spiral.hs b/XMonad/Layout/Spiral.hs +index a485d95..5e388e2 100644 +--- a/XMonad/Layout/Spiral.hs ++++ b/XMonad/Layout/Spiral.hs +@@ -26,7 +26,7 @@ module XMonad.Layout.Spiral ( + ) where + + import Data.Ratio +-import XMonad ++import XMonad (LayoutClass(..), Rectangle(..), fromMessage, Resize(..)) + import XMonad.StackSet ( integrate ) + + -- $usage +diff --git a/XMonad/Util/Paste.hs b/XMonad/Util/Paste.hs +index 0d78653..4b7fd3b 100644 +--- a/XMonad/Util/Paste.hs ++++ b/XMonad/Util/Paste.hs +@@ -23,7 +23,8 @@ module XMonad.Util.Paste ( -- * Usage + where + + import XMonad (io, theRoot, withDisplay, X ()) +-import Graphics.X11 ++import Graphics.X11 (Window, shiftMask, KeyMask, stringToKeysym, KeySym, keysymToKeycode) ++import Graphics.X11 (allocaXEvent, keyPress, sendEvent, keyPressMask, keyRelease, keyReleaseMask) + import Graphics.X11.Xlib.Extras (none, setEventType, setKeyEvent) + import Control.Monad.Reader (asks) + import XMonad.Operations (withFocused) diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD index 14c49cecc..a64c266dd 100644 --- a/community/xmonad/PKGBUILD +++ b/community/xmonad/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 67082 2012-03-03 16:12:17Z tdziedzic $ +# $Id: PKGBUILD 72408 2012-06-13 13:48:08Z tdziedzic $ # Maintainer: Sergej Pupykin # Maintainer: Vesa Kaihlavirta # Contributor: shild pkgname=xmonad pkgver=0.10 -pkgrel=3 -pkgdesc="A lightweight X11 tiled window manager written in Haskell" +pkgrel=4 +pkgdesc="Lightweight X11 tiled window manager written in Haskell" arch=('i686' 'x86_64') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.4.1' 'gmp' 'haskell-x11=1.5.0.1' 'sh' 'haskell-mtl=2.0.1.0' 'haskell-utf8-string=0.3.7') +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') +makedepends=('setconf' 'gendesk') optdepends=('xorg-xmessage: for displaying visual error messages') install='xmonad.install' source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz - xmonad.desktop - xmonad.session - xmonad.svg) -md5sums=('f8381e1ec15137863558a454d4466467' - 'f8e3d84a9f154d1b5d7fcffbc0a058c9' - '9d1bc84a7f32897d32f3fc71ef76228e' - '72bfa5e62e4e44fe7fa59b6a7593d993') + xmonad.svg xmonad-0.10-x11-1.6.patch) build() { + cd "$srcdir" + gendesk + cd $srcdir/$pkgname-$pkgver + # Patch XMonad so we support haskell 1.6 + patch -Np1 -i $srcdir/xmonad-0.10-x11-1.6.patch + + runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \ --libsubdir=\$compiler/site-local/\$pkgid runhaskell Setup build @@ -37,13 +39,14 @@ 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 install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE - install -D -m644 $srcdir/xmonad.desktop $pkgdir/usr/share/xsessions/xmonad.desktop - install -D -m644 $srcdir/xmonad.session $pkgdir/usr/share/gnome-session/sessions/xmonad.session install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg } +md5sums=('f8381e1ec15137863558a454d4466467' + '72bfa5e62e4e44fe7fa59b6a7593d993' + '22d29900d71f09a8f9fa6f0d2f3fed32') diff --git a/community/xmonad/xmonad-0.10-x11-1.6.patch b/community/xmonad/xmonad-0.10-x11-1.6.patch new file mode 100644 index 000000000..5b7afaf3b --- /dev/null +++ b/community/xmonad/xmonad-0.10-x11-1.6.patch @@ -0,0 +1,19 @@ +Tue Mar 20 03:49:24 FET 2012 Adam Vogt + * Address versioning problems related to X11 1.6 release. + + Bump version to 0.10.1 since cabal uses hackage dependencies even when the + locally installed package differs. + + Allow X11-1.6 dependency. +diff -rN -u old-xmonad/xmonad.cabal new-xmonad/xmonad.cabal +--- old-xmonad/xmonad.cabal 2012-05-06 12:20:26.788767220 +0300 ++++ new-xmonad/xmonad.cabal 2012-05-06 12:20:26.818766844 +0300 +@@ -46,7 +46,7 @@ + build-depends: base < 5 && >=3, containers, directory, process, filepath, extensible-exceptions + else + build-depends: base < 3 +- build-depends: X11>=1.5.0.0 && < 1.6, mtl, unix, ++ build-depends: X11>=1.5 && < 1.7, mtl, unix, + utf8-string >= 0.3 && < 0.4 + + if true diff --git a/community/xmonad/xmonad-gnome-session.session b/community/xmonad/xmonad-gnome-session.session new file mode 100644 index 000000000..c0bd16781 --- /dev/null +++ b/community/xmonad/xmonad-gnome-session.session @@ -0,0 +1,6 @@ +[GNOME Session] +Name=Xmonad session +RequiredComponents=gnome-panel;gnome-settings-daemon; +RequiredProviders=windowmanager;notifications; +DefaultProvider-windowmanager=xmonad +DefaultProvider-notifications=notification-daemon -- cgit v1.2.3-54-g00ecf