Author: thl Update of /cvs/free/rpms/freetype-freeworld/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv10117 Modified Files: .cvsignore sources Added Files: 99-DejaVu-autohinter-only.conf freetype-2.1.10-enable-ft2-bci.patch freetype-2.2.1-enable-valid.patch freetype-2.2.1-memcpy-fix.patch freetype-2.3.0-enable-spr.patch freetype-2.3.5-CVEs.patch freetype-freeworld.spec freetype-multilib.patch Log Message: initial import from livna --- NEW FILE 99-DejaVu-autohinter-only.conf --- <?xml version="1.0"?> <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> <match target="font"> <test name="family" compare="eq"> <string>DejaVu Sans</string> </test> <edit name="autohint" mode="assign"> <bool>true</bool> </edit> </match> <match target="font"> <test name="family" compare="eq"> <string>DejaVu Serif</string> </test> <edit name="autohint" mode="assign"> <bool>true</bool> </edit> </match> <match target="font"> <test name="family" compare="eq"> <string>DejaVu Sans Mono</string> </test> <edit name="autohint" mode="assign"> <bool>true</bool> </edit> </match> <match target="font"> <test name="family" compare="eq"> <string>DejaVu LGC Sans</string> </test> <edit name="autohint" mode="assign"> <bool>true</bool> </edit> </match> <match target="font"> <test name="family" compare="eq"> <string>DejaVu LGC Serif</string> </test> <edit name="autohint" mode="assign"> <bool>true</bool> </edit> </match> <match target="font"> <test name="family" compare="eq"> <string>DejaVu LGC Sans Mono</string> </test> <edit name="autohint" mode="assign"> <bool>true</bool> </edit> </match> <match target="font"> <test name="family" compare="eq"> <string>Bitstream Vera Sans</string> </test> <edit name="autohint" mode="assign"> <bool>true</bool> </edit> </match> <match target="font"> <test name="family" compare="eq"> <string>Bitstream Vera Serif</string> </test> <edit name="autohint" mode="assign"> <bool>true</bool> </edit> </match> <match target="font"> <test name="family" compare="eq"> <string>Bitstream Vera Sans Mono</string> </test> <edit name="autohint" mode="assign"> <bool>true</bool> </edit> </match> </fontconfig> freetype-2.1.10-enable-ft2-bci.patch: --- 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 /*************************************************************************/ freetype-2.2.1-enable-valid.patch: --- NEW FILE freetype-2.2.1-enable-valid.patch --- --- freetype-2.2.1/modules.cfg.orig 2006-07-07 21:01:09.000000000 -0400 +++ freetype-2.2.1/modules.cfg 2006-07-07 21:01:54.000000000 -0400 @@ -110,7 +110,7 @@ AUX_MODULES += cache # TrueType GX/AAT table validation. Needs ftgxval.c below. -# AUX_MODULES += gxvalid +AUX_MODULES += gxvalid # Support for streams compressed with gzip (files with suffix .gz). # @@ -124,7 +124,7 @@ # OpenType table validation. Needs ftotval.c below. # -# AUX_MODULES += otvalid +AUX_MODULES += otvalid # Auxiliary PostScript driver component to share common code. # freetype-2.2.1-memcpy-fix.patch: --- NEW FILE freetype-2.2.1-memcpy-fix.patch --- --- freetype-2.2.1/src/psaux/psobjs.c~ 2006-04-26 16:38:17.000000000 +0200 +++ freetype-2.2.1/src/psaux/psobjs.c 2006-09-10 15:01:13.000000000 +0200 @@ -165,6 +165,11 @@ return PSaux_Err_Invalid_Argument; } + if ( length < 0 ) { + FT_ERROR(( "ps_table_add: invalid length\n" )); + return PSaux_Err_Invalid_Argument; + } + /* grow the base block if needed */ if ( table->cursor + length > table->capacity ) { freetype-2.3.0-enable-spr.patch: --- NEW FILE freetype-2.3.0-enable-spr.patch --- --- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500 +++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500 @@ -92,7 +92,7 @@ /* This is done to allow FreeType clients to run unmodified, forcing */ /* them to display normal gray-level anti-aliased glyphs. */ /* */ -/* #define FT_CONFIG_OPTION_SUBPIXEL_RENDERING */ +#define FT_CONFIG_OPTION_SUBPIXEL_RENDERING /*************************************************************************/ freetype-2.3.5-CVEs.patch: --- NEW FILE freetype-2.3.5-CVEs.patch --- diff --git a/src/base/ftstream.c b/src/base/ftstream.c index a067a1f..569e46c 100644 --- a/src/base/ftstream.c +++ b/src/base/ftstream.c @@ -89,6 +89,9 @@ FT_Stream_Skip( FT_Stream stream, FT_Long distance ) { + if ( distance < 0 ) + return FT_Err_Invalid_Stream_Operation; + return FT_Stream_Seek( stream, (FT_ULong)( stream->pos + distance ) ); } diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c index 9d3ebdf..b7b84ac 100644 --- a/src/psaux/psobjs.c +++ b/src/psaux/psobjs.c @@ -169,7 +169,7 @@ void* object, FT_PtrDist length ) { - if ( idx < 0 || idx > table->max_elems ) + if ( idx < 0 || idx >= table->max_elems ) { FT_ERROR(( "ps_table_add: invalid index\n" )); return PSaux_Err_Invalid_Argument; diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c index abe0278..6b7c342 100644 --- a/src/sfnt/ttload.c +++ b/src/sfnt/ttload.c @@ -618,6 +618,15 @@ if ( maxProfile->maxFunctionDefs == 0 ) maxProfile->maxFunctionDefs = 64; + + /* we add 4 phantom points later */ + if ( maxProfile->maxTwilightPoints > ( 0xFFFFU - 4 ) ) + { + FT_ERROR(( "Too much twilight points in `maxp' table;\n" )); + FT_ERROR(( " some glyphs might be rendered incorrectly.\n" )); + + maxProfile->maxTwilightPoints = 0xFFFFU - 4; + } } FT_TRACE3(( "numGlyphs: %u\n", maxProfile->numGlyphs )); diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index f0f91e9..f9c3656 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -5449,7 +5449,7 @@ /* XXX: this is probably wrong... at least it prevents memory */ /* corruption when zp2 is the twilight zone */ - if ( last_point > CUR.zp2.n_points ) + if ( BOUNDS( last_point, CUR.zp2.n_points ) ) { if ( CUR.zp2.n_points > 0 ) last_point = (FT_UShort)(CUR.zp2.n_points - 1); diff --git a/src/type1/t1load.c b/src/type1/t1load.c index 508fd89..9d7c748 100644 --- a/src/type1/t1load.c +++ b/src/type1/t1load.c @@ -674,7 +674,7 @@ for ( n = 0; n < num_designs; n++ ) { - T1_TokenRec axis_tokens[T1_MAX_MM_DESIGNS]; + T1_TokenRec axis_tokens[T1_MAX_MM_AXIS]; T1_Token token; FT_Int axis, n_axis; @@ -687,6 +687,15 @@ if ( n == 0 ) { + if ( n_axis <= 0 || n_axis > T1_MAX_MM_AXIS ) + { + FT_ERROR(( "parse_blend_design_positions:" )); + FT_ERROR(( " invalid number of axes: %d\n", + n_axis )); + error = T1_Err_Invalid_File_Format; + goto Exit; + } + num_axis = n_axis; error = t1_allocate_blend( face, num_designs, num_axis ); if ( error ) diff --git a/src/type1/t1parse.c b/src/type1/t1parse.c index 1b252c7..36f5c82 100644 --- a/src/type1/t1parse.c +++ b/src/type1/t1parse.c @@ -65,14 +65,16 @@ /*************************************************************************/ + /* see Adobe Technical Note 5040.Download_Fonts.pdf */ + static FT_Error read_pfb_tag( FT_Stream stream, FT_UShort *atag, - FT_Long *asize ) + FT_ULong *asize ) { FT_Error error; FT_UShort tag; - FT_Long size; + FT_ULong size; *atag = 0; @@ -82,7 +84,7 @@ { if ( tag == 0x8001U || tag == 0x8002U ) { - if ( !FT_READ_LONG_LE( size ) ) + if ( !FT_READ_ULONG_LE( size ) ) *asize = size; } @@ -100,22 +102,25 @@ { FT_Error error; FT_UShort tag; - FT_Long size; + FT_ULong dummy; if ( FT_STREAM_SEEK( 0 ) ) goto Exit; - error = read_pfb_tag( stream, &tag, &size ); + error = read_pfb_tag( stream, &tag, &dummy ); if ( error ) goto Exit; + /* We assume that the first segment in a PFB is always encoded as */ + /* text. This might be wrong (and the specification doesn't insist */ + /* on that), but we have never seen a counterexample. */ if ( tag != 0x8001U && FT_STREAM_SEEK( 0 ) ) goto Exit; if ( !FT_FRAME_ENTER( header_length ) ) { - error = 0; + error = T1_Err_Ok; if ( ft_memcmp( stream->cursor, header_string, header_length ) != 0 ) error = T1_Err_Unknown_File_Format; @@ -136,7 +141,7 @@ { FT_Error error; FT_UShort tag; - FT_Long size; + FT_ULong size; psaux->ps_parser_funcs->init( &parser->root, 0, 0, memory ); @@ -260,7 +265,7 @@ FT_Stream stream = parser->stream; FT_Memory memory = parser->root.memory; FT_Error error = T1_Err_Ok; - FT_Long size; + FT_ULong size; if ( parser->in_pfb ) @@ -409,7 +414,7 @@ goto Exit; } - size = (FT_Long)( parser->base_len - ( cur - parser->base_dict ) ); + size = parser->base_len - ( cur - parser->base_dict ); if ( parser->in_memory ) { diff --git a/src/type1/t1parse.h b/src/type1/t1parse.h index 6fa4ca6..fb1c8a8 100644 --- a/src/type1/t1parse.h +++ b/src/type1/t1parse.h @@ -64,10 +64,10 @@ FT_BEGIN_HEADER FT_Stream stream; FT_Byte* base_dict; - FT_Long base_len; + FT_ULong base_len; FT_Byte* private_dict; - FT_Long private_len; + FT_ULong private_len; FT_Bool in_pfb; FT_Bool in_memory; --- NEW FILE freetype-freeworld.spec --- # Enable patented bytecode interpreter and patented subpixel rendering. # Setting to 1 disables them. %define without_bytecode_interpreter 0 %define without_subpixel_rendering 0 %{!?with_xfree86:%define with_xfree86 1} Summary: A free and portable font rendering engine Name: freetype-freeworld Version: 2.3.5 Release: 5%{?dist} License: FTL or GPLv2+ Group: System Environment/Libraries URL: http://www.freetype.org Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.ta... Source1: 99-DejaVu-autohinter-only.conf Patch20: freetype-2.1.10-enable-ft2-bci.patch Patch21: freetype-2.3.0-enable-spr.patch # Enable otvalid and gxvalid modules Patch46: freetype-2.2.1-enable-valid.patch # Fix multilib conflicts Patch88: freetype-multilib.patch # Fix crash https://bugs.freedesktop.org/show_bug.cgi?id=6841 Patch89: freetype-2.2.1-memcpy-fix.patch # Upstream patches Patch90: freetype-2.3.5-CVEs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) Requires: /etc/ld.so.conf.d BuildRequires: libX11-devel %description The FreeType engine is a free and portable font rendering engine, developed to provide advanced font support for a variety of platforms and environments. FreeType is a library which can open and manages font files as well as efficiently load, hint and render individual glyphs. FreeType is not a font server or a complete text-rendering library. This version is compiled with the patented bytecode interpreter and subpixel rendering enabled. It transparently overrides the system library using ld.so.conf.d. %package devel Summary: FreeType development libraries and header files Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: zlib-devel Requires: pkgconfig %description devel The freetype-devel package includes the static libraries and header files for the FreeType font rendering engine. Install freetype-devel if you want to develop programs which will use FreeType. %prep %setup -q -n freetype-%{version} %if ! %{without_bytecode_interpreter} %patch20 -p1 -b .enable-ft2-bci %endif %if ! %{without_subpixel_rendering} %patch21 -p1 -b .enable-spr %endif %patch46 -p1 -b .enable-valid %patch88 -p1 -b .multilib %patch89 -p1 -b .memcpy %patch90 -p1 -b .CVEs %build %configure --disable-static sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' builds/unix/libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' builds/unix/libtool make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT umask 0022 %makeinstall gnulocaledir=$RPM_BUILD_ROOT%{_datadir}/locale # Don't package static a or .la files nor devel files rm -rf $RPM_BUILD_ROOT%{_libdir}/*.{a,la,so} \ $RPM_BUILD_ROOT%{_libdir}/pkgconfig $RPM_BUILD_ROOT%{_bindir} \ $RPM_BUILD_ROOT%{_datadir}/aclocal $RPM_BUILD_ROOT%{_includedir} # Move library to avoid conflict with official FreeType package mkdir $RPM_BUILD_ROOT%{_libdir}/%{name} mv -f $RPM_BUILD_ROOT%{_libdir}/libfreetype.so.* \ $RPM_BUILD_ROOT%{_libdir}/%{name} # Register the library directory in /etc/ld.so.conf.d mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d echo "%{_libdir}/%{name}" \ # Disable BCI for DejaVu and Vera because it changes the font weight install -D -p -m 0755 %{SOURCE1} \ $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.d/99-DejaVu-autohinter-only.conf %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %{_libdir}/%{name} %doc ChangeLog README docs/LICENSE.TXT docs/FTL.TXT docs/GPL.TXT %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf %config(noreplace) %{_sysconfdir}/fonts/conf.d/*.conf %changelog * Sat Aug 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.3.5-5 - rebuild for RPM Fusion * Tue Jun 17 2008 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; 2.3.5-4 - Apply security patch for CVE-2008-1806, CVE-2008-1807 and CVE-2008-1808 * Tue Sep 18 2007 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; 2.3.5-3.lvn8 - Update to 2.3.5 - Fix builds/unix/libtool to not emit rpath into binaries (#225770, Adam Jackson) - Drop unused freetype-doc tarball - Use full URL for Source tag - Fix License tag - Ship license as %%doc * Thu Apr 12 2007 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; 2.3.4-1.lvn7 - Rename to freetype-freeworld - Enable bytecode interpreter and subpixel rendering - Remove demos - Remove devel subpackage, delete devel files after install - Remove triggerpostun - Install library to libdir/freetype-freeworld - Register in /etc/ld.so.conf.d (trick lifted from ATLAS specfile) - Set umask before install - Disable BCI for DejaVu and Vera because it changes the font weight - Update description * Tue Apr 05 2007 Behdad Esfahbod <besfahbo(a)redhat.com&gt; 2.3.4-1 - Update to 2.3.4. * Thu Apr 05 2007 Behdad Esfahbod <besfahbo(a)redhat.com&gt; 2.3.3-2 - Include new demos ftgrid and ftdiff in freetype-demos. (#235478) * Thu Apr 05 2007 Behdad Esfahbod <besfahbo(a)redhat.com&gt; 2.3.3-1 - Update to 2.3.3. * Fri Mar 09 2007 Behdad Esfahbod <besfahbo(a)redhat.com&gt; 2.3.2-1 - Update to 2.3.2. * Fri Feb 02 2007 Behdad Esfahbod <besfahbo(a)redhat.com&gt; 2.3.1-1 - Update to 2.3.1. * Wed Jan 17 2007 Behdad Esfahbod <besfahbo(a)redhat.com&gt; 2.3.0-2 - Add without_subpixel_rendering. - Drop X11_PATH=/usr. Not needed anymore. * Wed Jan 17 2007 Behdad Esfahbod <besfahbo(a)redhat.com&gt; 2.3.0-1 - Update to 2.3.0. - Drop upstream patches. - Drop -fno-strict-aliasing, it should just work. - Fix typo in ftconfig.h generation. * Tue Jan 09 2007 Behdad Esfahbod <besfahbo(a)redhat.com&gt; 2.2.1-16 - Backport binary-search fixes from HEAD - Add freetype-2.2.1-ttcmap.patch - Resolves: #208734 - Fix rendering issue with some Asian fonts. - Add freetype-2.2.1-fix-get-orientation.patch - Resolves: #207261 - Copy non-X demos even if not compiling with_xfree86. - Add freetype-2.2.1-zero-item-size.patch, to fix crasher. - Resolves #214048 - Add X11_PATH=/usr to "make"s, to find modern X. - Resolves #212199 * Mon Sep 11 2006 Behdad Esfahbod <besfahbo(a)redhat.com&gt; 2.2.1-10 - Fix crasher https://bugs.freedesktop.org/show_bug.cgi?id=6841 - Add freetype-2.2.1-memcpy-fix.patch * Thu Sep 07 2006 Behdad Esfahbod <besfahbo(a)redhat.com&gt; 2.2.1-9 - Add BuildRequires: libX11-devel (#205355) * Tue Aug 29 2006 Behdad Esfahbod <besfahbo(a)redhat.com&gt; 2.2.1-8 - Add freetype-composite.patch and freetype-more-composite.patch from upstream. (#131851) * Mon Aug 28 2006 Matthias Clasen <mclasen(a)redhat.com&gt; - 2.2.1-7 - Require pkgconfig in the -devel package * Fri Aug 18 2006 Jesse Keating <jkeating(a)redhat.com&gt; - 2.2.1-6 - pass --disable-static to %%configure. (#172628) * Thu Aug 17 2006 Jesse Keating <jkeating(a)redhat.com&gt; - 2.2.1-5 - don't package static libs * Sun Aug 13 2006 Matthias Clasen <mclasen(a)redhat.com&gt; - 2.2.1-4.fc6 - fix a problem with the multilib patch (#202366) * Thu Jul 27 2006 Matthias Clasen <mclasen(a)redhat.com&gt; - 2.2.1-3 - fix multilib issues * Wed Jul 12 2006 Jesse Keating <jkeating(a)redhat.com&gt; - 2.2.1-2.1 - rebuild * Fri Jul 07 2006 Behdad Esfahbod <besfahbo(a)redhat.com&gt; 2.2.1-2 - Remove unused BuildRequires * Fri Jul 07 2006 Behdad Esfahbod <besfahbo(a)redhat.com&gt; 2.2.1-1 - Update to 2.2.1 - Remove FreeType 1, to move to extras - Install new demos ftbench, ftchkwd, ftgamma, and ftvalid - Enable modules gxvalid and otvalid * Wed May 17 2006 Karsten Hopp <karsten(a)redhat.de&gt; 2.1.10-6 - add buildrequires libICE-devel, libSM-devel * Fri Feb 10 2006 Jesse Keating <jkeating(a)redhat.com&gt; - 2.1.10-5.2.1 - bump again for double-long bug on ppc(64) * Tue Feb 07 2006 Jesse Keating <jkeating(a)redhat.com&gt; - 2.1.10-5.2 - rebuilt for new gcc4.1 snapshot and glibc changes * Fri Dec 09 2005 Jesse Keating <jkeating(a)redhat.com&gt; - rebuilt * Fri Nov 18 2005 Bill Nottingham <notting(a)redhat.com&gt; 2.1.10-5 - Remove references to obsolete /usr/X11R6 paths * Tue Nov 1 2005 Matthias Clasen <mclasen(a)redhat.com&gt; 2.1.10-4 - Switch requires to modular X * Fri Oct 21 2005 Matthias Clasen <mclasen(a)redhat.com&gt; 2.1.10-3 - BuildRequire gettext * Wed Oct 12 2005 Jason Vas Dias <jvdias(a)redhat.com&gt; 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(a)redhat.com&gt; 2.1.10-1 - Update to 2.1.10 - Add necessary fixes * Tue Aug 16 2005 Kristian Høgsberg <krh(a)redhat.com&gt; 2.1.9-4 - Fix freetype-config on 64 bit platforms. * Thu Jul 07 2005 Karsten Hopp <karsten(a)redhat.de&gt; 2.1.9-3 - BuildRequires xorg-x11-devel * Fri Mar 4 2005 David Zeuthen <davidz(a)redhat.com&gt; - 2.1.9-2 - Rebuild * Wed Aug 4 2004 Owen Taylor <otaylor(a)redhat.com&gt; - 2.1.9-1 - Upgrade to 2.1.9 - Since we are just using automake for aclocal, use it unversioned, instead of specifying 1.4. * Tue Jun 15 2004 Elliot Lee <sopwith(a)redhat.com&gt; - rebuilt * Mon Apr 19 2004 Owen Taylor <otaylor(a)redhat.com&gt; 2.1.7-4 - Add patch from freetype CVS to fix problem with eexec (#117743) - Add freetype-devel to buildrequires and -devel requires (Maxim Dzumanenko, #111108) * Wed Mar 10 2004 Mike A. Harris <mharris(a)redhat.com&gt; 2.1.7-3 - Added -fno-strict-aliasing to CFLAGS and CXXFLAGS to try to fix SEGV and SIGILL crashes in mkfontscale which have been traced into freetype and seem to be caused by aliasing issues in freetype macros (#118021) * Tue Mar 02 2004 Elliot Lee <sopwith(a)redhat.com&gt; 2.1.7-2.1 - rebuilt * Fri Feb 13 2004 Elliot Lee <sopwith(a)redhat.com&gt; 2.1.7-2 - rebuilt * Fri Jan 23 2004 Owen Taylor <otaylor(a)redhat.com&gt; 2.1.7-1 - Upgrade to 2.1.7 * Tue Sep 23 2003 Florian La Roche <Florian.LaRoche(a)redhat.de&gt; - allow compiling without the demos as that requires XFree86 (this allows bootstrapping XFree86 on new archs) * Fri Aug 8 2003 Elliot Lee <sopwith(a)redhat.com&gt; 2.1.4-4.1 - Rebuilt * Tue Jul 8 2003 Owen Taylor <otaylor(a)redhat.com&gt; 2.1.4-4.0 - Bump for rebuild * Wed Jun 25 2003 Owen Taylor <otaylor(a)redhat.com&gt; 2.1.4-3 - Fix crash with non-format-0 hdmx tables (found by David Woodhouse) * Mon Jun 9 2003 Owen Taylor <otaylor(a)redhat.com&gt; 2.1.4-1 - Version 2.1.4 - Relibtoolize to get deplibs right for x86_64 - Use autoconf-2.5x for freetype-1.4 to fix libtool-1.5 compat problem (#91781) - Relativize absolute symlinks to fix the -debuginfo package (#83521, Mike Harris) * Wed Jun 04 2003 Elliot Lee <sopwith(a)redhat.com&gt; - rebuilt * Thu May 22 2003 Jeremy Katz <katzj(a)redhat.com&gt; 2.1.3-9 - fix build with gcc 3.3 * Tue Feb 25 2003 Owen Taylor <otaylor(a)redhat.com&gt; - Add a memleak fix for the gzip backend from Federic Crozat * Thu Feb 13 2003 Elliot Lee <sopwith(a)redhat.com&gt; 2.1.3-7 - Run libtoolize/aclocal/autoconf so that libtool knows to generate shared libraries on ppc64. - Use _smp_mflags (for freetype 2.x only) * Tue Feb 4 2003 Owen Taylor <otaylor(a)redhat.com&gt; - Switch to using %%configure (should fix #82330) * Wed Jan 22 2003 Tim Powers <timp(a)redhat.com&gt; - rebuilt * Mon Jan 6 2003 Owen Taylor <otaylor(a)redhat.com&gt; 2.1.3-4 - Make FreeType robust against corrupt fonts with recursive composite glyphs (#74782, James Antill) * Thu Jan 2 2003 Owen Taylor <otaylor(a)redhat.com&gt; 2.1.3-3 - Add a patch to implement FT_LOAD_TARGET_LIGHT - Fix up freetype-1.4-libtool.patch * Sat Dec 12 2002 Mike A. Harris <mharris(a)redhat.com&gt; 2.1.3-2 - Update to freetype 2.1.3 - Removed ttmkfdir sources and patches, as they have been moved from the freetype packaging to XFree86 packaging, and now to the ttmkfdir package - Removed patches that are now included in 2.1.3: freetype-2.1.1-primaryhints.patch, freetype-2.1.2-slighthint.patch, freetype-2.1.2-bluefuzz.patch, freetype-2.1.2-stdw.patch, freetype-2.1.2-transform.patch, freetype-2.1.2-autohint.patch, freetype-2.1.2-leftright.patch - Conditionalized inclusion of freetype 1.4 library. * Wed Dec 04 2002 Florian La Roche <Florian.LaRoche(a)redhat.de&gt; - disable perl, it is not used at all * Tue Dec 03 2002 Elliot Lee <sopwith(a)redhat.com&gt; 2.1.2-11 - Instead of removing unpackaged file, include it in the package. * Sat Nov 30 2002 Mike A. Harris <mharris(a)redhat.com&gt; 2.1.2-10 - Attempted to fix lib64 issue in freetype-demos build with X11_LINKLIBS - Cleaned up various _foodir macros throughtout specfile - Removed with_ttmkfdir build option as it is way obsolete * Fri Nov 29 2002 Tim Powers <timp(a)redhat.com&gt; 2.1.2-8 - remove unpackaged files from the buildroot * Wed Aug 28 2002 Owen Taylor <otaylor(a)redhat.com&gt; - Fix a bug with PCF metrics * Fri Aug 9 2002 Owen Taylor <otaylor(a)redhat.com&gt; - Backport autohinter improvements from CVS * Tue Jul 23 2002 Owen Taylor <otaylor(a)redhat.com&gt; - Fix from CVS for transformations (#68964) * Tue Jul 9 2002 Owen Taylor <otaylor(a)redhat.com&gt; - Add another bugfix for the postscript hinter * Mon Jul 8 2002 Owen Taylor <otaylor(a)redhat.com&gt; - Add support for BlueFuzz private dict value, fixing rendering glitch for Luxi Mono. * Wed Jul 3 2002 Owen Taylor <otaylor(a)redhat.com&gt; - Add an experimental FT_Set_Hint_Flags() call * Mon Jul 1 2002 Owen Taylor <otaylor(a)redhat.com&gt; - Update to 2.1.2 - Add a patch fixing freetype PS hinter bug * Fri Jun 21 2002 Mike A. Harris <mharris(a)redhat.com&gt; 2.1.1-2 - Added ft rpm build time conditionalizations upon user requests * Tue Jun 11 2002 Owen Taylor <otaylor(a)redhat.com&gt; 2.1.1-1 - Version 2.1.1 * Mon Jun 10 2002 Owen Taylor <otaylor(a)redhat.com&gt; - Add a fix for PCF character maps * Sun May 26 2002 Tim Powers <timp(a)redhat.com&gt; - automated rebuild * Fri May 17 2002 Mike A. Harris <mharris(a)redhat.com&gt; 2.1.0-2 - Updated freetype to version 2.1.0 - Added libtool fix for freetype 1.4 (#64631) * Wed Mar 27 2002 Nalin Dahyabhai <nalin(a)redhat.com&gt; 2.0.9-2 - use "libtool install" instead of "install" to install some binaries (#62005) * Mon Mar 11 2002 Mike A. Harris <mharris(a)redhat.com&gt; 2.0.9-1 - Updated to freetype 2.0.9 * Sun Feb 24 2002 Mike A. Harris <mharris(a)redhat.com&gt; 2.0.8-4 - Added proper docs+demos source for 2.0.8. * Sat Feb 23 2002 Mike A. Harris <mharris(a)redhat.com&gt; 2.0.8-3 - Added compat patch so 2.x works more like 1.x - Rebuilt with new build toolchain * Fri Feb 22 2002 Mike A. Harris <mharris(a)redhat.com&gt; 2.0.8-2 - Updated to freetype 2.0.8, however docs and demos are stuck at 2.0.7 on the freetype website. Munged specfile to deal with the problem by using {oldversion} instead of version where appropriate. <sigh> * Sat Feb 2 2002 Tim Powers <timp(a)redhat.com&gt; 2.0.6-3 - bumping release so that we don't collide with another build of freetype, make sure to change the release requirement in the XFree86 package * Fri Feb 1 2002 Mike A. Harris <mharris(a)redhat.com&gt; 2.0.6-2 - Made ttmkfdir inclusion conditional, and set up a define to include ttmkfdir in RHL 7.x builds, since ttmkfdir is now moving to the new XFree86-font-utils package. * Wed Jan 16 2002 Mike A. Harris <mharris(a)redhat.com&gt; 2.0.6-1 - Updated freetype to version 2.0.6 * Wed Jan 09 2002 Tim Powers <timp(a)redhat.com&gt; 2.0.5-4 - automated rebuild * Fri Nov 30 2001 Elliot Lee <sopwith(a)redhat.com&gt; 2.0.5-3 - Fix bug #56901 (ttmkfdir needed to list Unicode encoding when generating font list). (ttmkfdir-iso10646.patch) - Use _smp_mflags macro everywhere relevant. (freetype-pre1.4-make.patch) - Undo fix for #24253, assume compiler was fixed. * Mon Nov 12 2001 Bernhard Rosenkraenzer <bero(a)redhat.com&gt; 2.0.5-2 - Fix build with gcc 3.1 (#56079) * Sun Nov 11 2001 Mike A. Harris <mharris(a)redhat.com&gt; 2.0.5-1 - Updated freetype to version 2.0.5 * Sat Sep 22 2001 Mike A. Harris <mharris(a)redhat.com&gt; 2.0.4-2 - Added new subpackage freetype-demos, added demos to build - Disabled ftdump, ftlint in utils package favoring the newer utils in demos package. * Tue Sep 11 2001 Mike A. Harris <mharris(a)redhat.com&gt; 2.0.4-1 - Updated source to 2.0.4 - Added freetype demo's back into src.rpm, but not building yet. * Wed Aug 15 2001 Mike A. Harris <mharris(a)redhat.com&gt; 2.0.3-7 - Changed package to use {findlang} macro to fix bug (#50676) * Sun Jul 15 2001 Mike A. Harris <mharris(a)redhat.com&gt; 2.0.3-6 - Changed freetype-devel to group Development/Libraries (#47625) * Mon Jul 9 2001 Bernhard Rosenkraenzer <bero(a)redhat.com&gt; 2.0.3-5 - Fix up FT1 headers to please Qt 3.0.0 beta 2 * Sun Jun 24 2001 Bernhard Rosenkraenzer <bero(a)redhat.com&gt; 2.0.3-4 - Add ft2build.h to -devel package, since it's included by all other freetype headers, the package is useless without it * Thu Jun 21 2001 Nalin Dahyabhai <nalin(a)redhat.com&gt; 2.0.3-3 - Change "Requires: freetype = name/ver" to "freetype = version/release", and move the requirements to the subpackages. * Mon Jun 18 2001 Mike A. Harris <mharris(a)redhat.com&gt; 2.0.3-2 - Added "Requires: freetype = name/ver" * Tue Jun 12 2001 Mike A. Harris <mharris(a)redhat.com&gt; 2.0.3-1 - Updated to Freetype 2.0.3, minor specfile tweaks. - Freetype2 docs are is in a separate tarball now. Integrated it. - Built in new environment. * Fri Apr 27 2001 Bill Nottingham <notting(a)redhat.com&gt; - rebuild for C++ exception handling on ia64 * Sat Jan 20 2001 Bernhard Rosenkraenzer <bero(a)redhat.com&gt; - Build ttmkfdir with -O0, workaround for Bug #24253 * Fri Jan 19 2001 Nalin Dahyabhai <nalin(a)redhat.com&gt; - libtool is used to build libttf, so use libtool to link ttmkfdir with it - fixup a paths for a couple of missing docs * Thu Jan 11 2001 Bernhard Rosenkraenzer <bero(a)redhat.com&gt; - Update ttmkfdir * Wed Dec 27 2000 Bernhard Rosenkraenzer <bero(a)redhat.com&gt; - Update to 2.0.1 and 1.4 - Mark locale files as such * Wed Jul 12 2000 Prospector <bugzilla(a)redhat.com&gt; - automatic rebuild * Mon Jun 12 2000 Preston Brown <pbrown(a)redhat.com&gt; - move .la file to devel pkg - FHS paths * Thu Feb 17 2000 Preston Brown <pbrown(a)redhat.com&gt; - revert spaces patch, fix up some foundry names to match X ones * Mon Feb 07 2000 Nalin Dahyabhai <nalin(a)redhat.com&gt; - add defattr, ftmetric, ftsbit, ftstrtto per bug #9174 * Wed Feb 02 2000 Cristian Gafton <gafton(a)redhat.com&gt; - fix description and summary * Wed Jan 12 2000 Preston Brown <pbrown(a)redhat.com&gt; - make ttmkfdir replace spaces in family names with underscores (#7613) * Tue Jan 11 2000 Bernhard Rosenkraenzer <bero(a)redhat.com&gt; - 1.3.1 - handle RPM_OPT_FLAGS * Wed Nov 10 1999 Preston Brown <pbrown(a)redhat.com&gt; - fix a path for ttmkfdir Makefile * Thu Aug 19 1999 Preston Brown <pbrown(a)redhat.com&gt; - newer ttmkfdir that works better, moved ttmkfdir to /usr/bin from /usr/sbin - freetype utilities moved to subpkg, X dependency removed from main pkg - libttf.so symlink moved to devel pkg * Mon Mar 22 1999 Preston Brown <pbrown(a)redhat.com&gt; - strip binaries * Sun Mar 21 1999 Cristian Gafton <gafton(a)redhat.com&gt; - auto rebuild in the new build environment (release 5) * Thu Mar 18 1999 Cristian Gafton <gafton(a)redhat.com&gt; - fixed the %doc file list * Wed Feb 24 1999 Preston Brown <pbrown(a)redhat.com&gt; - Injected new description and group. * Mon Feb 15 1999 Preston Brown <pbrown(a)redhat.com&gt; - added ttmkfdir * Tue Feb 02 1999 Preston Brown <pbrown(a)redhat.com&gt; - update to 1.2 * Thu Jan 07 1999 Cristian Gafton <gafton(a)redhat.com&gt; - call libtoolize to sanitize config.sub and get ARM support - dispoze of the patch (not necessary anymore) * Wed Oct 21 1998 Preston Brown <pbrown(a)redhat.com&gt; - post/postun sections for ldconfig action. * Tue Oct 20 1998 Preston Brown <pbrown(a)redhat.com&gt; - initial RPM, includes normal and development packages. freetype-multilib.patch: --- NEW FILE freetype-multilib.patch --- --- freetype-2.2.1/builds/unix/freetype-config.in.multilib 2006-07-27 18:50:40.000000000 -0400 +++ freetype-2.2.1/builds/unix/freetype-config.in 2006-07-27 18:58:13.000000000 -0400 @@ -9,11 +9,11 @@ # indicate that you have read the license and understand and accept it # fully. -prefix=@prefix@ -exec_prefix=@exec_prefix@ +prefix=`pkg-config --variable prefix freetype2` +exec_prefix=`pkg-config --variable exec_prefix freetype2` exec_prefix_set=no -includedir=@includedir@ -libdir=@libdir@ +includedir=`pkg-config --variable includedir freetype2` +libdir=`pkg-config --variable libdir freetype2` enable_shared=@enable_shared@ wl=@wl@ hardcode_libdir_flag_spec='@hardcode_libdir_flag_spec@' Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/freetype-freeworld/F-8/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Jul 2008 16:50:30 -0000 1.1 +++ .cvsignore 9 Aug 2008 21:28:24 -0000 1.2 @@ -0,0 +1 @@ +freetype-2.3.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/freetype-freeworld/F-8/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Jul 2008 16:50:30 -0000 1.1 +++ sources 9 Aug 2008 21:28:24 -0000 1.2 @@ -0,0 +1 @@ +65234327c5ac46ee00ebda15995d4c1c freetype-2.3.5.tar.bz2