[arch-commits] Commit in openbox/trunk (PKGBUILD fix-workspaces-number-in-gdm.patch)

[Andrea Scarpino]

    Date: Tuesday, October 20, 2009 @ 04:09:21
  Author: andrea
Revision: 56189

upgpkg: openbox 3.4.7.2-4
    FS#16676

Added:
  openbox/trunk/fix-workspaces-number-in-gdm.patch
Modified:
  openbox/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |   10 ++++++---
 fix-workspaces-number-in-gdm.patch |   36 +++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-20 08:00:06 UTC (rev 56188)
+++ PKGBUILD	2009-10-20 08:09:21 UTC (rev 56189)
@@ -5,7 +5,7 @@
 
 pkgname=openbox
 pkgver=3.4.7.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A window manager for the X11 windowing system"
 arch=(i686 x86_64)
 license=('GPL')
@@ -18,15 +18,19 @@
 options=('!libtool')
 backup=('usr/etc/xdg/openbox/menu.xml' 'usr/etc/xdg/openbox/rc.xml')
 source=(http://www.icculus.org/openbox/releases/${pkgname}-${pkgver}.tar.gz
-	'which-2.20.patch')
+	'which-2.20.patch'
+	'fix-workspaces-number-in-gdm.patch')
 md5sums=('9e7589e90519bc6ac2f4656ea6869439'
-         'b72cac492e0ed83fd5ced9c1263cfa24')
+         'b72cac492e0ed83fd5ced9c1263cfa24'
+	 '17f354e7565bac87697a8dad827abc0b')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   #FS#11455
   patch -Np1 -i ${srcdir}/which-2.20.patch || return 1
+  #FS#16676
+  patch -Np1 -i ${srcdir}/fix-workspaces-number-in-gdm.patch || return 1
 
   ./configure --prefix=/usr \
     --with-x \

Added: fix-workspaces-number-in-gdm.patch
===================================================================
--- fix-workspaces-number-in-gdm.patch	                        (rev 0)
+++ fix-workspaces-number-in-gdm.patch	2009-10-20 08:09:21 UTC (rev 56189)
@@ -0,0 +1,36 @@
+--- openbox-3.4.7.2/data/xsession/openbox-gnome-session.in~	2008-02-29 22:18:12.000000000 +0100
++++ openbox-3.4.7.2/data/xsession/openbox-gnome-session.in	2008-06-10 18:37:10.000000000 +0200
+@@ -7,6 +7,9 @@ if test -n "$1"; then
+   exit
+ fi
+ 
++# Clean up after GDM
++xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
++
+ # Run GNOME with Openbox as its window manager
+ export WINDOW_MANAGER="@bindir@/openbox"
+ exec gnome-session --choose-session=openbox-session "$@"
+--- openbox-3.4.7.2/data/xsession/openbox-kde-session.in~	2008-02-29 22:18:12.000000000 +0100
++++ openbox-3.4.7.2/data/xsession/openbox-kde-session.in	2008-06-10 18:37:26.000000000 +0200
+@@ -7,6 +7,9 @@ if test -n "$1"; then
+   exit
+ fi
+ 
++# Clean up after GDM
++xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
++
+ # Run KDE with Openbox as its window manager
+ export KDEWM="@bindir@/openbox"
+ exec startkde "$@"
+--- openbox-3.4.7.2/data/xsession/openbox-session.in~	2008-02-29 22:18:12.000000000 +0100
++++ openbox-3.4.7.2/data/xsession/openbox-session.in	2008-06-10 18:37:54.000000000 +0200
+@@ -7,6 +7,9 @@ if test -n "$1"; then
+   exit
+ fi
+ 
++# Clean up after GDM
++xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
++
+ AUTOSTART="$HOME/.config/openbox/autostart.sh"
+ GLOBALAUTOSTART="@configdir@/openbox/autostart.sh"
+