diff options
| author |   Samuli Suominen <drac@gentoo.org> | 2007-03-03 15:44:49 +0000 |
|---|---|---|
| committer | Samuli Suominen <drac@gentoo.org> | 2007-03-03 15:44:49 +0000 |
| commit | c6fa90e340e51fa44ececb8e1a37bf82264d9fe2 (patch) | |
| tree | 308c4eead1057f1da173126db07d9220d1464b74 /xfce-base/xfce-utils | |
| parent | amd64 stable, security bug 165555 (diff) | |
| download | gentoo-2-c6fa90e340e51fa44ececb8e1a37bf82264d9fe2.tar.gz gentoo-2-c6fa90e340e51fa44ececb8e1a37bf82264d9fe2.tar.bz2 gentoo-2-c6fa90e340e51fa44ececb8e1a37bf82264d9fe2.zip | |
New patch from upstream bug 2967.
(Portage version: 2.1.2-r13)
Diffstat (limited to 'xfce-base/xfce-utils')
| -rw-r--r-- | xfce-base/xfce-utils/ChangeLog | 6 | ||||
| -rw-r--r-- | xfce-base/xfce-utils/files/xfce-utils-4.4.0-xdg_data_dirs.patch | 57 |
2 files changed, 51 insertions, 12 deletions
diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog index 7e2a5156fe62..348934406e2d 100644 --- a/xfce-base/xfce-utils/ChangeLog +++ b/xfce-base/xfce-utils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for xfce-base/xfce-utils # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.91 2007/03/02 23:07:47 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.92 2007/03/03 15:44:49 drac Exp $ + + 03 Mar 2007; Samuli Suominen <drac@gentoo.org> + files/xfce-utils-4.4.0-xdg_data_dirs.patch: + New patch from upstream bug 2967. 02 Mar 2007; Peter Weller <welp@gentoo.org> xfce-utils-4.4.0-r3.ebuild: Keyworded on x86-fbsd. Removed older version diff --git a/xfce-base/xfce-utils/files/xfce-utils-4.4.0-xdg_data_dirs.patch b/xfce-base/xfce-utils/files/xfce-utils-4.4.0-xdg_data_dirs.patch index 665989b62505..ed99e9f51928 100644 --- a/xfce-base/xfce-utils/files/xfce-utils-4.4.0-xdg_data_dirs.patch +++ b/xfce-base/xfce-utils/files/xfce-utils-4.4.0-xdg_data_dirs.patch @@ -1,18 +1,53 @@ diff -ur xfce-utils-4.4.0.orig/scripts/startxfce4.in xfce-utils-4.4.0/scripts/startxfce4.in --- xfce-utils-4.4.0.orig/scripts/startxfce4.in 2007-01-20 19:02:51.000000000 +0200 -+++ xfce-utils-4.4.0/scripts/startxfce4.in 2007-03-02 14:33:40.000000000 +0200 -@@ -26,13 +26,7 @@ - BASEDIR=$XDG_CONFIG_HOME/xfce4 ++++ xfce-utils-4.4.0/scripts/startxfce4.in 2007-03-03 17:32:41.000000000 +0200 +@@ -19,14 +19,14 @@ + # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + # + +-if test x"$XDG_CONFIG_HOME" = x"" ++if test "x$XDG_CONFIG_HOME" = "x" + then +- BASEDIR=$HOME/.config/xfce4/ ++ BASEDIR="$HOME/.config/xfce4/" + else +- BASEDIR=$XDG_CONFIG_HOME/xfce4 ++ BASEDIR="$XDG_CONFIG_HOME/xfce4" fi -if test x"$XDG_DATA_DIRS" = x"" --then -- XDG_DATA_DIRS="/usr/share:/usr/local/share:@datadir@" --else -- XDG_DATA_DIRS="$XDG_DATA_DIRS:@datadir@" --fi --export XDG_DATA_DIRS -+export XDG_DATA_DIRS="/usr/share:/usr/local/share:$XDG_DATA_DIRS:@datadir@" ++if test "x$XDG_DATA_DIRS" = "x" + then + XDG_DATA_DIRS="/usr/share:/usr/local/share:@datadir@" + else +@@ -34,7 +34,7 @@ + fi + export XDG_DATA_DIRS - if test x"$DISPLAY" = x"" +-if test x"$DISPLAY" = x"" ++if test "x$DISPLAY" = "x" then + echo "$0: Starting X server" + prog=xinit +@@ -43,10 +43,10 @@ + prog=/bin/sh + fi + +-if test ! x"$*" = x"" ++if test ! "x$*" = "x" + then + OPT=$* +- if test x"${OPT#*--}" = x"${OPT}" ++ if test "x${OPT#*--}" = "x${OPT}" + then + CLIENTRC=${OPT} + else +@@ -61,7 +61,7 @@ + SERVERRC="/etc/X11/xinit/xserverrc $SERVERRC" + fi + +-if ! test x"$SERVERRC" = x"" ++if ! test "x$SERVERRC" = "x" + then + SERVERRC="-- $SERVERRC" + fi |