From 715631caf52784c47c8ed3aeb6cbdba2715a08db Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Sun, 26 Jun 2011 23:06:14 +0000
Subject: Sun Jun 26 23:06:14 UTC 2011

---
 community/xmonad/PKGBUILD       | 22 +++++++++++-----------
 community/xmonad/xmonad.desktop | 15 +++++----------
 community/xmonad/xmonad.session |  6 ++++++
 3 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 community/xmonad/xmonad.session

(limited to 'community/xmonad')

diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD
index 63bad6732..d669fc325 100644
--- a/community/xmonad/PKGBUILD
+++ b/community/xmonad/PKGBUILD
@@ -1,26 +1,23 @@
-# $Id: PKGBUILD 41283 2011-03-04 23:20:31Z remy $
+# $Id: PKGBUILD 49967 2011-06-22 19:45:42Z vegai $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: shild <shildv@gmail.com>
 
 pkgname=xmonad
 pkgver=0.9.2
-pkgrel=1.2
+pkgrel=2.1
 pkgdesc="A lightweight X11 tiled window manager written in Haskell"
 arch=('i686' 'x86_64')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.0.2' 'gmp' 'haskell-x11=1.5.0.0' 'sh' 'haskell-mtl=2.0.1.0' 'haskell-utf8-string=0.3.6')
+depends=('ghc=7.0.3' 'gmp' 'haskell-x11=1.5.0.0' 'sh' 'haskell-mtl=2.0.1.0' 'haskell-utf8-string=0.3.6')
 install='xmonad.install'
 source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
-        xmonad.desktop xmonad.svg)
-md5sums=('5a4117f798664d772d2a834ea6c90f1c'
-         'f61961459f190b6d948f1f2782afa7a7'
-         '72bfa5e62e4e44fe7fa59b6a7593d993')
+        xmonad.desktop xmonad.session xmonad.svg)
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  runhaskell Setup.lhs configure --ghc --enable-split-objs --prefix=/usr \
+  runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \
              --libsubdir=\$compiler/site-local/\$pkgid
   runhaskell Setup build
   runhaskell Setup register --gen-script
@@ -39,8 +36,11 @@ package() {
 
   install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE
 
-  install -D -m644 $srcdir/xmonad.desktop $pkgdir/usr/share/applications/xmonad.desktop
-  mkdir -p $pkgdir/etc/X11/sessions
-  ln -s /usr/share/applications/xmonad.desktop $pkgdir/etc/X11/sessions/xmonad.desktop
+  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=('5a4117f798664d772d2a834ea6c90f1c'
+         'f8e3d84a9f154d1b5d7fcffbc0a058c9'
+         '9d1bc84a7f32897d32f3fc71ef76228e'
+         '72bfa5e62e4e44fe7fa59b6a7593d993')
diff --git a/community/xmonad/xmonad.desktop b/community/xmonad/xmonad.desktop
index a99be19f9..0af0f2d9b 100644
--- a/community/xmonad/xmonad.desktop
+++ b/community/xmonad/xmonad.desktop
@@ -1,12 +1,7 @@
 [Desktop Entry]
-Encoding=UTF-8
-Name=xmonad
+Name=Xmonad GNOME
+Comment=Tiling window manager
+TryExec=/usr/bin/gnome-session
+Exec=gnome-session --session=xmonad
+Type=XSession
 Icon=/usr/share/pixmaps/xmonad.svg
-Comment=This session starts xmonad
-Exec=/usr/bin/xmonad
-Type=Application
-NoDisplay=true
-X-GNOME-WMName=Xmonad
-X-GNOME-Autostart-Phase=WindowManager
-X-GNOME-Provides=windowmanager
-X-GNOME-Autostart-Notify=false
diff --git a/community/xmonad/xmonad.session b/community/xmonad/xmonad.session
new file mode 100644
index 000000000..c0bd16781
--- /dev/null
+++ b/community/xmonad/xmonad.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