[PATCH 4.3.0] xftcache is obsolated
XFree86 4.3.0 does not use xftcache, xftcache is dropped
from the tree. Both Xft1 (is rewrited to use it) and Xft2 use
fontconfig.
This is a patch to drop xftcache related things, and
to use fc-cache to generate fontconfig cache file.
diff -urN debian.orig/control debian/control
--- debian.orig/control 2003-07-05 01:12:38.000000000 +0900
+++ debian/control 2003-07-12 21:49:55.000000000 +0900
@@ -233,8 +233,6 @@
framerate information to standard output
- iceauth, a tool for manipulating ICE protocol authorization records;
- texteroids, a spinning text demo for the DPS extension
- - xftcache, a tool that creates an index of FreeType font files in a
- directory
- xset, a tool for setting miscellaneous X server parameters;
- xmodmap, a utility for modifying keymaps and pointer button mappings in X;
- xsetmode and xsetpointer, tools for handling X Input devices;
diff -urN debian.orig/shell-lib.sh debian/shell-lib.sh
--- debian.orig/shell-lib.sh 2003-07-05 01:12:38.000000000 +0900
+++ debian/shell-lib.sh 2003-07-12 21:50:06.000000000 +0900
@@ -214,7 +214,7 @@
SHORTCMD=$(basename $CMD)
message_nonl "Running $SHORTCMD in $DIR font directory..."
# KLUDGE
- if [ "$SHORTCMD" = "xftcache" ]; then
+ if [ "$SHORTCMD" = "fc-cache" ]; then
DIR=/usr/X11R6/lib/X11/fonts/$DIR
fi
$CMD $DIR
diff -urN debian.orig/xfonts-scalable.postinst.in debian/xfonts-scalable.postinst.in
--- debian.orig/xfonts-scalable.postinst.in 2003-07-05 01:12:38.000000000 +0900
+++ debian/xfonts-scalable.postinst.in 2003-07-12 21:50:20.000000000 +0900
@@ -15,7 +15,7 @@
#DEBHELPER#
FONTDIRS="Speedo Type1"
-UPDATECMDS="update-fonts-scale update-fonts-dir xftcache"
+UPDATECMDS="update-fonts-scale update-fonts-dir fc-cache"
font_update
exit 0
diff -urN debian.orig/xfonts-scalable.postrm.in debian/xfonts-scalable.postrm.in
--- debian.orig/xfonts-scalable.postrm.in 2003-07-05 01:12:38.000000000 +0900
+++ debian/xfonts-scalable.postrm.in 2003-07-12 21:50:37.000000000 +0900
@@ -18,7 +18,7 @@
"$1" = "remove" -o \
"$1" = "disappear" ]; then
FONTDIRS="Speedo Type1"
- UPDATECMDS="update-fonts-scale update-fonts-dir xftcache"
+ UPDATECMDS="update-fonts-scale update-fonts-dir fc-cache"
font_update
fi
--
ISHIKAWA Mutsumi
<ishikawa@linux.or.jp>, <ishikawa@debian.org>, <ishikawa@netvillage.co.jp>
Reply to: