diff --git a/CMakeLists.txt b/CMakeLists.txt index 4bb56823b..28dc3b3f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,8 +134,8 @@ endif () project(freetype C) set(VERSION_MAJOR "2") -set(VERSION_MINOR "9") -set(VERSION_PATCH "1") +set(VERSION_MINOR "10") +set(VERSION_PATCH "0") # SOVERSION scheme: CURRENT.AGE.REVISION # If there was an incompatible interface change: diff --git a/ChangeLog b/ChangeLog index 5172696fd..670e84805 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,44 @@ +2019-03-15 Werner Lemberg + + * Version 2.10.0 released. + ========================== + + + Tag sources with `VER-2-10-0'. + + * docs/VERSION.TXT: Add entry for version 2.10.0. + * docs/CHANGES: Updated. + + * README, Jamfile (RefDoc), src/base/ftver.rc, + builds/windows/vc2010/freetype.vcxproj, + builds/windows/vc2010/index.html, + builds/windows/visualc/freetype.dsp, + builds/windows/visualc/freetype.vcproj, + builds/windows/visualc/index.html, + builds/windows/visualce/freetype.dsp, + builds/windows/visualce/freetype.vcproj, + builds/windows/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.9.1/2.10.0/, s/291/2100/. + + * include/freetype/freetype.h (FREETYPE_MINOR): Set to 10. + (FREETYPE_PATCH): Set to 0. + + * builds/unix/configure.raw (version_info): Set to 23:0:17. + * CMakeLists.txt (VERSION_MINOR): Set to 10. + (VERSION_PATCH): Set to 0. + + * builds/toplevel.mk (version, winversion): Since the minor version + number has two digits now, never omit the patch number. We would + get ambiguous zip file names otherwise. + (dist): Remove remnants of `docmaker' tool. + (do-dist): Remove unused intermediate files. + + * src/cff/cffparse.c (destrict_c2s_item): Guard function with + CFF_CONFIG_OPTION_OLD_ENGINE macro. + 2019-03-07 Andrei Alexeyev <0x416b617269@gmail.com> Werner Lemberg diff --git a/Jamfile b/Jamfile index 4d43e27da..7e3c98226 100644 --- a/Jamfile +++ b/Jamfile @@ -210,7 +210,7 @@ actions RefDoc { python -m docwriter --prefix=ft2 - --title=FreeType-2.9.1 + --title=FreeType-2.10.0 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h diff --git a/README b/README index 4a5ce1b0b..3391a573f 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ - FreeType 2.9.1 - ============== + FreeType 2.10.0 + =============== Homepage: https://www.freetype.org @@ -15,8 +15,8 @@ Read the files `docs/INSTALL*' for installation instructions; see the file `docs/LICENSE.TXT' for the available licenses. - The FreeType 2 API reference is located in `docs/reference'; use the - file `ft2-toc.html' as the top entry point. Additional + The FreeType 2 API reference is located in `docs/reference/site'; + use the file `index.html' as the top entry point. Additional documentation is available as a separate package from our sites. Go to @@ -24,9 +24,9 @@ and download one of the following files. - freetype-doc-2.9.1.tar.bz2 - freetype-doc-2.9.1.tar.gz - ftdoc291.zip + freetype-doc-2.10.0.tar.bz2 + freetype-doc-2.10.0.tar.gz + ftdoc2100.zip To view the documentation online, go to diff --git a/builds/toplevel.mk b/builds/toplevel.mk index f9a5b5bf8..24fa7fad2 100644 --- a/builds/toplevel.mk +++ b/builds/toplevel.mk @@ -191,13 +191,13 @@ work := $(word 2,$(work)) patch := $(subst |,$(space),$(work)) patch := $(firstword $(patch)) -ifneq ($(findstring x0x,x$(patch)x),) - version := $(major).$(minor) - winversion := $(major)$(minor) -else +# ifneq ($(findstring x0x,x$(patch)x),) +# version := $(major).$(minor) +# winversion := $(major)$(minor) +# else version := $(major).$(minor).$(patch) winversion := $(major)$(minor)$(patch) -endif +# endif # This target builds the tarballs. @@ -226,17 +226,10 @@ dist: ln -s $$currdir/$$f tmp/$$f ; \ done - @# Prevent generation of .pyc files. Python follows (soft) links if - @# the link's directory is write protected, so we have temporarily - @# disable write access here too. - chmod -w src/tools/docmaker - cd tmp ; \ $(MAKE) devel ; \ $(MAKE) do-dist - chmod +w src/tools/docmaker - mv tmp freetype-$(version) tar -H ustar -chf - freetype-$(version) \ @@ -274,4 +267,8 @@ do-dist: distclean refdoc cp $(CONFIG_GUESS) builds/unix cp $(CONFIG_SUB) builds/unix + @# Remove intermediate files created by the `refdoc' target. + rm -rf docs/reference/markdown + rm -f docs/reference/mkdocs.yml + # EOF diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index cb1f804d3..acefa119a 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/VERSIONS.TXT'! -version_info='22:1:16' +version_info='23:0:17' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/builds/wince/vc2005-ce/freetype.vcproj b/builds/wince/vc2005-ce/freetype.vcproj index 1ca45a80f..c91837153 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 65e094fe1..76f56cf46 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.9.1 sources:

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

      -    freetype291.lib     - release build; single threaded
-    freetype291_D.lib   - debug build;   single threaded
-    freetype291MT.lib   - release build; multi-threaded
-    freetype291MT_D.lib - debug build;   multi-threaded
      + freetype2100.lib - release build; single threaded + freetype2100_D.lib - debug build; single threaded + freetype2100MT.lib - release build; multi-threaded + freetype2100MT_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 7a5445e9c..a0ec3185f 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.9.1 sources:

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

      -    freetype291.lib     - release build; single threaded
-    freetype291_D.lib   - debug build;   single threaded
-    freetype291MT.lib   - release build; multi-threaded
-    freetype291MT_D.lib - debug build;   multi-threaded
      + freetype2100.lib - release build; single threaded + freetype2100_D.lib - debug build; single threaded + freetype2100MT.lib - release build; multi-threaded + freetype2100MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/builds/windows/vc2010/index.html b/builds/windows/vc2010/index.html index bb6d9b62d..0fe294d6e 100644 --- a/builds/windows/vc2010/index.html +++ b/builds/windows/vc2010/index.html @@ -12,7 +12,7 @@

    This directory contains solution and project files for Visual C++ 2010 or newer, named freetype.sln, and freetype.vcxproj. It compiles the following libraries -from the FreeType 2.9.1 sources:

    +from the FreeType 2.10.0 sources:

    • freetype.dll using 'Release' or 'Debug' configurations
      • diff --git a/builds/windows/visualc/index.html b/builds/windows/visualc/index.html index 2eefbdced..52ba9cd04 100644 --- a/builds/windows/visualc/index.html +++ b/builds/windows/visualc/index.html @@ -12,7 +12,7 @@

      This directory contains project files freetype.dsp for Visual C++ 6.0, and freetype.vcproj for Visual C++ 2002 through 2008, which you might need to upgrade automatically. -It compiles the following libraries from the FreeType 2.9.1 sources:

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

      • freetype.dll using 'Release' or 'Debug' configurations
        • diff --git a/builds/windows/visualce/freetype.dsp b/builds/windows/visualce/freetype.dsp index 5fe2b5a97..2ac17d6b5 100644 --- a/builds/windows/visualce/freetype.dsp +++ b/builds/windows/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\freetype291.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2100.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\freetype291_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2100_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\freetype291_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype2100_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2100MT_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\freetype291.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype2100.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2100MT.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\freetype291.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype291ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2100.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype2100ST.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\freetype291_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype291ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype2100_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype2100ST_D.lib" !ENDIF diff --git a/builds/windows/visualce/freetype.vcproj b/builds/windows/visualce/freetype.vcproj index b79731175..d1ae64b16 100644 --- a/builds/windows/visualce/freetype.vcproj +++ b/builds/windows/visualce/freetype.vcproj @@ -87,7 +87,7 @@ /> PPC/SP WM6 (Windows Mobile 6)
      -It compiles the following libraries from the FreeType 2.9.1 sources:

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

        -    freetype291.lib     - release build; single threaded
-    freetype291_D.lib   - debug build;   single threaded
-    freetype291MT.lib   - release build; multi-threaded
-    freetype291MT_D.lib - debug build;   multi-threaded
        + freetype2100.lib - release build; single threaded + freetype2100_D.lib - debug build; single threaded + freetype2100MT.lib - release build; multi-threaded + freetype2100MT_D.lib - debug build; multi-threaded

      Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/docs/VERSIONS.TXT b/docs/VERSIONS.TXT index 819737662..e8154bc51 100644 --- a/docs/VERSIONS.TXT +++ b/docs/VERSIONS.TXT @@ -52,6 +52,7 @@ on _most_ systems, but not all of them: release libtool so ------------------------------- + 2.10.0 23.0.17 6.17.0 2.9.1 22.1.16 6.16.1 2.9.0 22.0.16 6.16.0 2.8.1 21.0.15 6.15.0 diff --git a/docs/freetype-config.1 b/docs/freetype-config.1 index 164b8ffa0..98d1ca115 100644 --- a/docs/freetype-config.1 +++ b/docs/freetype-config.1 @@ -1,4 +1,4 @@ -.TH FREETYPE-CONFIG 1 "May 2018" "FreeType 2.9.1" +.TH FREETYPE-CONFIG 1 "March 2019" "FreeType 2.10.0" . . .SH NAME diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 03d0e6b23..4f2eaca69 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -4773,8 +4773,8 @@ FT_BEGIN_HEADER * */ #define FREETYPE_MAJOR 2 -#define FREETYPE_MINOR 9 -#define FREETYPE_PATCH 1 +#define FREETYPE_MINOR 10 +#define FREETYPE_PATCH 0 /************************************************************************** diff --git a/src/base/ftver.rc b/src/base/ftver.rc index 8b0c4f9e7..e02a88652 100644 --- a/src/base/ftver.rc +++ b/src/base/ftver.rc @@ -18,8 +18,8 @@ #include -#define FT_VERSION 2,9,1,0 -#define FT_VERSION_STR "2.9.1" +#define FT_VERSION 2,10,0,0 +#define FT_VERSION_STR "2.10.0" VS_VERSION_INFO VERSIONINFO FILEVERSION FT_VERSION diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c index 337316a01..fa806f1a9 100644 --- a/src/cff/cffparse.c +++ b/src/cff/cffparse.c @@ -1122,6 +1122,7 @@ #endif /* FT_DEBUG_LEVEL_TRACE */ +#ifdef CFF_CONFIG_OPTION_OLD_ENGINE static void destruct_t2s_item( FT_Memory memory, void* data, @@ -1130,6 +1131,7 @@ FT_UNUSED( user ); memory->free( memory, data ); } +#endif /* CFF_CONFIG_OPTION_OLD_ENGINE */ FT_LOCAL_DEF( FT_Error )