diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-10 14:38:26 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-10 14:38:26 -0300 |
commit | f5e137fdf748b757bacfc50577e5d48a693d31c4 (patch) | |
tree | c75bdfef17b69eff3b8bb20b285c880d7f9183c0 /community/openbox/which-2.20.patch | |
parent | 300b3ee60aef9cfa0a32f5c69aa5e25ad637285f (diff) | |
parent | dd5222c4ae447eb7a6bda08ec5a3c2339852dc16 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chntpw/PKGBUILD
community/hardinfo/PKGBUILD
community/obconf/obconf.install
community/xplc/PKGBUILD
community/zziplib/PKGBUILD
core/rp-pppoe/PKGBUILD
extra/icedtea-web/PKGBUILD
extra/icon-naming-utils/PKGBUILD
extra/lxmenu-data/PKGBUILD
extra/openbox/PKGBUILD
extra/phonon-xine/PKGBUILD
extra/qt/PKGBUILD
extra/zope-interface/PKGBUILD
libre/pacman/PKGBUILD
libre/pacman/pacman.conf.mips64el
libre/pacman/rePKGBUILD
testing/coreutils/PKGBUILD
testing/net-tools/PKGBUILD
Diffstat (limited to 'community/openbox/which-2.20.patch')
-rw-r--r-- | community/openbox/which-2.20.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/community/openbox/which-2.20.patch b/community/openbox/which-2.20.patch new file mode 100644 index 000000000..7f663ae49 --- /dev/null +++ b/community/openbox/which-2.20.patch @@ -0,0 +1,53 @@ +--- openbox-3.4.11.1/data/autostart.sh.in 2010-03-14 09:40:37.000000000 -0500 ++++ openbox-3.4.11.1/data/autostart.sh.in 2010-03-26 14:44:36.000000000 -0500 +@@ -3,13 +3,13 @@ + + # Set a background color + BG="" +-if which hsetroot >/dev/null; then ++if which hsetroot >/dev/null 2>&1; then + BG=hsetroot + else +- if which esetroot >/dev/null; then ++ if which esetroot >/dev/null 2>&1; then + BG=esetroot + else +- if which xsetroot >/dev/null; then ++ if which xsetroot >/dev/null 2>&1; then + BG=xsetroot + fi + fi +@@ -17,28 +17,28 @@ + test -z $BG || $BG -solid "#303030" + + # D-bus +-if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then ++if which dbus-launch >/dev/null 2>&1 && test -z "$DBUS_SESSION_BUS_ADDRESS"; then + eval `dbus-launch --sh-syntax --exit-with-session` + fi + + # Make GTK apps look and behave how they were set up in the gnome config tools + 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 & + # Make GTK apps look and behave how they were set up in the XFCE config tools +-elif which xfce-mcs-manager >/dev/null; then ++elif which xfce-mcs-manager >/dev/null 2>&1; then + xfce-mcs-manager n & + fi + + # Preload stuff for KDE apps +-if which start_kdeinit >/dev/null; then ++if which start_kdeinit >/dev/null 2>&1; then + LD_BIND_NOW=true start_kdeinit --new-startup +kcminit_startup & + fi + + # Run XDG autostart things. By default don't run anything desktop-specific + # See xdg-autostart --help more info + DESKTOP_ENV="OPENBOX" +-if which @secretbindir@/xdg-autostart >/dev/null; then ++if which @secretbindir@/xdg-autostart >/dev/null 2>&1; then + @secretbindir@/xdg-autostart $DESKTOP_ENV + fi |