diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-23 18:28:19 -0300 |
| commit | d07d53d7af1e9694d9558783841bc2df3124a90f (patch) | |
| tree | 40d68de204b29d3360efd654d3c458c9cdad3cd6 /community/openbox/which-2.20.patch | |
| parent | a873bdc69d24650d832933463af71dfaa96f1a8a (diff) | |
| parent | 64e290184042563a240e2d6d15c02e06703d00ee (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/obconf/PKGBUILD
community/obconf/obconf.install
community/qstardict/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD.mips64el
extra/cups/PKGBUILD
extra/eject/PKGBUILD
extra/emacs/PKGBUILD
extra/evilwm/PKGBUILD
extra/fbset/PKGBUILD
extra/gmpc/PKGBUILD
extra/gnome-alsamixer/PKGBUILD
extra/gtkpod/PKGBUILD
extra/kdepim/PKGBUILD
extra/kile/PKGBUILD
extra/libvpx/PKGBUILD
extra/php-apc/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/php/PKGBUILD
extra/pidgin/PKGBUILD
extra/potrace/PKGBUILD
extra/racket/PKGBUILD
extra/soundtouch/PKGBUILD
extra/wireshark/PKGBUILD
extra/xpdf/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/lib32-acl/PKGBUILD
multilib/lib32-attr/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-udev/PKGBUILD
~xihh/abiword/PKGBUILD
Diffstat (limited to 'community/openbox/which-2.20.patch')
| -rw-r--r-- | community/openbox/which-2.20.patch | 62 |
1 files changed, 10 insertions, 52 deletions
diff --git a/community/openbox/which-2.20.patch b/community/openbox/which-2.20.patch index 7f663ae49..f947d6a98 100644 --- a/community/openbox/which-2.20.patch +++ b/community/openbox/which-2.20.patch @@ -1,53 +1,11 @@ ---- 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 @@ +--- 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 - # 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 |