From 320613eeb83d0cd704de3e6adfb13dce787861bb Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Fri, 15 Jun 2012 06:45:12 +0200 Subject: [PATCH] * Version 2.4.10 released. ========================== Tag sources with `VER-2-4-10'. * docs/VERSION.DLL: Update documentation and bump version number to 2.4.10. * README, Jamfile (RefDoc), builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, builds/win32/visualc/freetype.dsp, builds/win32/visualc/freetype.vcproj, builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, builds/win32/visualce/freetype.vcproj, builds/win32/visualce/index.html, builds/wince/vc2005-ce/freetype.vcproj, builds/wince/vc2005-ce/index.html, builds/wince/vc2008-ce/freetype.vcproj, builds/wince/vc2008-ce/index.html: s/2.4.9/2.4.10/, s/249/2410/. * include/freetype/freetype.h (FREETYPE_PATCH): Set to 10. * builds/unix/configure.raw (version_info): Set to 15:0:9. --- ChangeLog | 29 +++++++++ Jamfile | 2 +- README | 10 +-- builds/unix/configure.raw | 2 +- builds/win32/vc2005/freetype.vcproj | 12 ++-- builds/win32/vc2005/index.html | 10 +-- builds/win32/vc2008/freetype.vcproj | 12 ++-- builds/win32/vc2008/index.html | 10 +-- builds/win32/vc2010/freetype.vcxproj | 12 ++-- builds/win32/vc2010/index.html | 10 +-- builds/win32/visualc/freetype.dsp | 20 +++--- builds/win32/visualc/freetype.vcproj | 12 ++-- builds/win32/visualc/index.html | 10 +-- builds/win32/visualce/freetype.dsp | 20 +++--- builds/win32/visualce/freetype.vcproj | 84 +++++++++++++------------- builds/win32/visualce/index.html | 10 +-- builds/wince/vc2005-ce/freetype.vcproj | 76 +++++++++++------------ builds/wince/vc2005-ce/index.html | 10 +-- builds/wince/vc2008-ce/freetype.vcproj | 76 +++++++++++------------ builds/wince/vc2008-ce/index.html | 10 +-- docs/VERSION.DLL | 1 + include/freetype/freetype.h | 2 +- 22 files changed, 235 insertions(+), 205 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd54ab20b..23b23d848 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +2012-06-15 Werner Lemberg + + * Version 2.4.10 released. + ========================= + + + Tag sources with `VER-2-4-10'. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.10. + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/vc2010/freetype.vcxproj, builds/win32/vc2010/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.4.9/2.4.10/, s/249/2410/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 10. + + * builds/unix/configure.raw (version_info): Set to 15:0:9. + 2012-06-15 Alexei Podtelezhnikov * src/base/ftsynth.c (FT_GlyphSlot_Embolden): Improve spacing. diff --git a/Jamfile b/Jamfile index 313bda65e..972a0e462 100644 --- a/Jamfile +++ b/Jamfile @@ -195,7 +195,7 @@ rule RefDoc actions RefDoc { - 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 + python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.4.10 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h } RefDoc refdoc ; diff --git a/README b/README index 84b1c44cc..0cbca455e 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - FreeType 2.4.9 - ============== + FreeType 2.4.10 + =============== Please read the docs/CHANGES file, it contains IMPORTANT INFORMATION. @@ -19,9 +19,9 @@ and download one of the following files. - freetype-doc-2.4.9.tar.bz2 - freetype-doc-2.4.9.tar.gz - ftdoc249.zip + freetype-doc-2.4.10.tar.bz2 + freetype-doc-2.4.10.tar.gz + ftdoc2410.zip Bugs diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 5a419d074..666c243b9 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update docs/VERSION.DLL! -version_info='14:1:8' +version_info='15:0:9' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/builds/win32/vc2005/freetype.vcproj b/builds/win32/vc2005/freetype.vcproj index 6f17352f6..5ab0f3d37 100644 --- a/builds/win32/vc2005/freetype.vcproj +++ b/builds/win32/vc2005/freetype.vcproj @@ -16,7 +16,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -101,7 +101,7 @@ - + diff --git a/builds/win32/vc2005/index.html b/builds/win32/vc2005/index.html index bc4291ce5..1e656e230 100644 --- a/builds/win32/vc2005/index.html +++ b/builds/win32/vc2005/index.html @@ -11,14 +11,14 @@

This directory contains project files for Visual C++, named freetype.vcproj, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.4.9 sources:

+compiles the following libraries from the FreeType 2.4.10 sources:

    -    freetype249.lib     - release build; single threaded
-    freetype249_D.lib   - debug build;   single threaded
-    freetype249MT.lib   - release build; multi-threaded
-    freetype249MT_D.lib - debug build;   multi-threaded
    + freetype2410.lib - release build; single threaded + freetype2410_D.lib - debug build; single threaded + freetype2410MT.lib - release build; multi-threaded + freetype2410MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/vc2008/freetype.vcproj b/builds/win32/vc2008/freetype.vcproj index 897c5e52f..f3e8e1764 100644 --- a/builds/win32/vc2008/freetype.vcproj +++ b/builds/win32/vc2008/freetype.vcproj @@ -70,7 +70,7 @@ /> This directory contains project files for Visual C++, named freetype.vcproj, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.4.9 sources:

+compiles the following libraries from the FreeType 2.4.10 sources:

    -    freetype249.lib     - release build; single threaded
-    freetype249_D.lib   - debug build;   single threaded
-    freetype249MT.lib   - release build; multi-threaded
-    freetype249MT_D.lib - debug build;   multi-threaded
    + freetype2410.lib - release build; single threaded + freetype2410_D.lib - debug build; single threaded + freetype2410MT.lib - release build; multi-threaded + freetype2410MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/vc2010/freetype.vcxproj b/builds/win32/vc2010/freetype.vcxproj index e88c45f22..9231a13b7 100644 --- a/builds/win32/vc2010/freetype.vcxproj +++ b/builds/win32/vc2010/freetype.vcxproj @@ -95,12 +95,12 @@ AllRules.ruleset - freetype249_D - freetype249MT_D - freetype249ST_D - freetype249 - freetype249MT - freetype249ST + freetype2410_D + freetype2410MT_D + freetype2410ST_D + freetype2410 + freetype2410MT + freetype2410ST diff --git a/builds/win32/vc2010/index.html b/builds/win32/vc2010/index.html index 1d492fbe0..cde95d1a9 100644 --- a/builds/win32/vc2010/index.html +++ b/builds/win32/vc2010/index.html @@ -11,14 +11,14 @@

This directory contains a project file for Visual C++, named freetype.vcxproj, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.4.9 sources:

+compiles the following libraries from the FreeType 2.4.10 sources:

    -    freetype249.lib     - release build; single threaded
-    freetype249_D.lib   - debug build;   single threaded
-    freetype249MT.lib   - release build; multi-threaded
-    freetype249MT_D.lib - debug build;   multi-threaded
    + freetype2410.lib - release build; single threaded + freetype2410_D.lib - debug build; single threaded + freetype2410MT.lib - release build; multi-threaded + freetype2410MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/visualc/freetype.dsp b/builds/win32/visualc/freetype.dsp index 274a7634b..ecc54c43a 100644 --- a/builds/win32/visualc/freetype.dsp +++ b/builds/win32/visualc/freetype.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2410.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug" @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2410_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype249_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype2410_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2410MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype249.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype2410.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2410MT.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded" @@ -151,8 +151,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype249.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype249ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2410.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype2410ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,8 +177,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype249_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2410_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2410ST_D.lib" !ENDIF diff --git a/builds/win32/visualc/freetype.vcproj b/builds/win32/visualc/freetype.vcproj index f0638daf2..0e1862afe 100644 --- a/builds/win32/visualc/freetype.vcproj +++ b/builds/win32/visualc/freetype.vcproj @@ -69,7 +69,7 @@ /> This directory contains project files for Visual C++, named freetype.dsp, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.4.9 sources:

+compiles the following libraries from the FreeType 2.4.10 sources:

    -    freetype249.lib     - release build; single threaded
-    freetype249_D.lib   - debug build;   single threaded
-    freetype249MT.lib   - release build; multi-threaded
-    freetype249MT_D.lib - debug build;   multi-threaded
    + freetype2410.lib - release build; single threaded + freetype2410_D.lib - debug build; single threaded + freetype2410MT.lib - release build; multi-threaded + freetype2410MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/win32/visualce/freetype.dsp b/builds/win32/visualce/freetype.dsp index 274a7634b..ecc54c43a 100644 --- a/builds/win32/visualce/freetype.dsp +++ b/builds/win32/visualce/freetype.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2410.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug" @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2410_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype249_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype2410_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2410MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype249.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype2410.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2410MT.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded" @@ -151,8 +151,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype249.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype249ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2410.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype2410ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,8 +177,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype249_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype249ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2410_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2410ST_D.lib" !ENDIF diff --git a/builds/win32/visualce/freetype.vcproj b/builds/win32/visualce/freetype.vcproj index 89a416a9d..1b68de720 100644 --- a/builds/win32/visualce/freetype.vcproj +++ b/builds/win32/visualce/freetype.vcproj @@ -87,7 +87,7 @@ /> PPC/SP WM6 (Windows Mobile 6) -It compiles the following libraries from the FreeType 2.4.9 sources:

+It compiles the following libraries from the FreeType 2.4.10 sources:

    -    freetype249.lib     - release build; single threaded
-    freetype249_D.lib   - debug build;   single threaded
-    freetype249MT.lib   - release build; multi-threaded
-    freetype249MT_D.lib - debug build;   multi-threaded
    + freetype2410.lib - release build; single threaded + freetype2410_D.lib - debug build; single threaded + freetype2410MT.lib - release build; multi-threaded + freetype2410MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/wince/vc2005-ce/freetype.vcproj b/builds/wince/vc2005-ce/freetype.vcproj index fa0e986db..0cc1db5f8 100644 --- a/builds/wince/vc2005-ce/freetype.vcproj +++ b/builds/wince/vc2005-ce/freetype.vcproj @@ -21,7 +21,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -221,7 +221,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -281,7 +281,7 @@ - + @@ -301,7 +301,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -341,7 +341,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -401,7 +401,7 @@ - + @@ -421,7 +421,7 @@ - + @@ -441,7 +441,7 @@ - + @@ -461,7 +461,7 @@ - + @@ -481,7 +481,7 @@ - + @@ -501,7 +501,7 @@ - + @@ -521,7 +521,7 @@ - + @@ -541,7 +541,7 @@ - + @@ -561,7 +561,7 @@ - + @@ -581,7 +581,7 @@ - + @@ -601,7 +601,7 @@ - + @@ -621,7 +621,7 @@ - + @@ -641,7 +641,7 @@ - + @@ -661,7 +661,7 @@ - + @@ -681,7 +681,7 @@ - + @@ -701,7 +701,7 @@ - + @@ -721,7 +721,7 @@ - + @@ -741,7 +741,7 @@ - + @@ -758,7 +758,7 @@ - + diff --git a/builds/wince/vc2005-ce/index.html b/builds/wince/vc2005-ce/index.html index cffa8cbdd..a35f9b0bb 100644 --- a/builds/wince/vc2005-ce/index.html +++ b/builds/wince/vc2005-ce/index.html @@ -21,14 +21,14 @@ the following targets:

  • PPC/SP WM6 (Windows Mobile 6)
    • -It compiles the following libraries from the FreeType 2.4.9 sources:

    +It compiles the following libraries from the FreeType 2.4.10 sources:

      -    freetype249.lib     - release build; single threaded
-    freetype249_D.lib   - debug build;   single threaded
-    freetype249MT.lib   - release build; multi-threaded
-    freetype249MT_D.lib - debug build;   multi-threaded
      + freetype2410.lib - release build; single threaded + freetype2410_D.lib - debug build; single threaded + freetype2410MT.lib - release build; multi-threaded + freetype2410MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/wince/vc2008-ce/freetype.vcproj b/builds/wince/vc2008-ce/freetype.vcproj index 1f052c105..c42dc9967 100644 --- a/builds/wince/vc2008-ce/freetype.vcproj +++ b/builds/wince/vc2008-ce/freetype.vcproj @@ -88,7 +88,7 @@ /> PPC/SP WM6 (Windows Mobile 6) -It compiles the following libraries from the FreeType 2.4.9 sources:

    +It compiles the following libraries from the FreeType 2.4.10 sources:

      -    freetype249.lib     - release build; single threaded
-    freetype249_D.lib   - debug build;   single threaded
-    freetype249MT.lib   - release build; multi-threaded
-    freetype249MT_D.lib - debug build;   multi-threaded
      + freetype2410.lib - release build; single threaded + freetype2410_D.lib - debug build; single threaded + freetype2410MT.lib - release build; multi-threaded + freetype2410MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL index 1dfc8c187..1fb0724ec 100644 --- a/docs/VERSION.DLL +++ b/docs/VERSION.DLL @@ -53,6 +53,7 @@ systems, but not all of them: release libtool so ------------------------------- + 2.4.10 15.0.9 6.9.0 2.4.9 14.1.8 6.8.1 2.4.8 14.0.8 6.8.0 2.4.7 13.2.7 6.7.2 diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index bc7e8aaaa..d6cebbc4b 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -3852,7 +3852,7 @@ FT_BEGIN_HEADER */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 4 -#define FREETYPE_PATCH 9 +#define FREETYPE_PATCH 10 /*************************************************************************/