Fix build for no-fontconfig

This commit is contained in:
Tim Waugh 2004-09-28 15:50:20 +00:00
parent 4deb15317f
commit 28df9c5785

View File

@ -76,13 +76,13 @@ Patch38: ghostscript-7.07-coverage-glyphcount.patch
Patch41: ghostscript-7.05-lips4v-fix-pipe.patch Patch41: ghostscript-7.05-lips4v-fix-pipe.patch
Patch42: ghostscript-7.05-cups.patch Patch42: ghostscript-7.05-cups.patch
Patch43: ghostscript-7.07-badc.patch Patch43: ghostscript-7.07-badc.patch
Patch44: ghostscript-7.07-fontconfig-rh.patch
Patch45: gdevcups-crash.patch Patch45: gdevcups-crash.patch
Patch46: ghostscript-7.07-gcc34.patch Patch46: ghostscript-7.07-gcc34.patch
Patch47: ghostscript-7.07-gtk2.patch Patch47: ghostscript-7.07-gtk2.patch
Patch48: ghostscript-7.07-omni-glib2.patch Patch48: ghostscript-7.07-omni-glib2.patch
Patch49: ghostscript-bjc250gs.patch Patch49: ghostscript-bjc250gs.patch
Patch50: ghostscript-pagesize.patch Patch50: ghostscript-pagesize.patch
Patch51: ghostscript-7.07-fontconfig-rh.patch
Requires: VFlib2, zlib, libpng, glib2 Requires: VFlib2, zlib, libpng, glib2
Requires: urw-fonts >= 1.1, ghostscript-fonts Requires: urw-fonts >= 1.1, ghostscript-fonts
@ -471,11 +471,6 @@ $(GLOBJ)gdevcups.$(OBJ): $(GLSRC)gdevcups.c $(PDEVH)
%patch43 -p1 -b .badc %patch43 -p1 -b .badc
# Add fontconfig support (bug #111412).
%if %{use_fontconfig}
%patch44 -p1 -b .fontconfig-rh
%endif
%patch45 -p1 -b .gdevcups-crash %patch45 -p1 -b .gdevcups-crash
%patch46 -p1 -b .gcc34 %patch46 -p1 -b .gcc34
%patch47 -p1 -b .gtk2 %patch47 -p1 -b .gtk2
@ -489,6 +484,11 @@ $(GLOBJ)gdevcups.$(OBJ): $(GLSRC)gdevcups.c $(PDEVH)
# Prevent pdf2ps generating "null setpagesize" (bug #126446). # Prevent pdf2ps generating "null setpagesize" (bug #126446).
%patch50 -p1 -b .pagesize %patch50 -p1 -b .pagesize
# Add fontconfig support (bug #111412).
%if %{use_fontconfig}
%patch51 -p1 -b .fontconfig-rh
%endif
# Set up for a unix os, gcc compiler build, and replace our insertion string # Set up for a unix os, gcc compiler build, and replace our insertion string
sed -e "s/_XXX_RPM_GS_DEVICES_XXX_/$GS_DEVS/;" src/unix-gcc.mak > Makefile sed -e "s/_XXX_RPM_GS_DEVICES_XXX_/$GS_DEVS/;" src/unix-gcc.mak > Makefile