Fix a bug that would duplicate a path element in XDG_DATA_DIRS when

KDE_PREFIX == LOCALBASE.  This triggered memory corruption in the xdgmime
code used by GTK+ and gnome-vfs which led to strange crashes in GTK+
applications such as Firefox and Thunderbird.  While here, add a missing
XDG_DATA_DIRS entry for LOCALBASE/share/gnome.

Approved by:	kde (lofi)
This commit is contained in:
Joe Marcus Clarke 2006-12-13 16:47:28 +00:00
parent 6a8712258b
commit 6781af104d
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=179673
4 changed files with 36 additions and 12 deletions

View file

@ -7,7 +7,7 @@
PORTNAME= xdg
PORTVERSION= 1.0
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= misc kde
MASTER_SITES= # none

View file

@ -4,12 +4,24 @@
#
# Submit missing XDG-file locations to kde@freebsd.org!
export XDG_CONFIG_DIRS=\
XDG_CONFIG_DIRS=\
${XDG_CONFIG_DIRS}:/etc/xdg:%%LOCALBASE%%/etc/xdg:%%X11BASE%%/etc/xdg:\
%%LOCALBASE%%/etc/xdg/xfce4:%%KDE_PREFIX%%/etc/xdg
%%LOCALBASE%%/etc/xdg/xfce4
export XDG_DATA_DIRS=\
${XDG_DATA_DIRS}:/usr/share:%%LOCALBASE%%/share:\
%%X11BASE%%/share:%%X11BASE%%/share/gnome:%%KDE_PREFIX%%/share
if [ %%KDE_PREFIX%% != %%LOCALBASE%% ]; then
XDG_CONFIG_DIRS=${XDG_CONFIG_DIRS}:%%KDE_PREFIX%%/etc/xdg
fi
export XDG_CONFIG_DIRS
XDG_DATA_DIRS=\
${XDG_DATA_DIRS}:/usr/share:%%LOCALBASE%%/share:%%LOCALBASE%%/share/gnome:\
%%X11BASE%%/share:%%X11BASE%%/share/gnome
if [ %%KDE_PREFIX%% != %%LOCALBASE%% ]; then
XDG_DATA_DIRS=${XDG_DATA_DIRS}:%%KDE_PREFIX%%/share
fi
export XDG_DATA_DIRS
kbuildsycoca

View file

@ -7,7 +7,7 @@
PORTNAME= xdg
PORTVERSION= 1.0
PORTREVISION= 1
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= misc kde
MASTER_SITES= # none

View file

@ -4,12 +4,24 @@
#
# Submit missing XDG-file locations to kde@freebsd.org!
export XDG_CONFIG_DIRS=\
XDG_CONFIG_DIRS=\
${XDG_CONFIG_DIRS}:/etc/xdg:%%LOCALBASE%%/etc/xdg:%%X11BASE%%/etc/xdg:\
%%LOCALBASE%%/etc/xdg/xfce4:%%KDE_PREFIX%%/etc/xdg
%%LOCALBASE%%/etc/xdg/xfce4
export XDG_DATA_DIRS=\
${XDG_DATA_DIRS}:/usr/share:%%LOCALBASE%%/share:\
%%X11BASE%%/share:%%X11BASE%%/share/gnome:%%KDE_PREFIX%%/share
if [ %%KDE_PREFIX%% != %%LOCALBASE%% ]; then
XDG_CONFIG_DIRS=${XDG_CONFIG_DIRS}:%%KDE_PREFIX%%/etc/xdg
fi
export XDG_CONFIG_DIRS
XDG_DATA_DIRS=\
${XDG_DATA_DIRS}:/usr/share:%%LOCALBASE%%/share:%%LOCALBASE%%/share/gnome:\
%%X11BASE%%/share:%%X11BASE%%/share/gnome
if [ %%KDE_PREFIX%% != %%LOCALBASE%% ]; then
XDG_DATA_DIRS=${XDG_DATA_DIRS}:%%KDE_PREFIX%%/share
fi
export XDG_DATA_DIRS
kbuildsycoca