summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <drac@gentoo.org>2007-03-21 14:38:38 +0000
committerSamuli Suominen <drac@gentoo.org>2007-03-21 14:38:38 +0000
commit7c658fb6bf489c5ac5cdfd5349bd4854f9c86220 (patch)
tree96dec9b6abc4e007944ff6787d123a9cc111b4df /xfce-base/xfce-utils
parentStable on alpha/amd64 wrt bug #167566. (diff)
downloadgentoo-2-7c658fb6bf489c5ac5cdfd5349bd4854f9c86220.tar.gz
gentoo-2-7c658fb6bf489c5ac5cdfd5349bd4854f9c86220.tar.bz2
gentoo-2-7c658fb6bf489c5ac5cdfd5349bd4854f9c86220.zip
Update XDG_DATA_DIRS patch so that it allways includes /usr/local as per freedesktop.org basedir specification.
(Portage version: 2.1.2.2)
Diffstat (limited to 'xfce-base/xfce-utils')
-rw-r--r--xfce-base/xfce-utils/ChangeLog6
-rw-r--r--xfce-base/xfce-utils/files/xfce-utils-4.4.0-xdg_data_dirs.patch10
2 files changed, 11 insertions, 5 deletions
diff --git a/xfce-base/xfce-utils/ChangeLog b/xfce-base/xfce-utils/ChangeLog
index f4245e3d5c5e..8da0851f51d0 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.99 2007/03/15 13:30:17 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce-utils/ChangeLog,v 1.100 2007/03/21 14:38:38 drac Exp $
+
+ 21 Mar 2007; Samuli Suominen <drac@gentoo.org>
+ files/xfce-utils-4.4.0-xdg_data_dirs.patch:
+ Make XDG_DATA_DIRS allways include /usr/local as per f.d.o basedir spec.
15 Mar 2007; Markus Rothe <corsair@gentoo.org> xfce-utils-4.4.0-r3.ebuild:
Stable on ppc64; bug #169987
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 ed99e9f51928..80d7392dce74 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,7 +1,7 @@
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-03 17:32:41.000000000 +0200
-@@ -19,14 +19,14 @@
++++ xfce-utils-4.4.0/scripts/startxfce4.in 2007-03-21 16:28:55.000000000 +0200
+@@ -19,22 +19,22 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
@@ -18,9 +18,11 @@ diff -ur xfce-utils-4.4.0.orig/scripts/startxfce4.in xfce-utils-4.4.0/scripts/st
-if test x"$XDG_DATA_DIRS" = x""
+if test "x$XDG_DATA_DIRS" = "x"
then
- XDG_DATA_DIRS="/usr/share:/usr/local/share:@datadir@"
+- XDG_DATA_DIRS="/usr/share:/usr/local/share:@datadir@"
++ XDG_DATA_DIRS="/usr/local/share:/usr/share:@datadir@"
else
-@@ -34,7 +34,7 @@
+- XDG_DATA_DIRS="$XDG_DATA_DIRS:@datadir@"
++ XDG_DATA_DIRS="$XDG_DATA_DIRS:/usr/local/share:/usr/share:@datadir@"
fi
export XDG_DATA_DIRS