Attachment 294 Details for Bug 451 – Patch for 2004-05-16-oldcvs-trunk

[patch] Patch for 2004-05-16-oldcvs-trunk

patch.gudiff (text/plain), 2.34 KB, created by Roland Mainz on 2004-05-17 11:32:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-05-17 11:32:40 UTC

Size: 2.34 KB

patch

obsolete

>Index: xc/programs/Xserver/Xprint/etc/init.d/xprint
>===================================================================
>RCS file: /cvs/xprint/xprint/src/xprint_main/xc/programs/Xserver/Xprint/etc/init.d/xprint,v
>retrieving revision 1.46
>diff -u -2 -0 -r1.46 xprint
>--- a/xc/programs/Xserver/Xprint/etc/init.d/xprint	22 Mar 2004 01:36:20 -0000	1.46
>+++ b/xc/programs/Xserver/Xprint/etc/init.d/xprint	17 May 2004 01:31:26 -0000
>@@ -315,41 +315,44 @@
>           #echo "${XPROJECTROOT}/lib/X11/fonts/Type1/sun/"
>           echo "${XPROJECTROOT}/lib/X11/fonts/TrueType/"
>           echo "${XPROJECTROOT}/lib/X11/fonts/Speedo/"
>           echo "${XPROJECTROOT}/lib/X11/fonts/misc/"
>           echo "${XPROJECTROOT}/lib/X11/fonts/75dpi/"
>           echo "${XPROJECTROOT}/lib/X11/fonts/100dpi/"
>   
>           ## List all fonts in all locales installed on this machine
>           cat /usr/openwin/lib/locale/*/OWfontpath | tr "," "\n" | sort -u
>           ;;
>       'Linux')
>           (
>             get_fontlist_from_defoma
> 
>             get_fontlist_from_xf86config
>             
>             # Getting font paths from XFS is mainly required for compatibilty to RedHat
>             get_fontlist_from_all_xfs_configs
>                    
>             ## List all fonts in all locales installed on this machine
>-            find /usr/share/fonts "${XPROJECTROOT}/lib/X11/fonts" -name fonts.dir | 
>+            (
>+              [ -d "/usr/share/fonts" ] && find /usr/share/fonts -name fonts.dir
>+              find "${XPROJECTROOT}/lib/X11/fonts" -name fonts.dir 
>+            ) | 
>               while read i ; do echo "${i%/fonts.dir}" ; done
>           ) | sort -u
>           ;;
>       * | 'AIX')          
>           ## List the standard X11 fonts
>           # (AIX should be handled like Solaris but I did not found a way to
>           # enumerate all fonts in all installed locales without scanning the
>           # dirs manually)
>           echo "${XPROJECTROOT}/lib/X11/fonts/Type1/"
>           echo "${XPROJECTROOT}/lib/X11/fonts/TrueType/"
>           echo "${XPROJECTROOT}/lib/X11/fonts/TTF/"
>           echo "${XPROJECTROOT}/lib/X11/fonts/Speedo/"
>           echo "${XPROJECTROOT}/lib/X11/fonts/misc/"
>           echo "${XPROJECTROOT}/lib/X11/fonts/75dpi/"
>           echo "${XPROJECTROOT}/lib/X11/fonts/100dpi/"
>           echo "${XPROJECTROOT}/lib/X11/fonts/"
>           ;;
>     esac
> }
>

Actions: View | Splinter Review

Attachments on bug 451: 294 | 295

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.