Index: xc/ChangeLog =================================================================== RCS file: /cvs/xorg/xc/ChangeLog,v retrieving revision 1.18 diff -u -r1.18 ChangeLog --- a/xc/ChangeLog 6 May 2004 00:24:31 -0000 1.18 +++ b/xc/ChangeLog 6 May 2004 01:50:22 -0000 @@ -1,4 +1,10 @@ 2004-05-05 Roland Mainz + * xc/programs/Xserver/Xprint/ps/Imakefile + * programs/Xserver/Xprint/ps/PsFonts.c + BugZilla #551: PS DDX will not build on platforms with + BuildFreeType NO. Patch by Alan Coopersmith . + +2004-05-05 Roland Mainz * xc/programs/Xserver/Xprint/ps/psout.c BugZilla #536: RFE: PS output should contain the FreeType2 version being used. Index: xc/programs/Xserver/Xprint/ps/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/ps/Imakefile,v retrieving revision 1.3 diff -u -r1.3 Imakefile --- a/xc/programs/Xserver/Xprint/ps/Imakefile 26 Apr 2004 11:07:03 -0000 1.3 +++ b/xc/programs/Xserver/Xprint/ps/Imakefile 6 May 2004 01:50:29 -0000 @@ -2,7 +2,7 @@ #include -#if BuildFreeType +#if BuildFreeType || BuildFreetype2Library FT2SOURCEDIR = $(TOP)/extras/freetype2/src FT2INCDIR = $(TOP)/extras/freetype2/include FT2INCS = -I$(FT2INCDIR) \ @@ -15,7 +15,7 @@ TTF2PT1SRCS = ft.c pt1.c runt1asm.c ttf2pt1.c TTF2PT1OBJS = ft.o pt1.o runt1asm.o ttf2pt1.o TTF2PT1_DEFINES = -DUSE_FREETYPE -DXP_ONLY_BLOCKS -#endif /* BuildFreeType */ +#endif /* BuildFreeType || BuildFreetype2Library */ SRCS1 = PsInit.c PsPrint.c PsGC.c PsMisc.c PsSpans.c PsArea.c PsPixel.c \ PsLine.c PsPolygon.c PsArc.c PsText.c PsWindow.c PsFonts.c \ @@ -29,7 +29,7 @@ OBJS = $(OBJS1) $(TTF2PT1OBJS) $(FTOBJS) -#if BuildFreeType +#if BuildFreeType || BuildFreetype2Library LinkSourceFile(ttf2pt1.c,$(TTF2PT1OURCEDIR)/) LinkSourceFile(pt1.c,$(TTF2PT1OURCEDIR)/) LinkSourceFile(pt1.h,$(TTF2PT1OURCEDIR)/) @@ -39,7 +39,7 @@ LinkSourceFile(ttf.h,$(TTF2PT1OURCEDIR)/) LinkSourceFile(global.h,$(TTF2PT1OURCEDIR)/) LinkSourceFile(version.h,$(TTF2PT1OURCEDIR)/) -#endif /* BuildFreeType */ +#endif /* BuildFreeType || BuildFreetype2Library */ #ifdef XVendorString VENDORSTRING = XVendorString Index: xc/programs/Xserver/Xprint/ps/PsFonts.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/ps/PsFonts.c,v retrieving revision 1.2 diff -u -r1.2 PsFonts.c --- a/xc/programs/Xserver/Xprint/ps/PsFonts.c 23 Apr 2004 18:57:56 -0000 1.2 +++ b/xc/programs/Xserver/Xprint/ps/PsFonts.c 6 May 2004 01:50:29 -0000 @@ -610,8 +610,10 @@ } rec->adobe_ps_name = PsGetPSFontName(pFont); +#ifdef XP_USE_FREETYPE rec->ft_download_encoding = PsGetEncodingName(pFont); rec->ft_download_font_type = PsGetFTDownloadFontType(); +#endif /* XP_USE_FREETYPE */ rec->download_ps_name = NULL; #define SET_FONT_DOWNLOAD_STATUS(rec, downloaded) { int i; for (i = 0 ; i < 256 ; i++) { (rec)->alreadyDownloaded[i]=(downloaded); } }