diff options
author | Samuli Suominen <drac@gentoo.org> | 2007-03-02 12:49:26 +0000 |
---|---|---|
committer | Samuli Suominen <drac@gentoo.org> | 2007-03-02 12:49:26 +0000 |
commit | 7c869576e01c61b8f2f80bebe31adab57d237b90 (patch) | |
tree | 8a1f7d07142ddbcc7a2aa809f9b2fb40e4a00d03 /xfce-base/xfce-utils/files | |
parent | Add missing file 64asy-gentoo.el, add check for tk in python, add workaround ... (diff) | |
download | gentoo-2-7c869576e01c61b8f2f80bebe31adab57d237b90.tar.gz gentoo-2-7c869576e01c61b8f2f80bebe31adab57d237b90.tar.bz2 gentoo-2-7c869576e01c61b8f2f80bebe31adab57d237b90.zip |
Fix startxfce4 script so it won't lose XDG_DATA_DIRS set by /etc/env.d. This allows KDE applications to show in Xfce Menu when kdelibs-3.5.6-r2 is installed. Big thanks to Arttu arse Hanhela for testing.
(Portage version: 2.1.2-r12)
Diffstat (limited to 'xfce-base/xfce-utils/files')
-rw-r--r-- | xfce-base/xfce-utils/files/digest-xfce-utils-4.4.0-r3 | 3 | ||||
-rw-r--r-- | xfce-base/xfce-utils/files/xfce-utils-4.4.0-xdg_data_dirs.patch | 18 |
2 files changed, 21 insertions, 0 deletions
diff --git a/xfce-base/xfce-utils/files/digest-xfce-utils-4.4.0-r3 b/xfce-base/xfce-utils/files/digest-xfce-utils-4.4.0-r3 new file mode 100644 index 000000000000..3032e3b43ebb --- /dev/null +++ b/xfce-base/xfce-utils/files/digest-xfce-utils-4.4.0-r3 @@ -0,0 +1,3 @@ +MD5 e90a98cf6de0610170c39a4eae36ad8f xfce-utils-4.4.0.tar.bz2 559900 +RMD160 4e7668bd6827cfd8ed60b6e2a3b60b70cc2f05a2 xfce-utils-4.4.0.tar.bz2 559900 +SHA256 37ab42beaeea0d846920ec805213fcf8987bd74ac1f78153493ae9af3d5b2441 xfce-utils-4.4.0.tar.bz2 559900 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 new file mode 100644 index 000000000000..665989b62505 --- /dev/null +++ b/xfce-base/xfce-utils/files/xfce-utils-4.4.0-xdg_data_dirs.patch @@ -0,0 +1,18 @@ +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 + 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"$DISPLAY" = x"" + then |