[arch-commits] Commit in openbox/repos (3 files)

[Andrea Scarpino]

    Date: Sunday, December 13, 2009 @ 12:54:29
  Author: andrea
Revision: 61231

Merged revisions 61230 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/openbox/trunk

........
  r61230 | andrea | 2009-12-13 18:53:47 +0100 (Sun, 13 Dec 2009) | 2 lines
  
  upgpkg: openbox 3.4.8-2
      fix workspaces number after GDM login (FS#17467)
........

Added:
  openbox/repos/extra-i686/fix-workspaces-number-in-gdm.patch
    (from rev 61230, openbox/trunk/fix-workspaces-number-in-gdm.patch)
Modified:
  openbox/repos/extra-i686/	(properties)
  openbox/repos/extra-i686/PKGBUILD

------------------------------------+
 PKGBUILD                           |   12 +++++++----
 fix-workspaces-number-in-gdm.patch |   36 +++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 4 deletions(-)


Property changes on: openbox/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /openbox/trunk:1-60909
   + /openbox/trunk:1-61230

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-12-13 17:53:47 UTC (rev 61230)
+++ extra-i686/PKGBUILD	2009-12-13 17:54:29 UTC (rev 61231)
@@ -1,11 +1,11 @@
 # $Id$
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: tobias <tobias at archlinux.org>
 # Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
 
 pkgname=openbox
 pkgver=3.4.8
-pkgrel=1
+pkgrel=2
 pkgdesc="A window manager for the X11 windowing system"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,15 +18,19 @@
 options=('!libtool' 'force')
 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=('3523fe9760947a15fb8ed3611090ccd2'
-         'b72cac492e0ed83fd5ced9c1263cfa24')
+         'b72cac492e0ed83fd5ced9c1263cfa24'
+         'ce1f5cd7dbcba9601e2f6dfa666064dc')
 
 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 \

Copied: openbox/repos/extra-i686/fix-workspaces-number-in-gdm.patch (from rev 61230, openbox/trunk/fix-workspaces-number-in-gdm.patch)
===================================================================
--- extra-i686/fix-workspaces-number-in-gdm.patch	                        (rev 0)
+++ extra-i686/fix-workspaces-number-in-gdm.patch	2009-12-13 17:54:29 UTC (rev 61231)
@@ -0,0 +1,36 @@
+--- openbox-3.4.8/data/xsession/openbox-gnome-session.in~	2009-12-13 18:46:58.480826774 +0100
++++ openbox-3.4.8/data/xsession/openbox-gnome-session.in	2009-12-13 18:49:15.776973708 +0100
+@@ -7,6 +7,9 @@
+   exit
+ fi
+ 
++# Clean up after GDM
++xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null
++
+ VER=$(gnome-session --version 2>/dev/null | \
+       sed -e 's/[^0-9.]*\([0-9.]\+\)/\1/')
+ 
+--- openbox-3.4.8/data/xsession/openbox-kde-session.in~	2009-12-13 18:47:07.676987674 +0100
++++ openbox-3.4.8/data/xsession/openbox-kde-session.in	2009-12-13 18:48:48.140310531 +0100
+@@ -7,6 +7,9 @@
+   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.8/data/xsession/openbox-session.in~	2009-12-13 18:47:13.173649966 +0100
++++ openbox-3.4.8/data/xsession/openbox-session.in	2009-12-13 18:48:17.696977111 +0100
+@@ -7,6 +7,9 @@
+   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="${XDG_CONFIG_HOME:-"$HOME/.config"}/openbox/autostart.sh"
+ GLOBALAUTOSTART="@configdir@/openbox/autostart.sh"
+