Tue Sep 3 01:50:53 PDT 2013

2 files changed, 29 insertions, 6 deletions

diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD
index 7ef6a9fc1..62c63481f 100644
--- a/community/openbox/PKGBUILD
+++ b/community/openbox/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96565 2013-09-01 07:12:43Z bpiotrowski $
+# $Id: PKGBUILD 96638 2013-09-02 18:32:53Z bgyorgy $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,24 +6,28 @@
 
 pkgname=openbox
 pkgver=3.5.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Highly configurable and lightweight X11 window manager'
 arch=('i686' 'x86_64')
 url='http://openbox.org'
 license=('GPL')
 depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
          'libxcursor' 'pango' 'imlib2' 'librsvg')
-optdepends=('python2: for the xdg-autostart script')
+optdepends=('gnome-flashback-session: for the GNOME/Openbox xsession'
+            'kdebase-workspace: for the KDE/Openbox xsession'
+            'python2-xdg: for the openbox-xdg-autostart script')
 groups=('lxde')
 options=('!libtool')
 backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml'
         'etc/xdg/openbox/autostart' 'etc/xdg/openbox/environment')
 source=(http://www.icculus.org/openbox/releases/$pkgname-$pkgver.tar.gz
         openbox-3.5.0-title-matching.patch
-        openbox-3.5.0-which-2.20.patch)
+        openbox-3.5.0-which-2.20.patch
+        openbox-3.5.0-gnome-session.patch)
 md5sums=('93df606606053b7e8578a5c116afb8ec'
          '0a11d7149da210a31ef88f8a9c717711'
-         '7ca3b5244bb092d46f5bcf1e2bdf4a18')
+         '7ca3b5244bb092d46f5bcf1e2bdf4a18'
+         '47fb1a16af05b6aba3b07051e6027f93')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -31,6 +35,9 @@ prepare() {
   patch -Np1 -i "$srcdir"/openbox-3.5.0-title-matching.patch  # OB#5277
   patch -Np1 -i "$srcdir"/openbox-3.5.0-which-2.20.patch # FS#11455
 
+  # Fix GNOME/Openbox xsession with GNOME 3.8
+  patch -Np1 -i "$srcdir"/openbox-3.5.0-gnome-session.patch
+
   sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
     data/autostart/openbox-xdg-autostart
 }
@@ -48,7 +55,9 @@ build() {
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-  rm "$pkgdir"/usr/bin/{gdm-control,gnome-panel-control}
+
+  rm "$pkgdir"/usr/bin/gdm-control \
+    "$pkgdir"/usr/share/gnome-session/sessions/openbox-gnome-fallback.session
 
   sed -i 's:startkde:/usr/bin/\0:' \
     "$pkgdir"/usr/share/xsessions/openbox-kde.desktop
diff --git a/community/openbox/openbox-3.5.0-gnome-session.patch b/community/openbox/openbox-3.5.0-gnome-session.patch
new file mode 100644
index 000000000..e0121d9a8
--- /dev/null
+++ b/community/openbox/openbox-3.5.0-gnome-session.patch
@@ -0,0 +1,14 @@
+diff -Naur openbox-3.5.2.orig/data/gnome-session/openbox-gnome.session openbox-3.5.2/data/gnome-session/openbox-gnome.session
+--- openbox-3.5.2.orig/data/gnome-session/openbox-gnome.session	2013-09-02 16:06:03.076984284 +0000
++++ openbox-3.5.2/data/gnome-session/openbox-gnome.session	2013-09-02 16:07:32.696385427 +0000
+@@ -1,9 +1,3 @@
+ [GNOME Session]
+ Name=GNOME/Openbox
+-RequiredComponents=gnome-settings-daemon;
+-# Try load with the gnome-panel and use the fallback if we can't load a panel
+-RequiredProviders=windowmanager;panel
+-DefaultProvider-windowmanager=openbox
+-DefaultProvider-panel=gnome-panel
+-FallbackSession=openbox-gnome-fallback
+-DesktopName=GNOME
++RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;openbox;notification-daemon;polkit-gnome-authentication-agent-1;gnome-fallback-background-helper;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper;