summaryrefslogtreecommitdiff
path: root/eclass/kde4-functions.eclass
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2008-09-21 13:48:35 +0000
committerJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2008-09-21 13:48:35 +0000
commit3675d34a8eaa80fd5b06d62617f306a8e628c33c (patch)
tree7d255efae5579c15986a4585ce12c686941b104e /eclass/kde4-functions.eclass
parent712845b98e856d2de0ec8808a6bad1da91f497dd (diff)
downloadkde-3675d34a8eaa80fd5b06d62617f306a8e628c33c.tar.gz
kde-3675d34a8eaa80fd5b06d62617f306a8e628c33c.tar.bz2
kde-3675d34a8eaa80fd5b06d62617f306a8e628c33c.zip
Applied fixes from the master branch to the kde4-functions eclass.
Diffstat (limited to 'eclass/kde4-functions.eclass')
-rw-r--r--eclass/kde4-functions.eclass5
1 files changed, 4 insertions, 1 deletions
diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass
index fad94c4ebc5..2407877ef21 100644
--- a/eclass/kde4-functions.eclass
+++ b/eclass/kde4-functions.eclass
@@ -396,6 +396,9 @@ buildsycoca() {
chown root:0 /usr/share/services
chmod 0755 /usr/share/services
+ # Make sure tha cache file exists, or kbuildsycoca4 will fail
+ touch "${KDEDIR}/share/kde4/services/ksycoca4"
+
# kbuildsycoca4 needs a running dbus session to work correctly.
# We have to start a new dbus session, because the DBUS_SESSION_BUS_ADDRESS in the environment
# could from from the user's environment (through su [without '-']), causing kbuildsycoca4 to hang.
@@ -412,7 +415,7 @@ buildsycoca() {
ebegin "Running kbuildsycoca4 to build global database"
# This is needed because we support multiple kde versions installed together.
XDG_DATA_DIRS="/usr/share:${KDEDIRS//:/\/share:}/share:/usr/local/share" \
- ${KDEDIR}/bin/kbuildsycoca4 --global --noincremental &> /dev/null
+ DISPLAY="" ${KDEDIR}/bin/kbuildsycoca4 --global --noincremental &> /dev/null
eend $?
echo "Killing dbus session for kbuildsycoca4"