Commit af98b645 authored by Jonathan Kew's avatar Jonathan Kew
Browse files

bug 733512 - update freetype to v2.4.9. rs=dougt

parent 4ea0f9f5
Loading
Loading
Loading
Loading
+2845 −9

File changed.

Preview size limit exceeded, changes collapsed.

+5 −4
Original line number Diff line number Diff line
# FreeType 2 top Jamfile.
#
# Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 by
# Copyright 2001-2011 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -76,9 +76,10 @@ FT2_COMPONENTS ?= autofit # auto-fitter
                  cache      # cache sub-system
                  cff        # CFF/CEF font driver
                  cid        # PostScript CID-keyed font driver
                  gzip       # support for gzip-compressed files
                  lzw        # support for LZW-compressed files
                  pcf        # PCF font driver
                  bzip2      # support for bzip2-compressed PCF font
                  gzip       # support for gzip-compressed PCF font
                  lzw        # support for LZW-compressed PCF font
                  pfr        # PFR/TrueDoc font driver
                  psaux      # common PostScript routines module
                  pshinter   # PostScript hinter module
@@ -194,7 +195,7 @@ rule RefDoc

actions RefDoc
{
  python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.4.3 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h
  python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.4.9 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h
}

RefDoc  refdoc ;
+9 −16
Original line number Diff line number Diff line
  Special notes to Unix users
  ===========================

  Please  read  the file  `docs/UPGRADE.UNIX'.  It contains  important
  information regarding the installation  of FreeType on Unix systems,
  especially GNU based operating systems like GNU/Linux.

  FreeType 2's  library is called `libfreetype',  FreeType 1's library
  is called `libttf'.  They are *not* compatible!


  FreeType 2.4.3
  FreeType 2.4.9
  ==============

  Please   read   the  docs/CHANGES   file,   it  contains   IMPORTANT
@@ -17,6 +6,10 @@

  Read the files `docs/INSTALL' for installation instructions.

  See the  file `docs/LICENSE.TXT'  for the available licenses.   Note
  that we use ranges (`2008-2010') for copyright years also instead of
  listing individual years (`2008, 2009, 2010').

  The FreeType 2 API reference is located in `docs/reference'; use the
  file   `ft2-doc.html'   as   the   top  entry   point.    Additional
  documentation is available as a separate package from our sites.  Go
@@ -26,9 +19,9 @@

  and download one of the following files.

    freetype-doc-2.4.3.tar.bz2
    freetype-doc-2.4.3.tar.gz
    ftdoc243.zip
    freetype-doc-2.4.9.tar.bz2
    freetype-doc-2.4.9.tar.gz
    ftdoc249.zip


  Bugs
@@ -51,7 +44,7 @@

----------------------------------------------------------------------

Copyright 2006, 2007, 2008, 2009, 2010 by
Copyright 2006-2011 by
David Turner, Robert Wilhelm, and Werner Lemberg.

This  file is  part of  the FreeType  project, and  may only  be used,
+2 −4
Original line number Diff line number Diff line
This directory contains freetype2 v2.4.3 downloaded from
This directory contains freetype2 v2.4.9 downloaded from
http://savannah.nongnu.org/download/freetype/

Makefile.in is added for the mozilla build.

Additional patch applied locally:
There are currently no local changes applied the freetype tree.

modules/freetype2/autogen.sh

100644 → 100755
+5 −2
Original line number Diff line number Diff line
@@ -118,9 +118,12 @@ fi

# On MacOS X, the GNU libtool is named `glibtool'.
HOSTOS=`uname`
LIBTOOLIZE=libtoolize
if test "$HOSTOS"x = Darwinx; then
if test "$LIBTOOLIZE"x != x; then
  :
elif test "$HOSTOS"x = Darwinx; then
  LIBTOOLIZE=glibtoolize
else
  LIBTOOLIZE=libtoolize
fi

if test "$ACLOCAL"x = x; then
Loading