rpms/ghostscript/devel ghostscript-use-external-freetype.patch, NONE, 1.1 ghostscript.spec, 1.71, 1.72

Tue Jul 12 09:56:52 UTC 2005

Author: twaugh

Update of /cvs/dist/rpms/ghostscript/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24899

Modified Files:
	ghostscript.spec 
Added Files:
	ghostscript-use-external-freetype.patch 
Log Message:
* Tue Jul 12 2005 Tim Waugh <twaugh at redhat.com>
- Added use-external-freetype patch (bug #161187).


ghostscript-use-external-freetype.patch:
 fapi_ft.c |   11 ++++++-----
 int.mak   |   18 +++++-------------
 2 files changed, 11 insertions(+), 18 deletions(-)

--- NEW FILE ghostscript-use-external-freetype.patch ---
diff -ruN espgs-8.15rc3.orig/src/fapi_ft.c espgs-8.15rc3/src/fapi_ft.c
--- espgs-8.15rc3.orig/src/fapi_ft.c	2005-01-19 13:08:41.000000000 +0900
+++ espgs-8.15rc3/src/fapi_ft.c	2005-07-12 11:36:32.000000000 +0900
@@ -30,11 +30,12 @@
 #include "math_.h"
 
 /* FreeType headers */
-#include "freetype/freetype.h"
-#include "freetype/ftincrem.h"
-#include "freetype/ftglyph.h"
-#include "freetype/ftoutln.h"
-#include "freetype/fttrigon.h"
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_INCREMENTAL_H
+#include FT_GLYPH_H
+#include FT_OUTLINE_H
+#include FT_TRIGONOMETRY_H
 
 #include <assert.h>
 
diff -ruN espgs-8.15rc3.orig/src/int.mak espgs-8.15rc3/src/int.mak
--- espgs-8.15rc3.orig/src/int.mak	2005-07-12 11:04:23.000000000 +0900
+++ espgs-8.15rc3/src/int.mak	2005-07-12 11:38:09.000000000 +0900
@@ -1873,43 +1873,35 @@
 # FreeType bridge :
 
 FT_LIB=$(FT_ROOT)$(D)objs$(D)freetype214MT_D
-FT_INC=$(I_)$(FT_ROOT)$(D)include$(_I)
-
 wrfont_h=$(stdpre_h) $(PSSRC)wrfont.h
 write_t1_h=$(ifapi_h) $(PSSRC)write_t1.h
 write_t2_h=$(ifapi_h) $(PSSRC)write_t2.h
 
 $(PSD)fapif1.dev : $(INT_MAK) $(ECHOGS_XE) \
- $(FT_LIB)$(FT_LIB_EXT) \
  $(PSOBJ)fapi_ft.$(OBJ) \
  $(PSOBJ)write_t1.$(OBJ) $(PSOBJ)write_t2.$(OBJ) $(PSOBJ)wrfont.$(OBJ)
 	$(SETMOD) $(PSD)fapif1 $(PSOBJ)fapi_ft.$(OBJ) $(PSOBJ)write_t1.$(OBJ)
 	$(ADDMOD) $(PSD)fapif1 $(PSOBJ)write_t2.$(OBJ) $(PSOBJ)wrfont.$(OBJ)
 	$(ADDMOD) $(PSD)fapif1 -plugin fapi_ft
-	$(ADDMOD) $(PSD)fapif1 -link $(FT_LIB)$(FT_LIB_EXT)
+	$(ADDMOD) $(PSD)fapif1 -lib $(FT_LIB)
 
 $(PSOBJ)fapi_ft.$(OBJ) : $(PSSRC)fapi_ft.c $(AK)\
  $(stdio__h) $(math__h) $(ifapi_h)\
- $(FT_ROOT)$(D)include$(D)freetype$(D)freetype.h\
- $(FT_ROOT)$(D)include$(D)freetype$(D)ftincrem.h\
- $(FT_ROOT)$(D)include$(D)freetype$(D)ftglyph.h\
- $(FT_ROOT)$(D)include$(D)freetype$(D)ftoutln.h\
- $(FT_ROOT)$(D)include$(D)freetype$(D)fttrigon.h\
  $(write_t1_h) $(write_t2_h)
-	$(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)fapi_ft.$(OBJ) $(C_) $(PSSRC)fapi_ft.c
+	$(PSCC) $(FT_CFLAGS) $(PSO_)fapi_ft.$(OBJ) $(C_) $(PSSRC)fapi_ft.c
 
 $(PSOBJ)write_t1.$(OBJ) : $(PSSRC)write_t1.c $(AK)\
  $(wrfont_h) $(write_t1_h) 
-	$(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)write_t1.$(OBJ) $(C_) $(PSSRC)write_t1.c
+	$(PSCC) $(FT_CFLAGS) $(PSO_)write_t1.$(OBJ) $(C_) $(PSSRC)write_t1.c
 
 $(PSOBJ)write_t2.$(OBJ) : $(PSSRC)write_t2.c $(AK)\
  $(wrfont_h) $(write_t2_h) $(stdio_h)
-	$(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)write_t2.$(OBJ) $(C_) $(PSSRC)write_t2.c
+	$(PSCC) $(FT_CFLAGS) $(PSO_)write_t2.$(OBJ) $(C_) $(PSSRC)write_t2.c
 
 $(PSOBJ)wrfont.$(OBJ) : $(PSSRC)wrfont.c $(AK)\
  $(wrfont_h) $(stdio_h)
-	$(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)wrfont.$(OBJ) $(C_) $(PSSRC)wrfont.c
+	$(PSCC) $(FT_CFLAGS) $(PSO_)wrfont.$(OBJ) $(C_) $(PSSRC)wrfont.c
 
 # stub for FreeType bridge :
 


Index: ghostscript.spec
===================================================================
RCS file: /cvs/dist/rpms/ghostscript/devel/ghostscript.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ghostscript.spec	11 Jul 2005 12:35:01 -0000	1.71
+++ ghostscript.spec	12 Jul 2005 09:56:49 -0000	1.72
@@ -19,6 +19,7 @@
 Patch5: ghostscript-badc.patch
 Patch6: ghostscript-pagesize.patch
 Patch7: ghostscript-noopt.patch
+Patch8: ghostscript-use-external-freetype.patch
 
 Requires: zlib, libpng, glib2
 Requires: urw-fonts >= 1.1, ghostscript-fonts
@@ -89,6 +90,9 @@
 # Build igcref.c with -O0 to work around bug #150771.
 %patch7 -p1 -b .noopt
 
+# Use external freetype (bug #116638).
+%patch8 -p1 -b .use-external-freetype
+
 # Convert manual pages to UTF-8
 from8859_1() {
 	iconv -f iso-8859-1 -t utf-8 < "$1" > "${1}_"
@@ -106,8 +110,11 @@
 make
 cd ..
 
-make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix}
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix}
+FT_CFLAGS=$(pkg-config --cflags freetype2)
+make so RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} \
+	FT_BRIDGE=1 FT_CFLAGS="$FT_CFLAGS" FT_LIB=freetype
+make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" prefix=%{_prefix} \
+	FT_BRIDGE=1 FT_CFLAGS="$FT_CFLAGS" FT_LIB=freetype
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -127,7 +134,8 @@
 	gssharedir=$RPM_BUILD_ROOT%{_libdir}/%{name}/%{gs_ver} \
 	CUPSSERVER=$RPM_BUILD_ROOT`cups-config --serverbin` \
 	CUPSCONFIG=$RPM_BUILD_ROOT`cups-config --serverroot` \
-	CUPSDATA=$RPM_BUILD_ROOT`cups-config --datadir`
+	CUPSDATA=$RPM_BUILD_ROOT`cups-config --datadir` \
+	FT_BRIDGE=1
 
 mv -f $RPM_BUILD_ROOT%{_bindir}/gsc $RPM_BUILD_ROOT%{_bindir}/gs
 
@@ -217,6 +225,9 @@
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Jul 12 2005 Tim Waugh <twaugh at redhat.com>
+- Added use-external-freetype patch (bug #161187).
+
 * Mon Jul 11 2005 Tim Waugh <twaugh at redhat.com>
 - Build requires libtiff-devel (bug #162826).
 


