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

[Andrea Scarpino]

    Date: Wednesday, December 9, 2009 @ 06:39:29
  Author: andrea
Revision: 60909

upgpkg: openbox 3.4.8-1
    upstream release

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-12-09 10:51:41 UTC (rev 60908)
+++ PKGBUILD	2009-12-09 11:39:29 UTC (rev 60909)
@@ -1,36 +1,32 @@
 # $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: 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.7.2
-pkgrel=4
+pkgver=3.4.8
+pkgrel=1
 pkgdesc="A window manager for the X11 windowing system"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL')
-depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr' \
-         'libxcursor' 'pango')
+depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr'
+	'libxcursor' 'pango')
 optdepends=('pyxdg: for the xdg-autostart script')
 url="http://icculus.org/openbox"
 groups=('lxde')
 install=openbox.install
-options=('!libtool')
+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'
-	'fix-workspaces-number-in-gdm.patch')
-md5sums=('9e7589e90519bc6ac2f4656ea6869439'
-         'b72cac492e0ed83fd5ced9c1263cfa24'
-	 '17f354e7565bac87697a8dad827abc0b')
+	'which-2.20.patch')
+md5sums=('3523fe9760947a15fb8ed3611090ccd2'
+         'b72cac492e0ed83fd5ced9c1263cfa24')
 
 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 \
@@ -39,6 +35,6 @@
   make || return 1
   make DESTDIR=${pkgdir} install
 
-  sed -i "s:startkde:/usr/bin/\0:" ${startdir}/pkg/usr/share/xsessions/openbox-kde.desktop
-  sed -i "s:=gnome-session:=/usr/bin/gnome-session:" ${startdir}/pkg/usr/share/xsessions/openbox-gnome.desktop
+  sed -i "s:startkde:/usr/bin/\0:" ${pkgdir}/usr/share/xsessions/openbox-kde.desktop
+  sed -i "s:=gnome-session:=/usr/bin/gnome-session:" ${pkgdir}/usr/share/xsessions/openbox-gnome.desktop
 }

Deleted: fix-workspaces-number-in-gdm.patch
===================================================================
--- fix-workspaces-number-in-gdm.patch	2009-12-09 10:51:41 UTC (rev 60908)
+++ fix-workspaces-number-in-gdm.patch	2009-12-09 11:39:29 UTC (rev 60909)
@@ -1,36 +0,0 @@
---- 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"
-