|
|
23dc0b3 |
diff -up kdebase-workspace-4.6.90/startkde.cmake.font kdebase-workspace-4.6.90/startkde.cmake
|
|
|
23dc0b3 |
--- kdebase-workspace-4.6.90/startkde.cmake.font 2011-06-28 23:08:01.000000000 +0200
|
|
|
23dc0b3 |
+++ kdebase-workspace-4.6.90/startkde.cmake 2011-06-28 23:10:54.000000000 +0200
|
|
|
23dc0b3 |
@@ -215,48 +215,6 @@ done
|
|
|
23dc0b3 |
QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`kde4-config --path qtplugins`
|
|
|
4422042 |
export QT_PLUGIN_PATH
|
|
|
4422042 |
|
|
|
4422042 |
-# Activate the kde font directories.
|
|
|
4422042 |
-#
|
|
|
4422042 |
-# There are 4 directories that may be used for supplying fonts for KDE.
|
|
|
4422042 |
-#
|
|
|
4422042 |
-# There are two system directories. These belong to the administrator.
|
|
|
4422042 |
-# There are two user directories, where the user may add her own fonts.
|
|
|
4422042 |
-#
|
|
|
4422042 |
-# The 'override' versions are for fonts that should come first in the list,
|
|
|
4422042 |
-# i.e. if you have a font in your 'override' directory, it will be used in
|
|
|
4422042 |
-# preference to any other.
|
|
|
4422042 |
-#
|
|
|
4422042 |
-# The preference order looks like this:
|
|
|
4422042 |
-# user override, system override, X, user, system
|
|
|
4422042 |
-#
|
|
|
4422042 |
-# Where X is the original font database that was set up before this script
|
|
|
4422042 |
-# runs.
|
|
|
4422042 |
-
|
|
|
4422042 |
-usr_odir=$HOME/.fonts/kde-override
|
|
|
4422042 |
-usr_fdir=$HOME/.fonts
|
|
|
4422042 |
-
|
|
|
4422042 |
-if test -n "$KDEDIRS"; then
|
|
|
4422042 |
- kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
|
|
|
4422042 |
- sys_odir=$kdedirs_first/share/fonts/override
|
|
|
4422042 |
- sys_fdir=$kdedirs_first/share/fonts
|
|
|
4422042 |
-else
|
|
|
4422042 |
- sys_odir=$KDEDIR/share/fonts/override
|
|
|
4422042 |
- sys_fdir=$KDEDIR/share/fonts
|
|
|
4422042 |
-fi
|
|
|
4422042 |
-
|
|
|
4422042 |
-# We run mkfontdir on the user's font dirs (if we have permission) to pick
|
|
|
4422042 |
-# up any new fonts they may have installed. If mkfontdir fails, we still
|
|
|
4422042 |
-# add the user's dirs to the font path, as they might simply have been made
|
|
|
4422042 |
-# read-only by the administrator, for whatever reason.
|
|
|
4422042 |
-
|
|
|
4422042 |
-test -d "$sys_odir" && xset +fp "$sys_odir"
|
|
|
4422042 |
-test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
|
|
|
4422042 |
-test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
|
|
|
4422042 |
-test -d "$sys_fdir" && xset fp+ "$sys_fdir"
|
|
|
4422042 |
-
|
|
|
4422042 |
-# Ask X11 to rebuild its font list.
|
|
|
4422042 |
-xset fp rehash
|
|
|
4422042 |
-
|
|
|
4422042 |
# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
|
|
|
4422042 |
# from some users that they're confused and don't know what to do. This is
|
|
|
4422042 |
# especially necessary on slow machines, where starting KDE takes one or two
|