rpms/xpdf/devel xpdf-3.01-freetype-internals.patch, NONE, 1.1 xpdf.spec, 1.60, 1.61

Thu Oct 13 14:23:22 UTC 2005

Author: mclasen

Update of /cvs/dist/rpms/xpdf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv30132

Modified Files:
	xpdf.spec 
Added Files:
	xpdf-3.01-freetype-internals.patch 
Log Message:
don't use freetype internals


xpdf-3.01-freetype-internals.patch:
 SplashFTFont.cc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE xpdf-3.01-freetype-internals.patch ---
--- xpdf-3.01/splash/SplashFTFont.cc.freetype-internals	2005-08-17 01:34:31.000000000 -0400
+++ xpdf-3.01/splash/SplashFTFont.cc	2005-10-13 10:08:22.000000000 -0400
@@ -14,7 +14,8 @@
 
 #include <ft2build.h>
 #include FT_OUTLINE_H
-#include FT_INTERNAL_OBJECTS_H // needed for FT_New_Size decl
+#include FT_SIZES_H 
+#include FT_GLYPH_H 
 #include "gmem.h"
 #include "SplashMath.h"
 #include "SplashGlyphBitmap.h"


Index: xpdf.spec
===================================================================
RCS file: /cvs/dist/rpms/xpdf/devel/xpdf.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- xpdf.spec	7 Oct 2005 09:39:46 -0000	1.60
+++ xpdf.spec	13 Oct 2005 14:23:18 -0000	1.61
@@ -7,7 +7,7 @@
 Summary: A PDF file viewer for the X Window System.
 Name: xpdf
 Version: 3.01
-Release: 2
+Release: 3
 License: GPL
 Epoch: 1
 Url: http://www.foolabs.com/xpdf/
@@ -33,6 +33,7 @@
 Patch11: xpdf-3.01-crash.patch
 Patch12: xpdf-3.00-64bit.patch
 Patch13: xpdf-3.01-resize.patch
+Patch14: xpdf-3.01-freetype-internals.patch
 
 Requires: urw-fonts
 Requires: htmlview
@@ -117,6 +118,7 @@
 %patch11 -p1 -b .crash
 %patch12 -p1 -b .alloc
 %patch13 -p1 -b .resize
+%patch14 -p1 -b .freetype-internals
 
 %build
 find -name "*orig" | xargs rm -f
@@ -216,6 +218,9 @@
 %lang(ko) %{_datadir}/xpdf/korean
 
 %changelog
+* Thu Oct 13 2005 Matthias Clasen <mclasen at redhat.com> 3.01-3
+- don't use freetype internals
+
 * Fri Oct 07 2005 Than Ngo <than at redhat.com> 3.01-2 
 - apply upstream patch to fix resize/redraw bug #166569
 


