From e4586d960f339cf75e2e0b34aee30a0ed8353c0d Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 24 Jun 2023 05:18:54 +0200 Subject: [PATCH] * Version 2.13.1 released. ========================== Tag sources with `VER-2-13-1'. * docs/VERSION.TXT: Add entry for version 2.13.1. * docs/CHANGES: Updated. * docs/release, docs/README, builds/macs/README: Updated. * README, src/base/ftver.rc, builds/windows/vc2010/index.html, builds/windows/visualc/index.html, builds/windows/visualce/index.html, builds/wince/vc2005-ce/index.html, builds/wince/vc2008-ce/index.html, docs/freetype-config.1: s/2.13.0/2.13/1/, s/2130/2131/. * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. * builds/unix/configure.raw (version_info): Set to 26:0:20. * CMakeLists.txt (VERSION_PATCH): Set to 1. * subprojects/libpng.wrap, subprojects/zlib.wrap, subprojects/dlg: Updated. --- .gitlab-ci.yml | 2 +- CMakeLists.txt | 2 +- README | 8 +++--- builds/mac/README | 8 ------ builds/unix/configure.raw | 2 +- builds/wince/vc2005-ce/index.html | 2 +- builds/wince/vc2008-ce/index.html | 2 +- builds/windows/vc2010/index.html | 2 +- builds/windows/visualc/index.html | 2 +- builds/windows/visualce/index.html | 2 +- docs/CHANGES | 29 +++++++++++++++++++- docs/README | 2 -- docs/VERSIONS.TXT | 1 + docs/formats.txt | 2 +- docs/freetype-config.1 | 2 +- docs/release | 44 ++++++++++++++++++++++-------- include/freetype/freetype.h | 2 +- src/base/ftver.rc | 4 +-- src/cid/cidgload.c | 4 +-- src/type1/t1afm.c | 2 +- subprojects/dlg | 2 +- subprojects/libpng.wrap | 9 +++--- subprojects/zlib.wrap | 9 +++--- 23 files changed, 92 insertions(+), 52 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c51e136a9..bb078e244 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,7 +76,7 @@ variables: # Format of job names: -# +# # Windows jobs. diff --git a/CMakeLists.txt b/CMakeLists.txt index 554b580e9..d31ab175d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,7 +164,7 @@ project(freetype C) set(VERSION_MAJOR "2") set(VERSION_MINOR "13") -set(VERSION_PATCH "0") +set(VERSION_PATCH "1") # Generate LIBRARY_VERSION and LIBRARY_SOVERSION. set(LIBTOOL_REGEX "version_info='([0-9]+):([0-9]+):([0-9]+)'") diff --git a/README b/README index 327b94d8e..eb48e7e18 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -FreeType 2.13.0 +FreeType 2.13.1 =============== Homepage: https://www.freetype.org @@ -32,9 +32,9 @@ sites. Go to and download one of the following files. - freetype-doc-2.13.0.tar.xz - freetype-doc-2.13.0.tar.gz - ftdoc2130.zip + freetype-doc-2.13.1.tar.xz + freetype-doc-2.13.1.tar.gz + ftdoc2131.zip To view the documentation online, go to diff --git a/builds/mac/README b/builds/mac/README index 092487a84..06e3d51da 100644 --- a/builds/mac/README +++ b/builds/mac/README @@ -200,14 +200,6 @@ environment by Metrowerks. GCC for MPW and Symantec behaviours are not tested at all. Building ftdemos for classic MacOS and working test is required. - 4-3. Porting Jam onto MPW - ------------------------- - - FreeType uses Jam (and FT-Jam) for unified cross- - platform building tool. At present, Jam is not ported - to MPW. To update classic MacOS support easily, - building by Jam is expected on MPW. - APPENDIX I ---------- diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 8e982835e..2c152022f 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.h.in]) # Don't forget to update `docs/VERSIONS.TXT'! -version_info='25:0:19' +version_info='26:0:20' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/builds/wince/vc2005-ce/index.html b/builds/wince/vc2005-ce/index.html index 0a8b3c660..cef32c12e 100644 --- a/builds/wince/vc2005-ce/index.html +++ b/builds/wince/vc2005-ce/index.html @@ -21,7 +21,7 @@ the following targets:
  • PPC/SP WM6 (Windows Mobile 6)
  • -It compiles the following libraries from the FreeType 2.13.0 sources:

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

      diff --git a/builds/wince/vc2008-ce/index.html b/builds/wince/vc2008-ce/index.html
      index 747370aa9..1d36f6021 100644
      --- a/builds/wince/vc2008-ce/index.html
      +++ b/builds/wince/vc2008-ce/index.html
      @@ -21,7 +21,7 @@ the following targets:
         
    • PPC/SP WM6 (Windows Mobile 6)
    -It compiles the following libraries from the FreeType 2.13.0 sources:

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

      diff --git a/builds/windows/vc2010/index.html b/builds/windows/vc2010/index.html
      index c03be775e..95e27e628 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.13.0 sources:

      +from the FreeType 2.13.1 sources:

      • freetype.dll using 'Release' or 'Debug' configurations
      • diff --git a/builds/windows/visualc/index.html b/builds/windows/visualc/index.html index 6a70b34b1..de957a61a 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.13.0 sources:

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

        • freetype.dll using 'Release' or 'Debug' configurations
        • diff --git a/builds/windows/visualce/index.html b/builds/windows/visualce/index.html index cebab29a0..706924a74 100644 --- a/builds/windows/visualce/index.html +++ b/builds/windows/visualce/index.html @@ -21,7 +21,7 @@ the following targets:
        • PPC/SP WM6 (Windows Mobile 6)
        -It compiles the following libraries from the FreeType 2.13.0 sources:

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

          diff --git a/docs/CHANGES b/docs/CHANGES
          index 7562f10e7..b6ad1ce5d 100644
          --- a/docs/CHANGES
          +++ b/docs/CHANGES
          @@ -1,4 +1,4 @@
          -CHANGES BETWEEN 2.13.0 and 2.13.1 (2023-XXX-XX)
          +CHANGES BETWEEN 2.13.0 and 2.13.1 (2023-Jun-24)
           
             I. MISCELLANEOUS
           
          @@ -8,6 +8,33 @@ CHANGES BETWEEN 2.13.0 and 2.13.1 (2023-XXX-XX)
             - A new load flag `FT_LOAD_NO_SVG` to make FreeType ignore glyphs in
               an 'SVG ' table.
           
          +  - New  function  `FT_GlyphSlot_AdjustWeight`  to  adjust  the  glyph
          +    weight either  horizontally or  vertically.  This  is part  of the
          +    `ftsynth.h` header file, which is  still considered to be in alpha
          +    stage.
          +
          +  - TrueType interpreter  version 38 (also known  as 'Infinality') has
          +    been deactivated; the value  of `TT_INTERPRETER_VERSION_38` is now
          +    the same as `TT_INTERPRETER_VERSION_40`.
          +
          +  - Updated OpenVMS support.
          +
          +  - The  base  API  documentation  has  been  modularized  for  easier
          +    handling.
          +
          +  - Switching named instances on and  off in Variation Fonts was buggy
          +    if the design coordinates didn't change.
          +
          +  - `ftbench`  has a  new  command-line option  `-a`  to apply  design
          +    coordinates.
          +
          +  - `ftview` can now flip SVG rendering on and off using the 'Z' key.
          +
          +  - In  `ftmulti` it  is  now possible  to toggle  the  fill rule  and
          +    overlap flag  used for  rendering glyphs using  the 'F3'  and 'F4'
          +    keys,  respectively.   Toggling  the anti-aliased  mode  has  been
          +    changed to the 'TAB' key.
          +
           
           ======================================================================
           
          diff --git a/docs/README b/docs/README
          index d71fd379c..c2b5af865 100644
          --- a/docs/README
          +++ b/docs/README
          @@ -18,8 +18,6 @@ There are two ways to generate the documentation:
               - This may or may not require internet access every time depending on
               pip and system caching.
           
          -This also works with Jam: Just type `jam refdoc' in the main directory.
          -
           Some troubleshooting tips:
           
           * Regularly run `pip install --upgrade docwriter' to check for updates which
          diff --git a/docs/VERSIONS.TXT b/docs/VERSIONS.TXT
          index 92f6a8ccd..eb71fd051 100644
          --- a/docs/VERSIONS.TXT
          +++ b/docs/VERSIONS.TXT
          @@ -60,6 +60,7 @@ found on _most_ systems, but not all of them:
           
               release     libtool     so
             -------------------------------
          +     2.13.1     26.0.20   6.20.0
                2.13.0     25.0.19   6.19.0
                2.12.1     24.3.18   6.18.3
                2.12.0     24.2.18   6.18.2
          diff --git a/docs/formats.txt b/docs/formats.txt
          index 3d03c01bf..882d62d23 100644
          --- a/docs/formats.txt
          +++ b/docs/formats.txt
          @@ -199,7 +199,7 @@ which isn't supported yet please send a mail too.
               defined in the OpenType specification 1.6 and newer.
           
           [7] `The Type 1 GX Font Format' (dated 1995-09-27)  was distributed in
          -    Apple Developer CD-ROM in those days.  The content of `TYP1' table 
          +    Apple Developer CD-ROM in those days.  The content of `TYP1' table
               is a PostScript Type 1 font without the eexec encryption.  Current
               versions of FreeType don't not support this format,  but FontForge
               can load it.
          diff --git a/docs/freetype-config.1 b/docs/freetype-config.1
          index 64594315f..cc6f3006d 100644
          --- a/docs/freetype-config.1
          +++ b/docs/freetype-config.1
          @@ -1,4 +1,4 @@
          -.TH FREETYPE-CONFIG 1 "February 2023" "FreeType 2.13.0"
          +.TH FREETYPE-CONFIG 1 "June 2023" "FreeType 2.13.1"
           .
           .
           .SH NAME
          diff --git a/docs/release b/docs/release
          index fec91e8a7..c296efcc1 100644
          --- a/docs/release
          +++ b/docs/release
          @@ -15,33 +15,53 @@ How to prepare a new release
           
           . docs/VERSIONS.TXT: Document changed `version_info`.
           
          -. Clone the git archive to another directory with
          +. Update the 'dlg' submodule with
           
          -    git clone -l -s . ../freetype.test
          +    git submodule foreach git pull origin master
           
          -  or something like this and run
          +. Copy the submodule code with
           
          -    make distclean; make devel; make
          -    make distclean; make devel; make multi
          -    make distclean; make devel CC=g++; make CC=g++
          -    make distclean; make devel CC=g++; make multi CC=g++
          +    make copy_submodule
          +
          +  and run
          +
          +    make distclean && make devel && make
          +    make distclean && make devel && make multi
          +    make distclean && make devel CC=g++ && make CC=g++ ANSIFLAGS=""
          +    make distclean && make devel CC=g++ && make multi CC=g++ ANSIFLAGS=""
           
               sh autogen.sh
          -    make distclean; ./configure CC=g++; make
          +    make distclean && ./configure CC=g++ && make ANSIFLAGS=""
           
          -  in the cloned repository to test compilation with both gcc and g++.
          +  to test compilation with both gcc and g++ (you might also add the `-j`
          +  flag to `make` for parallel compilation).
           
             Note that it is normally not necessary to test standard C
             compilation with the `configure`, `meson`, and `cmake` build tools
          -  since this is done by the CI process of 'gitlab.freetype.org' for
          +  since this is done by the CI process of 'gitlab.freedesktop.org' for
             every commit.
           
          -. Test C++ compilation for 'freetype-demos' too (using `git clone` as
          -  above).
          +. Test C++ compilation for 'freetype-demos' too; this needs a compiled
          +  FreeType library as described in the `README` file.
          +
          +    make distclean && make
          +    make distclean && make CC=g++ ANSIFLAGS=""
           
           . Run `src/tools/chktrcmp.py` and check that there are no undefined
             `trace_XXXX` macros.
           
          +. Update meson subproject files (for both the 'freetype' and
          +  'freetype-demos' git repositories) with
          +
          +    meson subprojects update
          +
          +. Test meson compilation (for both the 'freetype' and 'freetype-demos'
          +  git repositories) with
          +
          +    meson setup builddir && meson compile -C builddir
          +
          +. Commit everything.
          +
           . After pushing the new release, tag the git repositories ('freetype',
             'freetype-demos') with
           
          diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
          index 81f0e86ed..4a074a444 100644
          --- a/include/freetype/freetype.h
          +++ b/include/freetype/freetype.h
          @@ -5222,7 +5222,7 @@ FT_BEGIN_HEADER
              */
           #define FREETYPE_MAJOR  2
           #define FREETYPE_MINOR  13
          -#define FREETYPE_PATCH  0
          +#define FREETYPE_PATCH  1
           
           
             /**************************************************************************
          diff --git a/src/base/ftver.rc b/src/base/ftver.rc
          index f113cb892..c7155d53d 100644
          --- a/src/base/ftver.rc
          +++ b/src/base/ftver.rc
          @@ -18,8 +18,8 @@
           
           #include
           
          -#define FT_VERSION      2,13,0,0
          -#define FT_VERSION_STR  "2.13.0"
          +#define FT_VERSION      2,13,1,0
          +#define FT_VERSION_STR  "2.13.1"
           
           VS_VERSION_INFO      VERSIONINFO
           FILEVERSION          FT_VERSION
          diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c
          index 0e6a7ad6b..eaca765ad 100644
          --- a/src/cid/cidgload.c
          +++ b/src/cid/cidgload.c
          @@ -92,7 +92,7 @@
                 *off1_p = off1;
               if ( off2_p )
                 *off2_p = off2;
          -  
          +
               if ( fd_select >= cid->num_dicts )
               {
                 /*
          @@ -147,7 +147,7 @@
                 if ( need_frame_exit )
                   FT_FRAME_EXIT();
           
          -    return error; 
          +    return error;
             }
           
           
          diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c
          index 24ade045e..d9b9398b0 100644
          --- a/src/type1/t1afm.c
          +++ b/src/type1/t1afm.c
          @@ -299,7 +299,7 @@
                 /* ascender and descender are optional and could both be zero */
                 /* check if values are meaningful before overriding defaults  */
                 if ( fi->Ascender > fi->Descender )
          -      {  
          +      {
                   /* no `U' suffix here to 0x8000! */
                   t1_face->ascender  = (FT_Short)( ( fi->Ascender  + 0x8000 ) >> 16 );
                   t1_face->descender = (FT_Short)( ( fi->Descender + 0x8000 ) >> 16 );
          diff --git a/subprojects/dlg b/subprojects/dlg
          index d142e646e..72dfcc858 160000
          --- a/subprojects/dlg
          +++ b/subprojects/dlg
          @@ -1 +1 @@
          -Subproject commit d142e646e263c89f93663e027c2f0d03739ab42d
          +Subproject commit 72dfcc858c040c54a6a0b88fcb7e70ee186d3167
          diff --git a/subprojects/libpng.wrap b/subprojects/libpng.wrap
          index 12ba5b185..68abec897 100644
          --- a/subprojects/libpng.wrap
          +++ b/subprojects/libpng.wrap
          @@ -3,10 +3,11 @@ directory = libpng-1.6.39
           source_url = https://github.com/glennrp/libpng/archive/v1.6.39.tar.gz
           source_filename = libpng-1.6.39.tar.gz
           source_hash = a00e9d2f2f664186e4202db9299397f851aea71b36a35e74910b8820e380d441
          -patch_filename = libpng_1.6.39-2_patch.zip
          -patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.39-2/get_patch
          -patch_hash = 8bcf8f69f50233f3a35e3718ab3c91b0c51b4c1a08a84c87be0b1f4813adf17f
          -wrapdb_version = 1.6.39-2
          +patch_filename = libpng_1.6.39-3_patch.zip
          +patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.39-3/get_patch
          +patch_hash = 6af2a8d464e3f1d2e2832580896323ac7b0b786806c75f0eff0c8ec82dd603ec
          +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.39-3/libpng-1.6.39.tar.gz
          +wrapdb_version = 1.6.39-3
           
           [provide]
           libpng = libpng_dep
          diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap
          index 23af071a2..4f19672e4 100644
          --- a/subprojects/zlib.wrap
          +++ b/subprojects/zlib.wrap
          @@ -1,12 +1,13 @@
           [wrap-file]
           directory = zlib-1.2.13
           source_url = http://zlib.net/fossils/zlib-1.2.13.tar.gz
          +source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.2.13-4/zlib-1.2.13.tar.gz
           source_filename = zlib-1.2.13.tar.gz
           source_hash = b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30
          -patch_filename = zlib_1.2.13-2_patch.zip
          -patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.2.13-2/get_patch
          -patch_hash = a7abea3ad65dc2c291ad5fbbf5355d0585a7f7b8c935d4a74335b8fe18684506
          -wrapdb_version = 1.2.13-2
          +patch_filename = zlib_1.2.13-4_patch.zip
          +patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.2.13-4/get_patch
          +patch_hash = 19636b7807e679b92240bc7a99aed85d1be908a45430b12c7687a825cb499d5e
          +wrapdb_version = 1.2.13-4
           
           [provide]
           zlib = zlib_dep