From be54a68c9dfd89a2d5c88b1639821211e922e539 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 29 Jun 2008 07:43:41 +0000 Subject: [PATCH] * Version 2.3.7 released. ========================= Tag sources with `VER-2-3-7'. * docs/CHANGES, docs/VERSION.DLL: Update documentation and bump version number to 2.3.7. * README, Jamfile (RefDoc), builds/win32/visualc/index.html, builds/win32/visualc/freetype.dsp, builds/win32/visualc/freetype.vcproj, builds/win32/visualce/index.html, builds/win32/visualce/freetype.dsp, builds/win32/visualce/freetype.vcproj: s/2.3.6/2.3.7/, s/236/237/. * include/freetype/freetype.h (FREETYPE_PATCH): Set to 7. * builds/unix/configure.raw (version_info): Set to 9:18:3. * docs/release: Updated. --- ChangeLog | 31 +++++++++- Jamfile | 2 +- README | 8 +-- builds/unix/configure.raw | 4 +- 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 ++-- docs/CHANGES | 2 +- docs/VERSION.DLL | 1 + docs/release | 16 ++--- include/freetype/freetype.h | 2 +- 14 files changed, 124 insertions(+), 98 deletions(-) diff --git a/ChangeLog b/ChangeLog index de26dd699..b507fa84a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,30 @@ +2008-06-29 Werner Lemberg + + * Version 2.3.7 released. + ========================= + + + Tag sources with `VER-2-3-7'. + + * docs/CHANGES, docs/VERSION.DLL: Update documentation and bump + version number to 2.3.7. + + * README, Jamfile (RefDoc), builds/win32/visualc/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualce/index.html, + builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj: s/2.3.6/2.3.7/, s/236/237/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 7. + + * builds/unix/configure.raw (version_info): Set to 9:18:3. + + * docs/release: Updated. + 2008-06-28 Werner Lemberg - * src/ftlyph.c (FT_Matrix_Multiply, FT_Matrix_Invert): Move to... + * src/ftglyph.c (FT_Matrix_Multiply, FT_Matrix_Invert): Move to... * src/ftcalc.c: Here. This fixes Savannah bug #23729. 2008-06-27 Werner Lemberg @@ -99,7 +123,7 @@ * src/cff/cffobjs.c (cff_face_init): Compute final `dict->units_per_em' value before assigning it to - `cffface->units_per_EM'. Otherwise, CFFs without subfonts are be + `cffface->units_per_EM'. Otherwise, CFFs without subfonts are scaled incorrectly if the font matrix is non-standard. This fixes Savannah bug #23630. @@ -107,7 +131,8 @@ 2008-06-19 Werner Lemberg - * src/type/t1objs.c (T1_Face_Init): Slightly improve algorithm. + * src/type/t1objs.c (T1_Face_Init): Slightly improve algorithm fix + from 2008-06-19. 2008-06-18 Werner Lemberg diff --git a/Jamfile b/Jamfile index eeaad3f36..a345d242e 100644 --- a/Jamfile +++ b/Jamfile @@ -194,7 +194,7 @@ rule RefDoc actions RefDoc { - python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.3.6 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h + python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.3.7 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h } RefDoc refdoc ; diff --git a/README b/README index a6ab092c4..5071f88b3 100644 --- a/README +++ b/README @@ -9,7 +9,7 @@ is called `libttf'. They are *not* compatible! - FreeType 2.3.6 + FreeType 2.3.7 ============== Please read the docs/CHANGES file, it contains IMPORTANT @@ -26,9 +26,9 @@ and download one of the following files. - freetype-doc-2.3.6.tar.bz2 - freetype-doc-2.3.6.tar.gz - ftdoc236.zip + freetype-doc-2.3.7.tar.bz2 + freetype-doc-2.3.7.tar.gz + ftdoc237.zip Bugs diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index de65fed1c..0d67d3f3e 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='9:17:3' +version_info='9:18:3' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) @@ -171,7 +171,7 @@ if test x$with_zlib != xno && test -n "$LIBZ"; then fi -# check Apple "-isysroot" option and duplicate it to LDFLAGS if required -- +# check Apple's `-isysroot' option and duplicate it to LDFLAGS if required -- # Apple TechNote 2137 recommends to include it in CFLAGS but not in LDFLAGS AC_MSG_CHECKING([whether CFLAGS includes -isysroot option]) diff --git a/builds/win32/visualc/freetype.dsp b/builds/win32/visualc/freetype.dsp index c8b76e8f5..caa331431 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\freetype236.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237.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\freetype236_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237_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\freetype236_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype237_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237MT_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\freetype236.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype237.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237MT.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\freetype236.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype236ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype237.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype237ST.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\freetype236_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype237_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237ST_D.lib" !ENDIF diff --git a/builds/win32/visualc/freetype.vcproj b/builds/win32/visualc/freetype.vcproj index 808911066..036ccbf4e 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.3.6 sources:

+compiles the following libraries from the FreeType 2.3.7 sources:

    -    freetype236.lib     - release build; single threaded
-    freetype236_D.lib   - debug build;   single threaded
-    freetype236MT.lib   - release build; multi-threaded
-    freetype236MT_D.lib - debug build;   multi-threaded
    + freetype237.lib - release build; single threaded + freetype237_D.lib - debug build; single threaded + freetype237MT.lib - release build; multi-threaded + freetype237MT_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 c8b76e8f5..caa331431 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\freetype236.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237.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\freetype236_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237_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\freetype236_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype237_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237MT_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\freetype236.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype237.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237MT.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\freetype236.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype236ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype237.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype237ST.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\freetype236_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype236ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype237_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype237ST_D.lib" !ENDIF diff --git a/builds/win32/visualce/freetype.vcproj b/builds/win32/visualce/freetype.vcproj index 109542feb..bb3445fed 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.3.6 sources:

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

    -    freetype236.lib     - release build; single threaded
-    freetype236_D.lib   - debug build;   single threaded
-    freetype236MT.lib   - release build; multi-threaded
-    freetype236MT_D.lib - debug build;   multi-threaded
    + freetype237.lib - release build; single threaded + freetype237_D.lib - debug build; single threaded + freetype237MT.lib - release build; multi-threaded + freetype237MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/docs/CHANGES b/docs/CHANGES index ef4176d1a..cb662c706 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -31,7 +31,7 @@ CHANGES BETWEEN 2.3.7 and 2.3.6 - The TrueType bytecode interpreter now passes the dropout mode to the B&W rasterizer. This greatly increases the output for small - ppem values for many fonts like `pala.ttf'. + ppem values of many fonts like `pala.ttf'. ====================================================================== diff --git a/docs/VERSION.DLL b/docs/VERSION.DLL index 527543147..ec9ff21c7 100644 --- a/docs/VERSION.DLL +++ b/docs/VERSION.DLL @@ -53,6 +53,7 @@ systems, but not all of them: release libtool so ------------------------------- + 2.3.7 9.18.3 6.3.18 2.3.6 9.17.3 6.3.17 2.3.5 9.16.3 6.3.16 2.3.4 9.15.3 6.3.15 diff --git a/docs/release b/docs/release index d68da883c..e93f430df 100644 --- a/docs/release +++ b/docs/release @@ -49,15 +49,16 @@ How to prepare a new release except the `reference' subdirectory. Do *not* use option `-l' from zip! - Run the following script (with updated `$VERSION' and - `$SAVANNAH_USER' variables) to sign and upload the bundles to both - Savannah and SourceForge. The signing code has been taken from the - `gnupload' script (part of the automake bundle). +. Run the following script (with updated `$VERSION', `$SAVANNAH_USER', + and $SOURCEFORGE_USER variables) to sign and upload the bundles to + both Savannah and SourceForge. The signing code has been taken from + the `gnupload' script (part of the automake bundle). #!/bin/sh - VERSION=2.3.1 + VERSION=2.3.7 SAVANNAH_USER=wl + SOURCEFORGE_USER=wlemb ##################################################################### @@ -114,9 +115,8 @@ How to prepare a new release scp $PACKAGE_LIST $SIGNATURE_LIST \ $SAVANNAH_USER@dl.sv.nongnu.org:/releases/freetype/ - for f in $PACKAGE_LIST $SIGNATURE_LIST; do - ncftpput upload.sf.net /incoming $f - done + rsync -avP -e ssh $PACKAGE_LIST $SIGNATURE_LIST \ + $SOURCEFORGE_USER@frs.sf.net:uploads/ # EOF diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 0c65b9f55..68dd3ff39 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -3611,7 +3611,7 @@ FT_BEGIN_HEADER */ #define FREETYPE_MAJOR 2 #define FREETYPE_MINOR 3 -#define FREETYPE_PATCH 6 +#define FREETYPE_PATCH 7 /*************************************************************************/