[arch-commits] Commit in openbox/repos (14 files)
Balló György
bgyorgy at nymeria.archlinux.org
Wed Oct 9 08:18:20 UTC 2013
Date: Wednesday, October 9, 2013 @ 10:18:19
Author: bgyorgy
Revision: 98381
archrelease: copy trunk to community-i686, community-x86_64
Added:
openbox/repos/community-i686/PKGBUILD
(from rev 98380, openbox/trunk/PKGBUILD)
openbox/repos/community-i686/openbox-3.5.0-title-matching.patch
(from rev 98380, openbox/trunk/openbox-3.5.0-title-matching.patch)
openbox/repos/community-i686/openbox-3.5.0-which-2.20.patch
(from rev 98380, openbox/trunk/openbox-3.5.0-which-2.20.patch)
openbox/repos/community-x86_64/PKGBUILD
(from rev 98380, openbox/trunk/PKGBUILD)
openbox/repos/community-x86_64/openbox-3.5.0-title-matching.patch
(from rev 98380, openbox/trunk/openbox-3.5.0-title-matching.patch)
openbox/repos/community-x86_64/openbox-3.5.0-which-2.20.patch
(from rev 98380, openbox/trunk/openbox-3.5.0-which-2.20.patch)
Deleted:
openbox/repos/community-i686/PKGBUILD
openbox/repos/community-i686/openbox-3.5.0-gnome-session.patch
openbox/repos/community-i686/openbox-3.5.0-title-matching.patch
openbox/repos/community-i686/openbox-3.5.0-which-2.20.patch
openbox/repos/community-x86_64/PKGBUILD
openbox/repos/community-x86_64/openbox-3.5.0-gnome-session.patch
openbox/repos/community-x86_64/openbox-3.5.0-title-matching.patch
openbox/repos/community-x86_64/openbox-3.5.0-which-2.20.patch
-----------------------------------------------------+
/PKGBUILD | 122 ++++++++++++++++++
/openbox-3.5.0-title-matching.patch | 22 +++
/openbox-3.5.0-which-2.20.patch | 22 +++
community-i686/PKGBUILD | 66 ---------
community-i686/openbox-3.5.0-gnome-session.patch | 14 --
community-i686/openbox-3.5.0-title-matching.patch | 11 -
community-i686/openbox-3.5.0-which-2.20.patch | 11 -
community-x86_64/PKGBUILD | 66 ---------
community-x86_64/openbox-3.5.0-gnome-session.patch | 14 --
community-x86_64/openbox-3.5.0-title-matching.patch | 11 -
community-x86_64/openbox-3.5.0-which-2.20.patch | 11 -
11 files changed, 166 insertions(+), 204 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-10-09 08:18:10 UTC (rev 98380)
+++ community-i686/PKGBUILD 2013-10-09 08:18:19 UTC (rev 98381)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Brad Fanella <bradfanella at archlinux.us>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: tobias <tobias at archlinux.org>
-
-pkgname=openbox
-pkgver=3.5.2
-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=('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-gnome-session.patch)
-md5sums=('93df606606053b7e8578a5c116afb8ec'
- '0a11d7149da210a31ef88f8a9c717711'
- '7ca3b5244bb092d46f5bcf1e2bdf4a18'
- '47fb1a16af05b6aba3b07051e6027f93')
-
-prepare() {
- cd $pkgname-$pkgver
-
- 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
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr \
- --with-x \
- --enable-startup-notification \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/openbox
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-
- 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
- sed -i 's:=gnome-session:=/usr/bin/gnome-session:' \
- "$pkgdir"/usr/share/xsessions/openbox-gnome.desktop
-}
Copied: openbox/repos/community-i686/PKGBUILD (from rev 98380, openbox/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-10-09 08:18:19 UTC (rev 98381)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+
+pkgname=openbox
+pkgver=3.5.2
+pkgrel=5
+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=('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)
+md5sums=('93df606606053b7e8578a5c116afb8ec'
+ '0a11d7149da210a31ef88f8a9c717711'
+ '7ca3b5244bb092d46f5bcf1e2bdf4a18')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ 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
+
+ sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+ data/autostart/openbox-xdg-autostart
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-x \
+ --enable-startup-notification \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/openbox
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ # GNOME Panel is no longer available in the official repositories
+ rm -r "$pkgdir"/usr/bin/{gdm-control,gnome-panel-control,openbox-gnome-session} \
+ "$pkgdir"/usr/share/gnome{,-session} \
+ "$pkgdir"/usr/share/man/man1/openbox-gnome-session.1 \
+ "$pkgdir"/usr/share/xsessions/openbox-gnome.desktop
+
+ sed -i 's:startkde:/usr/bin/\0:' \
+ "$pkgdir"/usr/share/xsessions/openbox-kde.desktop
+}
Deleted: community-i686/openbox-3.5.0-gnome-session.patch
===================================================================
--- community-i686/openbox-3.5.0-gnome-session.patch 2013-10-09 08:18:10 UTC (rev 98380)
+++ community-i686/openbox-3.5.0-gnome-session.patch 2013-10-09 08:18:19 UTC (rev 98381)
@@ -1,14 +0,0 @@
-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;
Deleted: community-i686/openbox-3.5.0-title-matching.patch
===================================================================
--- community-i686/openbox-3.5.0-title-matching.patch 2013-10-09 08:18:10 UTC (rev 98380)
+++ community-i686/openbox-3.5.0-title-matching.patch 2013-10-09 08:18:19 UTC (rev 98381)
@@ -1,11 +0,0 @@
---- openbox-3.5.0/openbox/client.c 2011-08-01 22:14:58.000000000 +0200
-+++ openbox-3.5.0/openbox/client.c 2011-10-22 14:59:56.000000000 +0200
-@@ -883,7 +883,7 @@
- !g_pattern_match(app->role,
- strlen(self->role), self->role, NULL))
- match = FALSE;
-- else if (app->title &&
-+ else if (app->title && self->title &&
- !g_pattern_match(app->title,
- strlen(self->title), self->title, NULL))
- match = FALSE;
Copied: openbox/repos/community-i686/openbox-3.5.0-title-matching.patch (from rev 98380, openbox/trunk/openbox-3.5.0-title-matching.patch)
===================================================================
--- community-i686/openbox-3.5.0-title-matching.patch (rev 0)
+++ community-i686/openbox-3.5.0-title-matching.patch 2013-10-09 08:18:19 UTC (rev 98381)
@@ -0,0 +1,11 @@
+--- openbox-3.5.0/openbox/client.c 2011-08-01 22:14:58.000000000 +0200
++++ openbox-3.5.0/openbox/client.c 2011-10-22 14:59:56.000000000 +0200
+@@ -883,7 +883,7 @@
+ !g_pattern_match(app->role,
+ strlen(self->role), self->role, NULL))
+ match = FALSE;
+- else if (app->title &&
++ else if (app->title && self->title &&
+ !g_pattern_match(app->title,
+ strlen(self->title), self->title, NULL))
+ match = FALSE;
Deleted: community-i686/openbox-3.5.0-which-2.20.patch
===================================================================
--- community-i686/openbox-3.5.0-which-2.20.patch 2013-10-09 08:18:10 UTC (rev 98380)
+++ community-i686/openbox-3.5.0-which-2.20.patch 2013-10-09 08:18:19 UTC (rev 98381)
@@ -1,11 +0,0 @@
---- openbox-3.5.0/data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000
-+++ openbox-3.5.0/data/autostart/autostart.in 2011-08-02 15:51:57.277879458 +0000
-@@ -8,7 +8,7 @@
- #
- #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
- # @libexecdir@/gnome-settings-daemon &
--#elif which gnome-settings-daemon >/dev/null; then
-+#elif which gnome-settings-daemon >/dev/null 2>&1; then
- # gnome-settings-daemon &
- #fi
-
Copied: openbox/repos/community-i686/openbox-3.5.0-which-2.20.patch (from rev 98380, openbox/trunk/openbox-3.5.0-which-2.20.patch)
===================================================================
--- community-i686/openbox-3.5.0-which-2.20.patch (rev 0)
+++ community-i686/openbox-3.5.0-which-2.20.patch 2013-10-09 08:18:19 UTC (rev 98381)
@@ -0,0 +1,11 @@
+--- openbox-3.5.0/data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000
++++ openbox-3.5.0/data/autostart/autostart.in 2011-08-02 15:51:57.277879458 +0000
+@@ -8,7 +8,7 @@
+ #
+ #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
+ # @libexecdir@/gnome-settings-daemon &
+-#elif which gnome-settings-daemon >/dev/null; then
++#elif which gnome-settings-daemon >/dev/null 2>&1; then
+ # gnome-settings-daemon &
+ #fi
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-10-09 08:18:10 UTC (rev 98380)
+++ community-x86_64/PKGBUILD 2013-10-09 08:18:19 UTC (rev 98381)
@@ -1,66 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Contributor: Brad Fanella <bradfanella at archlinux.us>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: tobias <tobias at archlinux.org>
-
-pkgname=openbox
-pkgver=3.5.2
-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=('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-gnome-session.patch)
-md5sums=('93df606606053b7e8578a5c116afb8ec'
- '0a11d7149da210a31ef88f8a9c717711'
- '7ca3b5244bb092d46f5bcf1e2bdf4a18'
- '47fb1a16af05b6aba3b07051e6027f93')
-
-prepare() {
- cd $pkgname-$pkgver
-
- 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
-}
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr \
- --with-x \
- --enable-startup-notification \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/openbox
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-
- 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
- sed -i 's:=gnome-session:=/usr/bin/gnome-session:' \
- "$pkgdir"/usr/share/xsessions/openbox-gnome.desktop
-}
Copied: openbox/repos/community-x86_64/PKGBUILD (from rev 98380, openbox/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-10-09 08:18:19 UTC (rev 98381)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+
+pkgname=openbox
+pkgver=3.5.2
+pkgrel=5
+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=('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)
+md5sums=('93df606606053b7e8578a5c116afb8ec'
+ '0a11d7149da210a31ef88f8a9c717711'
+ '7ca3b5244bb092d46f5bcf1e2bdf4a18')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ 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
+
+ sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
+ data/autostart/openbox-xdg-autostart
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --with-x \
+ --enable-startup-notification \
+ --sysconfdir=/etc \
+ --libexecdir=/usr/lib/openbox
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ # GNOME Panel is no longer available in the official repositories
+ rm -r "$pkgdir"/usr/bin/{gdm-control,gnome-panel-control,openbox-gnome-session} \
+ "$pkgdir"/usr/share/gnome{,-session} \
+ "$pkgdir"/usr/share/man/man1/openbox-gnome-session.1 \
+ "$pkgdir"/usr/share/xsessions/openbox-gnome.desktop
+
+ sed -i 's:startkde:/usr/bin/\0:' \
+ "$pkgdir"/usr/share/xsessions/openbox-kde.desktop
+}
Deleted: community-x86_64/openbox-3.5.0-gnome-session.patch
===================================================================
--- community-x86_64/openbox-3.5.0-gnome-session.patch 2013-10-09 08:18:10 UTC (rev 98380)
+++ community-x86_64/openbox-3.5.0-gnome-session.patch 2013-10-09 08:18:19 UTC (rev 98381)
@@ -1,14 +0,0 @@
-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;
Deleted: community-x86_64/openbox-3.5.0-title-matching.patch
===================================================================
--- community-x86_64/openbox-3.5.0-title-matching.patch 2013-10-09 08:18:10 UTC (rev 98380)
+++ community-x86_64/openbox-3.5.0-title-matching.patch 2013-10-09 08:18:19 UTC (rev 98381)
@@ -1,11 +0,0 @@
---- openbox-3.5.0/openbox/client.c 2011-08-01 22:14:58.000000000 +0200
-+++ openbox-3.5.0/openbox/client.c 2011-10-22 14:59:56.000000000 +0200
-@@ -883,7 +883,7 @@
- !g_pattern_match(app->role,
- strlen(self->role), self->role, NULL))
- match = FALSE;
-- else if (app->title &&
-+ else if (app->title && self->title &&
- !g_pattern_match(app->title,
- strlen(self->title), self->title, NULL))
- match = FALSE;
Copied: openbox/repos/community-x86_64/openbox-3.5.0-title-matching.patch (from rev 98380, openbox/trunk/openbox-3.5.0-title-matching.patch)
===================================================================
--- community-x86_64/openbox-3.5.0-title-matching.patch (rev 0)
+++ community-x86_64/openbox-3.5.0-title-matching.patch 2013-10-09 08:18:19 UTC (rev 98381)
@@ -0,0 +1,11 @@
+--- openbox-3.5.0/openbox/client.c 2011-08-01 22:14:58.000000000 +0200
++++ openbox-3.5.0/openbox/client.c 2011-10-22 14:59:56.000000000 +0200
+@@ -883,7 +883,7 @@
+ !g_pattern_match(app->role,
+ strlen(self->role), self->role, NULL))
+ match = FALSE;
+- else if (app->title &&
++ else if (app->title && self->title &&
+ !g_pattern_match(app->title,
+ strlen(self->title), self->title, NULL))
+ match = FALSE;
Deleted: community-x86_64/openbox-3.5.0-which-2.20.patch
===================================================================
--- community-x86_64/openbox-3.5.0-which-2.20.patch 2013-10-09 08:18:10 UTC (rev 98380)
+++ community-x86_64/openbox-3.5.0-which-2.20.patch 2013-10-09 08:18:19 UTC (rev 98381)
@@ -1,11 +0,0 @@
---- openbox-3.5.0/data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000
-+++ openbox-3.5.0/data/autostart/autostart.in 2011-08-02 15:51:57.277879458 +0000
-@@ -8,7 +8,7 @@
- #
- #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
- # @libexecdir@/gnome-settings-daemon &
--#elif which gnome-settings-daemon >/dev/null; then
-+#elif which gnome-settings-daemon >/dev/null 2>&1; then
- # gnome-settings-daemon &
- #fi
-
Copied: openbox/repos/community-x86_64/openbox-3.5.0-which-2.20.patch (from rev 98380, openbox/trunk/openbox-3.5.0-which-2.20.patch)
===================================================================
--- community-x86_64/openbox-3.5.0-which-2.20.patch (rev 0)
+++ community-x86_64/openbox-3.5.0-which-2.20.patch 2013-10-09 08:18:19 UTC (rev 98381)
@@ -0,0 +1,11 @@
+--- openbox-3.5.0/data/autostart/autostart.in~ 2011-08-02 15:50:01.963531310 +0000
++++ openbox-3.5.0/data/autostart/autostart.in 2011-08-02 15:51:57.277879458 +0000
+@@ -8,7 +8,7 @@
+ #
+ #if test -x @libexecdir@/gnome-settings-daemon >/dev/null; then
+ # @libexecdir@/gnome-settings-daemon &
+-#elif which gnome-settings-daemon >/dev/null; then
++#elif which gnome-settings-daemon >/dev/null 2>&1; then
+ # gnome-settings-daemon &
+ #fi
+
More information about the arch-commits
mailing list