Index: xc/ChangeLog =================================================================== RCS file: /cvs/xorg/xc/ChangeLog,v retrieving revision 1.30 diff -u -2 -0 -r1.30 ChangeLog --- a/xc/ChangeLog 17 May 2004 01:40:14 -0000 1.30 +++ b/xc/ChangeLog 17 May 2004 03:20:37 -0000 @@ -1,22 +1,27 @@ 2004-05-16 Roland Mainz * xc/programs/Xserver/Xprint/etc/init.d/xprint + BugZilla #633: RFE: /etc/init.d/xprint should source + /etc/X11/xfs/config for font paths. + +2004-05-16 Roland Mainz + * xc/programs/Xserver/Xprint/etc/init.d/xprint BugZilla #451: /etc/init.d/xprint may output warnings when /usr/share/fonts/ does not exist on a Linux installation. 2004-05-16 Roland Mainz * xc/programs/xdpyinfo/Imakefile * xc/programs/xdpyinfo/xdpyinfo.c BugZilla #623: RFE: "xdpyinfo" should have support for XpExtension. 2004-05-15 Alan Coopersmith * xc/programs/Xserver/fb/fb.h * xc/programs/Xserver/fb/fboverlay.c * xc/programs/Xserver/fb/fbscreen.c - Change #ifdef for checking for old format miScreenInit to FB_OLD_MISCREENINIT for easier portability to xservers with updated screen structs but old function prototypes. Make it automatically defined if FB_OLD_SCREEN is defined. - Add _LP64 to list of #ifdefs for 64-bit platforms to support 64-bit Solaris. Index: xc/programs/Xserver/Xprint/etc/init.d/xprint =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/etc/init.d/xprint,v retrieving revision 1.3 diff -u -2 -0 -r1.3 xprint --- a/xc/programs/Xserver/Xprint/etc/init.d/xprint 17 May 2004 01:40:14 -0000 1.3 +++ b/xc/programs/Xserver/Xprint/etc/init.d/xprint 17 May 2004 03:20:47 -0000 @@ -234,40 +234,41 @@ while read -r i ; do for val in $i; do case $val in \#*) break ;; ?*=*) key="${val%%=*}" ;; =*) key="${tok}" ;; *) [ "${key}" = "catalogue" -a "${tok}" != "" ] && echo "${tok}" ;; esac tok="${val#*=}" done done ) | tr "," "[\n]" | fontpath2fontlist } get_fontlist_from_all_xfs_configs() { get_fontlist_from_xfs_config "/etc/openwin/fs/fontserver.cfg" get_fontlist_from_xfs_config "/usr/openwin/lib/X11/fontserver.cfg" get_fontlist_from_xfs_config "/etc/X11/fs-xtt/config" get_fontlist_from_xfs_config "/etc/X11/fs/config" + get_fontlist_from_xfs_config "/etc/X11/xfs/config" get_fontlist_from_xfs_config "${XPROJECTROOT}/lib/X11/fs/config" } get_fontlist_from_xf86config() { srcxf86configfile="" [ -f "/etc/X11/XF86Config-4" ] && srcxf86configfile="/etc/X11/XF86Config-4" [ -f "/etc/X11/XF86Config" ] && srcxf86configfile="/etc/X11/XF86Config" if [ "${srcxf86configfile}" = "" ] ; then return 0 fi currsection="" cat "${srcxf86configfile}" | while read i1 i2 i3 i4 ; do # Strip "\"" from I2 i2="${i2#\"}" ; i2="${i2%\"}"