From 53935939df4ce8eeada4139ec9062be7e8df7248 Mon Sep 17 00:00:00 2001
From: Werner Lemberg
Date: Wed, 31 Jan 2007 08:53:02 +0000
Subject: [PATCH] * Version 2.3.1 released. =========================
Tag sources with `VER-2-3-1-FINAL'.
* builds/win32/visualc/freetype.dsp,
builds/win32/visualc/freetype.vcproj: s/230/231/.
* builds/win32/visualc/index.html: s/221/231/.
* vms_make.com: Add `ftgasp'.
---
ChangeLog | 38 +++++++++++++++++++-----
ChangeLog.22 | 44 ++++++++++++++--------------
README | 2 +-
builds/win32/visualc/freetype.dsp | 20 ++++++-------
builds/win32/visualc/freetype.vcproj | 12 ++++----
builds/win32/visualc/index.html | 10 +++----
docs/CHANGES | 2 +-
docs/release | 2 +-
modules.cfg | 3 +-
vms_make.com | 4 +--
10 files changed, 79 insertions(+), 58 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 02fb9fe07..505625149 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,37 @@
+2007-01-31 Werner Lemberg
+
+
+ * Version 2.3.1 released.
+ =========================
+
+
+ Tag sources with `VER-2-3-1-FINAL'.
+
+ * builds/win32/visualc/freetype.dsp,
+ builds/win32/visualc/freetype.vcproj: s/230/231/.
+ * builds/win32/visualc/index.html: s/221/231/.
+
+ * vms_make.com: Add `ftgasp'.
+
2007-01-30 David Turner
- * all-sources: tagging with VER-2-3-1 to prepare release
+ Tag sources with VER-2-3-1 to prepare release.
- * docs/CHANGES, docs/VERSION.DLL, include/freetype/freetype.h,
- docs/release, README, builds/unix/configure.raw, Jamfile: updating
- version numbers to 2.3.1
+ * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1.
- * src/autofit/aftypes.h, src/autofit/afloader.c: disabling the
- warper (i.e. light hinting improvements) to make a 2.3.1 bugfix
- release before introducing a new feature. This should give us
- more time to tune and improve the warper for the next release
+ * docs/VERSION.DLL docs/release, README, Jamfile (RefDoc):
+ s/2.3.0/2.3.1/.
+
+ * builds/unix/configure.raw (version_info): Set to 9:12:3.
+
+
+ * src/autofit/aftypes.h (AF_USE_WARPER), src/autofit/afloader.c
+ (af_loader_load_g): Disable the warper (i.e., the light hinting
+ improvements) to make a 2.3.1 bugfix release before introducing a
+ new feature. This should give us more time to tune and improve the
+ warper for the next release.
+
+ * docs/CHANGES: Update accordingly.
2007-01-25 David Turner
diff --git a/ChangeLog.22 b/ChangeLog.22
index 549580fb4..8d3da4dab 100644
--- a/ChangeLog.22
+++ b/ChangeLog.22
@@ -2335,7 +2335,7 @@
Fixes for `make multi' and using C++ compiler.
- * gxvalid/gxvcommn.c (gxv_set_length_by_ushort_offset,
+ * src/gxvalid/gxvcommn.c (gxv_set_length_by_ushort_offset,
gxv_set_length_by_ulong_offset, gxv_array_getlimits_byte,
gxv_array_getlimits_ushort): Declare with FT_LOCAL_DEF.
(gxv_compare_ranges): Make it static.
@@ -2348,7 +2348,7 @@
GXV_XSTATETABLE_HEADER_SIZE, GXV_XSTATEHEADER_SIZE): Move to
gxvcommn.h.
- * gxvalid/gxvcommn.h: Add prototypes for
+ * src/gxvalid/gxvcommn.h: Add prototypes for
gxv_StateTable_subtable_setup, gxv_XStateTable_subtable_setup,
gxv_XStateTable_validate, gxv_array_getlimits_byte,
gxv_array_getlimits_ushort, gxv_set_length_by_ushort_offset,
@@ -2361,13 +2361,13 @@
* src/gxvalid/gxvbsln.c (gxv_bsln_LookupValue_validate,
gxv_bsln_parts_fmt1_validate): Improve trace messages.
- * gxvalid/gxvfeat.c: Split off predefined registry stuff to...
- * gxvalid/gxvfeat.h: New file.
+ * src/gxvalid/gxvfeat.c: Split off predefined registry stuff to...
+ * src/gxvalid/gxvfeat.h: New file.
- * gxvalid/gxvjust.c (gxv_just_wdc_entry_validate): Improve trace
+ * src/gxvalid/gxvjust.c (gxv_just_wdc_entry_validate): Improve trace
message.
- * gxvalid/gxvkern.c (GXV_kern_Dialect): Add KERN_DIALECT_UNKNOWN.
+ * src/gxvalid/gxvkern.c (GXV_kern_Dialect): Add KERN_DIALECT_UNKNOWN.
(gxv_kern_subtable_fmt1_valueTable_load,
gxv_kern_subtable_fmt1_subtable_setup,
gxv_kern_subtable_fmt1_entry_validate): Fix C++ compiler errors.
@@ -2377,43 +2377,43 @@
Improve trace message.
(gxv_kern_validate_classic): Fix C++ compiler error.
- * gxvalid/gxvmort0.c (gxv_mort_subtable_type0_validate): Declare
+ * src/gxvalid/gxvmort0.c (gxv_mort_subtable_type0_validate): Declare
with FT_LOCAL_DEF.
- * gxvalid/gxvmort1.c
+ * src/gxvalid/gxvmort1.c
(gxv_mort_subtable_type1_substitutionTable_load,
gxv_mort_subtable_type1_subtable_setup): Fix C++ compiler errors.
(gxv_mort_subtable_type1_substTable_validate): Improve trace
message.
(gxv_mort_subtable_type1_validate): Declare with FT_LOCAL_DEF.
- * gxvalid/gxvmort2.c (gxv_mort_subtable_type2_opttable_load,
+ * src/gxvalid/gxvmort2.c (gxv_mort_subtable_type2_opttable_load,
gxv_mort_subtable_type2_subtable_setup,
gxv_mort_subtable_type2_ligActionOffset_validate,
gxv_mort_subtable_type2_ligatureTable_validate): Fix C++ compiler
errors.
(gxv_mort_subtable_type2_validate): Declare with FT_LOCAL_DEF.
- * gxvalid/gxvmort4.c (gxv_mort_subtable_type4_validate): Declare
+ * src/gxvalid/gxvmort4.c (gxv_mort_subtable_type4_validate): Declare
with FT_LOCAL_DEF.
- * gxvalid/gxvmort5.c (gxv_mort_subtable_type5_subtable_setup,
+ * src/gxvalid/gxvmort5.c (gxv_mort_subtable_type5_subtable_setup,
gxv_mort_subtable_type5_InsertList_validate): Fix C++ compiler
errors.
(gxv_mort_subtable_type5_validate): Declare with FT_LOCAL_DEF.
- * gxvalid/gxvmort.c: Include gxvfeat.h.
+ * src/gxvalid/gxvmort.c: Include gxvfeat.h.
(gxv_mort_featurearray_validate, gxv_mort_coverage_validate):
Declare with FT_LOCAL_DEF.
(gxv_mort_subtables_validate, gxv_mort_validate): Improve trace
messages.
- * gxvalid/gxvmort.h (gxv_mort_feature_validate): Remove.
+ * src/gxvalid/gxvmort.h (gxv_mort_feature_validate): Remove.
- * gxvalid/gxvmorx0.c (gxv_morx_subtable_type0_validate): Declare
+ * src/gxvalid/gxvmorx0.c (gxv_morx_subtable_type0_validate): Declare
with FT_LOCAL_DEF.
- * gxvalid/gxvmorx1.c
+ * src/gxvalid/gxvmorx1.c
(gxv_morx_subtable_type1_substitutionTable_load,
gxv_morx_subtable_type1_subtable_setup,
gxv_morx_subtable_type1_entry_validate,
@@ -2421,7 +2421,7 @@
compiler errors.
(gxv_morx_subtable_type1_validate): Declare with FT_LOCAL_DEF.
- * gxvalid/gxvmorx2.c (gxv_morx_subtable_type2_opttable_load,
+ * src/gxvalid/gxvmorx2.c (gxv_morx_subtable_type2_opttable_load,
gxv_morx_subtable_type2_subtable_setup,
gxv_morx_subtable_type2_ligActionIndex_validate,
gxv_morx_subtable_type2_ligatureTable_validate): Fix C++ compiler
@@ -2429,26 +2429,26 @@
(gxv_morx_subtable_type2_validate): Declare with FT_LOCAL_DEF.
Fix typo.
- * gxvalid/gxvmorx4.c (gxv_morx_subtable_type4_validate): Declare
+ * src/gxvalid/gxvmorx4.c (gxv_morx_subtable_type4_validate): Declare
with FT_LOCAL_DEF.
- * gxvalid/gxvmorx5.c (gxv_morx_subtable_type5_insertionGlyph_load,
+ * src/gxvalid/gxvmorx5.c (gxv_morx_subtable_type5_insertionGlyph_load,
gxv_morx_subtable_type5_subtable_setup): Fix C++ compiler error.
(gxv_morx_subtable_type5_validate): Declare with FT_LOCAL_DEF.
- * gxvalid/gxvmorx.c (gxv_morx_subtables_validate,
+ * src/gxvalid/gxvmorx.c (gxv_morx_subtables_validate,
gxv_morx_validate): Improve trace message.
- * gxvalid/gxvopbd.c (gxv_opbd_LookupFmt4_transit): Fix compiler
+ * src/gxvalid/gxvopbd.c (gxv_opbd_LookupFmt4_transit): Fix compiler
warnings.
(gxv_opbd_validate): Improve trace message.
- * gxvalid/gxvprop.c: Decorate constants with `U' and `L' where
+ * src/gxvalid/gxvprop.c: Decorate constants with `U' and `L' where
appropriate.
(gxv_prop_zero_advance_validate, gxv_prop_validate): Improve trace
message.
- * gxvalid/gxvtrak.c (gxv_trak_trackTable_validate): Remove unused
+ * src/gxvalid/gxvtrak.c (gxv_trak_trackTable_validate): Remove unused
parameter. Update all callers.
(gxv_trak_validate): Improve trace message.
diff --git a/README b/README
index 573a552f8..603651ede 100644
--- a/README
+++ b/README
@@ -28,7 +28,7 @@
freetype-doc-2.3.1.tar.bz2
freetype-doc-2.3.1.tar.gz
- ftdoc221.zip
+ ftdoc231.zip
Bugs
diff --git a/builds/win32/visualc/freetype.dsp b/builds/win32/visualc/freetype.dsp
index f2cac9333..01b7ca0f5 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\freetype230.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype231.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\freetype230_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype231_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\freetype230_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype230MT_D.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype231_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype231MT_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\freetype230.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype230MT.lib"
+# ADD BASE LIB32 /nologo /out:"lib\freetype231.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype231MT.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\freetype230.lib"
-# ADD LIB32 /out:"..\..\..\objs\freetype230ST.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype231.lib"
+# ADD LIB32 /out:"..\..\..\objs\freetype231ST.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\freetype230_D.lib"
-# ADD LIB32 /nologo /out:"..\..\..\objs\freetype230ST_D.lib"
+# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype231_D.lib"
+# ADD LIB32 /nologo /out:"..\..\..\objs\freetype231ST_D.lib"
!ENDIF
diff --git a/builds/win32/visualc/freetype.vcproj b/builds/win32/visualc/freetype.vcproj
index 9e8728421..93bc65f13 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.2.1 sources:
+compiles the following libraries from the FreeType 2.3.1 sources:
- freetype221.lib - release build; single threaded
- freetype221_D.lib - debug build; single threaded
- freetype221MT.lib - release build; multi-threaded
- freetype221MT_D.lib - debug build; multi-threaded
+ freetype231.lib - release build; single threaded
+ freetype231_D.lib - debug build; single threaded
+ freetype231MT.lib - release build; multi-threaded
+ freetype231MT_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 fc39ebfee..8ad4e6671 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -1,4 +1,4 @@
-CHANGES BETWEEN 2.3.0 and 2.3.1
+CHANGES BETWEEN 2.3.1 and 2.3.0
I. IMPORTANT BUG FIXES
diff --git a/docs/release b/docs/release
index fdf715492..36bcb4768 100644
--- a/docs/release
+++ b/docs/release
@@ -5,7 +5,7 @@ How to prepare a new release
and FREETYPE_PATCH.
. Update version numbers in all files where necessary (for example, do
- a grep for both `2.3.0' and `230' for release 2.3.0).
+ a grep for both `2.3.1' and `231' for release 2.3.1).
. builds/unix/configure.raw: Update `version_info'.
diff --git a/modules.cfg b/modules.cfg
index a05ecb19e..747a9976c 100644
--- a/modules.cfg
+++ b/modules.cfg
@@ -205,8 +205,7 @@ BASE_EXTENSIONS += fttype1.c
# See include/freetype/ftwinfnt.h for the API.
BASE_EXTENSIONS += ftwinfnt.c
-# Support functions for X11. Useful only for building the XFree86 font
-# server.
+# Support functions for X11.
#
# See include/freetype/ftxf86.h for the API.
BASE_EXTENSIONS += ftxf86.c
diff --git a/vms_make.com b/vms_make.com
index 98fc11d7f..3d4bd4f29 100644
--- a/vms_make.com
+++ b/vms_make.com
@@ -1,6 +1,6 @@
$! make Freetype2 under OpenVMS
$!
-$! Copyright 2003, 2004, 2006 by
+$! Copyright 2003, 2004, 2006, 2007 by
$! David Turner, Robert Wilhelm, and Werner Lemberg.
$!
$! This file is part of the FreeType project, and may only be used, modified,
@@ -357,7 +357,7 @@ CFLAGS=$(COMP_FLAGS)$(DEBUG)/include=([--.builds.vms],[--.include],[--.src.base]
OBJS=ftbase.obj,ftinit.obj,ftglyph.obj,ftdebug.obj,ftbdf.obj,ftmm.obj,\
fttype1.obj,ftxf86.obj,ftpfr.obj,ftstroke.obj,ftwinfnt.obj,ftbbox.obj,\
- ftbitmap.obj ftlcdfil.obj
+ ftbitmap.obj ftlcdfil.obj ftgasp.obj
all : $(OBJS)
library [--.lib]freetype.olb $(OBJS)