rpms/freetype/devel freetype-2.1.10-enable-ft2-bci.patch, NONE, 1.1 freetype.spec, 1.21, 1.22

[fedora-cvs-commits redhat com]

Author: jvdias

Update of /cvs/dist/rpms/freetype/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19771

Modified Files:
	freetype.spec 
Added Files:
	freetype-2.1.10-enable-ft2-bci.patch 
Log Message:
fix 'without_bytecode_interpreter 0' build

freetype-2.1.10-enable-ft2-bci.patch:
 ftoption.h |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE freetype-2.1.10-enable-ft2-bci.patch ---
--- freetype-2.1.10/include/freetype/config/ftoption.h.enable-ft2-bci	2005-10-12 13:50:40.000000000 -0400
+++ freetype-2.1.10/include/freetype/config/ftoption.h	2005-10-12 14:18:50.000000000 -0400
@@ -436,7 +436,7 @@
   /*   Do not #undef this macro here, since the build system might         */
   /*   define it for certain configurations only.                          */
   /*                                                                       */
-/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
 
 
   /*************************************************************************/


Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/devel/freetype.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- freetype.spec	7 Oct 2005 18:34:21 -0000	1.21
+++ freetype.spec	12 Oct 2005 19:19:55 -0000	1.22
@@ -11,7 +11,7 @@
 Summary: A free and portable TrueType font rendering engine.
 Name: freetype
 Version: 2.1.10
-Release: 1
+Release: 2
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -25,7 +25,7 @@
 Patch4: freetype-1.4-gcc33.patch
 # Add -lm when linking X demos
 Patch5: ft2demos-2.1.9-mathlib.patch
-Patch20:  freetype-2.1.3-enable-ft2-bci.patch
+Patch20:  freetype-2.1.10-enable-ft2-bci.patch
 Patch21:  freetype-1.4-disable-ft1-bci.patch
 
 # CVS bug fixes, mostly for embolding
@@ -116,7 +116,7 @@
 popd
 
 %if ! %{without_bytecode_interpreter}
-%patch20  -p0 -b .enable-ft2-bci
+%patch20  -p1 -b .enable-ft2-bci
 %endif
 
 # Need to update libtool to get deplibs right for x86_64
@@ -285,6 +285,9 @@
 %{_libdir}/pkgconfig/
 
 %changelog
+* Wed Oct 12 2005 Jason Vas Dias <jvdias redhat com> 2.1.10-2
+- fix 'without_bytecode_interpreter 0' build: freetype-2.1.10-enable-ft2-bci.patch
+
 * Fri Oct  7 2005 Matthias Clasen  <mclasen redhat com> 2.1.10-1
 - Update to 2.1.10
 - Add necessary fixes