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/xmonad/PKGBUILD | 31 +++++++++++++++------------ community/xmonad/xmonad-0.10-x11-1.6.patch | 19 ++++++++++++++++ community/xmonad/xmonad-gnome-session.session | 6 ++++++ 3 files changed, 42 insertions(+), 14 deletions(-) create mode 100644 community/xmonad/xmonad-0.10-x11-1.6.patch create mode 100644 community/xmonad/xmonad-gnome-session.session (limited to 'community/xmonad') 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