Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
-
e4586d96
by Werner Lemberg at 2023-06-24T08:11:05+02:00
* 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.
23 changed files:
Changes:
.gitlab-ci.yml
... |
... |
@@ -76,7 +76,7 @@ variables: |
76
|
76
|
|
77
|
77
|
|
78
|
78
|
# Format of job names:
|
79
|
|
-# <OS> <Build-Tool> <Build-Params> <Architecture>
|
|
79
|
+# <OS> <Build-Tool> <Build-Params> <Architecture>
|
80
|
80
|
|
81
|
81
|
|
82
|
82
|
# Windows jobs.
|
CMakeLists.txt
... |
... |
@@ -164,7 +164,7 @@ project(freetype C) |
164
|
164
|
|
165
|
165
|
set(VERSION_MAJOR "2")
|
166
|
166
|
set(VERSION_MINOR "13")
|
167
|
|
-set(VERSION_PATCH "0")
|
|
167
|
+set(VERSION_PATCH "1")
|
168
|
168
|
|
169
|
169
|
# Generate LIBRARY_VERSION and LIBRARY_SOVERSION.
|
170
|
170
|
set(LIBTOOL_REGEX "version_info='([0-9]+):([0-9]+):([0-9]+)'")
|
README
1
|
|
-FreeType 2.13.0
|
|
1
|
+FreeType 2.13.1
|
2
|
2
|
===============
|
3
|
3
|
|
4
|
4
|
Homepage: https://www.freetype.org
|
... |
... |
@@ -32,9 +32,9 @@ sites. Go to |
32
|
32
|
|
33
|
33
|
and download one of the following files.
|
34
|
34
|
|
35
|
|
- freetype-doc-2.13.0.tar.xz
|
36
|
|
- freetype-doc-2.13.0.tar.gz
|
37
|
|
- ftdoc2130.zip
|
|
35
|
+ freetype-doc-2.13.1.tar.xz
|
|
36
|
+ freetype-doc-2.13.1.tar.gz
|
|
37
|
+ ftdoc2131.zip
|
38
|
38
|
|
39
|
39
|
To view the documentation online, go to
|
40
|
40
|
|
builds/mac/README
... |
... |
@@ -200,14 +200,6 @@ environment by Metrowerks. GCC for MPW and Symantec |
200
|
200
|
behaviours are not tested at all. Building ftdemos
|
201
|
201
|
for classic MacOS and working test is required.
|
202
|
202
|
|
203
|
|
- 4-3. Porting Jam onto MPW
|
204
|
|
- -------------------------
|
205
|
|
-
|
206
|
|
- FreeType uses Jam (and FT-Jam) for unified cross-
|
207
|
|
- platform building tool. At present, Jam is not ported
|
208
|
|
- to MPW. To update classic MacOS support easily,
|
209
|
|
- building by Jam is expected on MPW.
|
210
|
|
-
|
211
|
203
|
|
212
|
204
|
APPENDIX I
|
213
|
205
|
----------
|
builds/unix/configure.raw
... |
... |
@@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.h.in]) |
17
|
17
|
|
18
|
18
|
# Don't forget to update `docs/VERSIONS.TXT'!
|
19
|
19
|
|
20
|
|
-version_info='25:0:19'
|
|
20
|
+version_info='26:0:20'
|
21
|
21
|
AC_SUBST([version_info])
|
22
|
22
|
ft_version=`echo $version_info | tr : .`
|
23
|
23
|
AC_SUBST([ft_version])
|
builds/wince/vc2005-ce/index.html
... |
... |
@@ -21,7 +21,7 @@ the following targets: |
21
|
21
|
<li>PPC/SP WM6 (Windows Mobile 6)</li>
|
22
|
22
|
</ul>
|
23
|
23
|
|
24
|
|
-It compiles the following libraries from the FreeType 2.13.0 sources:</p>
|
|
24
|
+It compiles the following libraries from the FreeType 2.13.1 sources:</p>
|
25
|
25
|
|
26
|
26
|
<ul>
|
27
|
27
|
<pre>
|
builds/wince/vc2008-ce/index.html
... |
... |
@@ -21,7 +21,7 @@ the following targets: |
21
|
21
|
<li>PPC/SP WM6 (Windows Mobile 6)</li>
|
22
|
22
|
</ul>
|
23
|
23
|
|
24
|
|
-It compiles the following libraries from the FreeType 2.13.0 sources:</p>
|
|
24
|
+It compiles the following libraries from the FreeType 2.13.1 sources:</p>
|
25
|
25
|
|
26
|
26
|
<ul>
|
27
|
27
|
<pre>
|
builds/windows/vc2010/index.html
... |
... |
@@ -12,7 +12,7 @@ |
12
|
12
|
<p>This directory contains solution and project files for
|
13
|
13
|
Visual C++ 2010 or newer, named <tt>freetype.sln</tt>,
|
14
|
14
|
and <tt>freetype.vcxproj</tt>. It compiles the following libraries
|
15
|
|
-from the FreeType 2.13.0 sources:</p>
|
|
15
|
+from the FreeType 2.13.1 sources:</p>
|
16
|
16
|
|
17
|
17
|
<ul>
|
18
|
18
|
<li>freetype.dll using 'Release' or 'Debug' configurations</li>
|
builds/windows/visualc/index.html
... |
... |
@@ -12,7 +12,7 @@ |
12
|
12
|
<p>This directory contains project files <tt>freetype.dsp</tt> for
|
13
|
13
|
Visual C++ 6.0, and <tt>freetype.vcproj</tt> for Visual C++ 2002
|
14
|
14
|
through 2008, which you might need to upgrade automatically.
|
15
|
|
-It compiles the following libraries from the FreeType 2.13.0 sources:</p>
|
|
15
|
+It compiles the following libraries from the FreeType 2.13.1 sources:</p>
|
16
|
16
|
|
17
|
17
|
<ul>
|
18
|
18
|
<li>freetype.dll using 'Release' or 'Debug' configurations</li>
|
builds/windows/visualce/index.html
... |
... |
@@ -21,7 +21,7 @@ the following targets: |
21
|
21
|
<li>PPC/SP WM6 (Windows Mobile 6)</li>
|
22
|
22
|
</ul>
|
23
|
23
|
|
24
|
|
-It compiles the following libraries from the FreeType 2.13.0 sources:</p>
|
|
24
|
+It compiles the following libraries from the FreeType 2.13.1 sources:</p>
|
25
|
25
|
|
26
|
26
|
<ul>
|
27
|
27
|
<pre>
|
docs/CHANGES
1
|
|
-CHANGES BETWEEN 2.13.0 and 2.13.1 (2023-XXX-XX)
|
|
1
|
+CHANGES BETWEEN 2.13.0 and 2.13.1 (2023-Jun-24)
|
2
|
2
|
|
3
|
3
|
I. MISCELLANEOUS
|
4
|
4
|
|
... |
... |
@@ -8,6 +8,33 @@ CHANGES BETWEEN 2.13.0 and 2.13.1 (2023-XXX-XX) |
8
|
8
|
- A new load flag `FT_LOAD_NO_SVG` to make FreeType ignore glyphs in
|
9
|
9
|
an 'SVG ' table.
|
10
|
10
|
|
|
11
|
+ - New function `FT_GlyphSlot_AdjustWeight` to adjust the glyph
|
|
12
|
+ weight either horizontally or vertically. This is part of the
|
|
13
|
+ `ftsynth.h` header file, which is still considered to be in alpha
|
|
14
|
+ stage.
|
|
15
|
+
|
|
16
|
+ - TrueType interpreter version 38 (also known as 'Infinality') has
|
|
17
|
+ been deactivated; the value of `TT_INTERPRETER_VERSION_38` is now
|
|
18
|
+ the same as `TT_INTERPRETER_VERSION_40`.
|
|
19
|
+
|
|
20
|
+ - Updated OpenVMS support.
|
|
21
|
+
|
|
22
|
+ - The base API documentation has been modularized for easier
|
|
23
|
+ handling.
|
|
24
|
+
|
|
25
|
+ - Switching named instances on and off in Variation Fonts was buggy
|
|
26
|
+ if the design coordinates didn't change.
|
|
27
|
+
|
|
28
|
+ - `ftbench` has a new command-line option `-a` to apply design
|
|
29
|
+ coordinates.
|
|
30
|
+
|
|
31
|
+ - `ftview` can now flip SVG rendering on and off using the 'Z' key.
|
|
32
|
+
|
|
33
|
+ - In `ftmulti` it is now possible to toggle the fill rule and
|
|
34
|
+ overlap flag used for rendering glyphs using the 'F3' and 'F4'
|
|
35
|
+ keys, respectively. Toggling the anti-aliased mode has been
|
|
36
|
+ changed to the 'TAB' key.
|
|
37
|
+
|
11
|
38
|
|
12
|
39
|
======================================================================
|
13
|
40
|
|
docs/README
... |
... |
@@ -18,8 +18,6 @@ There are two ways to generate the documentation: |
18
|
18
|
- This may or may not require internet access every time depending on
|
19
|
19
|
pip and system caching.
|
20
|
20
|
|
21
|
|
-This also works with Jam: Just type `jam refdoc' in the main directory.
|
22
|
|
-
|
23
|
21
|
Some troubleshooting tips:
|
24
|
22
|
|
25
|
23
|
* Regularly run `pip install --upgrade docwriter' to check for updates which
|
docs/VERSIONS.TXT
... |
... |
@@ -60,6 +60,7 @@ found on _most_ systems, but not all of them: |
60
|
60
|
|
61
|
61
|
release libtool so
|
62
|
62
|
-------------------------------
|
|
63
|
+ 2.13.1 26.0.20 6.20.0
|
63
|
64
|
2.13.0 25.0.19 6.19.0
|
64
|
65
|
2.12.1 24.3.18 6.18.3
|
65
|
66
|
2.12.0 24.2.18 6.18.2
|
docs/formats.txt
... |
... |
@@ -199,7 +199,7 @@ which isn't supported yet please send a mail too. |
199
|
199
|
defined in the OpenType specification 1.6 and newer.
|
200
|
200
|
|
201
|
201
|
[7] `The Type 1 GX Font Format' (dated 1995-09-27) was distributed in
|
202
|
|
- Apple Developer CD-ROM in those days. The content of `TYP1' table
|
|
202
|
+ Apple Developer CD-ROM in those days. The content of `TYP1' table
|
203
|
203
|
is a PostScript Type 1 font without the eexec encryption. Current
|
204
|
204
|
versions of FreeType don't not support this format, but FontForge
|
205
|
205
|
can load it.
|
docs/freetype-config.1
1
|
|
-.TH FREETYPE-CONFIG 1 "February 2023" "FreeType 2.13.0"
|
|
1
|
+.TH FREETYPE-CONFIG 1 "June 2023" "FreeType 2.13.1"
|
2
|
2
|
.
|
3
|
3
|
.
|
4
|
4
|
.SH NAME
|
docs/release
... |
... |
@@ -15,33 +15,53 @@ How to prepare a new release |
15
|
15
|
|
16
|
16
|
. docs/VERSIONS.TXT: Document changed `version_info`.
|
17
|
17
|
|
18
|
|
-. Clone the git archive to another directory with
|
|
18
|
+. Update the 'dlg' submodule with
|
19
|
19
|
|
20
|
|
- git clone -l -s . ../freetype.test
|
|
20
|
+ git submodule foreach git pull origin master
|
21
|
21
|
|
22
|
|
- or something like this and run
|
|
22
|
+. Copy the submodule code with
|
23
|
23
|
|
24
|
|
- make distclean; make devel; make
|
25
|
|
- make distclean; make devel; make multi
|
26
|
|
- make distclean; make devel CC=g++; make CC=g++
|
27
|
|
- make distclean; make devel CC=g++; make multi CC=g++
|
|
24
|
+ make copy_submodule
|
|
25
|
+
|
|
26
|
+ and run
|
|
27
|
+
|
|
28
|
+ make distclean && make devel && make
|
|
29
|
+ make distclean && make devel && make multi
|
|
30
|
+ make distclean && make devel CC=g++ && make CC=g++ ANSIFLAGS=""
|
|
31
|
+ make distclean && make devel CC=g++ && make multi CC=g++ ANSIFLAGS=""
|
28
|
32
|
|
29
|
33
|
sh autogen.sh
|
30
|
|
- make distclean; ./configure CC=g++; make
|
|
34
|
+ make distclean && ./configure CC=g++ && make ANSIFLAGS=""
|
31
|
35
|
|
32
|
|
- in the cloned repository to test compilation with both gcc and g++.
|
|
36
|
+ to test compilation with both gcc and g++ (you might also add the `-j`
|
|
37
|
+ flag to `make` for parallel compilation).
|
33
|
38
|
|
34
|
39
|
Note that it is normally not necessary to test standard C
|
35
|
40
|
compilation with the `configure`, `meson`, and `cmake` build tools
|
36
|
|
- since this is done by the CI process of 'gitlab.freetype.org' for
|
|
41
|
+ since this is done by the CI process of 'gitlab.freedesktop.org' for
|
37
|
42
|
every commit.
|
38
|
43
|
|
39
|
|
-. Test C++ compilation for 'freetype-demos' too (using `git clone` as
|
40
|
|
- above).
|
|
44
|
+. Test C++ compilation for 'freetype-demos' too; this needs a compiled
|
|
45
|
+ FreeType library as described in the `README` file.
|
|
46
|
+
|
|
47
|
+ make distclean && make
|
|
48
|
+ make distclean && make CC=g++ ANSIFLAGS=""
|
41
|
49
|
|
42
|
50
|
. Run `src/tools/chktrcmp.py` and check that there are no undefined
|
43
|
51
|
`trace_XXXX` macros.
|
44
|
52
|
|
|
53
|
+. Update meson subproject files (for both the 'freetype' and
|
|
54
|
+ 'freetype-demos' git repositories) with
|
|
55
|
+
|
|
56
|
+ meson subprojects update
|
|
57
|
+
|
|
58
|
+. Test meson compilation (for both the 'freetype' and 'freetype-demos'
|
|
59
|
+ git repositories) with
|
|
60
|
+
|
|
61
|
+ meson setup builddir && meson compile -C builddir
|
|
62
|
+
|
|
63
|
+. Commit everything.
|
|
64
|
+
|
45
|
65
|
. After pushing the new release, tag the git repositories ('freetype',
|
46
|
66
|
'freetype-demos') with
|
47
|
67
|
|
include/freetype/freetype.h
... |
... |
@@ -5222,7 +5222,7 @@ FT_BEGIN_HEADER |
5222
|
5222
|
*/
|
5223
|
5223
|
#define FREETYPE_MAJOR 2
|
5224
|
5224
|
#define FREETYPE_MINOR 13
|
5225
|
|
-#define FREETYPE_PATCH 0
|
|
5225
|
+#define FREETYPE_PATCH 1
|
5226
|
5226
|
|
5227
|
5227
|
|
5228
|
5228
|
/**************************************************************************
|
src/base/ftver.rc
... |
... |
@@ -18,8 +18,8 @@ |
18
|
18
|
|
19
|
19
|
#include<windows.h>
|
20
|
20
|
|
21
|
|
-#define FT_VERSION 2,13,0,0
|
22
|
|
-#define FT_VERSION_STR "2.13.0"
|
|
21
|
+#define FT_VERSION 2,13,1,0
|
|
22
|
+#define FT_VERSION_STR "2.13.1"
|
23
|
23
|
|
24
|
24
|
VS_VERSION_INFO VERSIONINFO
|
25
|
25
|
FILEVERSION FT_VERSION
|
src/cid/cidgload.c
... |
... |
@@ -92,7 +92,7 @@ |
92
|
92
|
*off1_p = off1;
|
93
|
93
|
if ( off2_p )
|
94
|
94
|
*off2_p = off2;
|
95
|
|
-
|
|
95
|
+
|
96
|
96
|
if ( fd_select >= cid->num_dicts )
|
97
|
97
|
{
|
98
|
98
|
/*
|
... |
... |
@@ -147,7 +147,7 @@ |
147
|
147
|
if ( need_frame_exit )
|
148
|
148
|
FT_FRAME_EXIT();
|
149
|
149
|
|
150
|
|
- return error;
|
|
150
|
+ return error;
|
151
|
151
|
}
|
152
|
152
|
|
153
|
153
|
|
src/type1/t1afm.c
... |
... |
@@ -299,7 +299,7 @@ |
299
|
299
|
/* ascender and descender are optional and could both be zero */
|
300
|
300
|
/* check if values are meaningful before overriding defaults */
|
301
|
301
|
if ( fi->Ascender > fi->Descender )
|
302
|
|
- {
|
|
302
|
+ {
|
303
|
303
|
/* no `U' suffix here to 0x8000! */
|
304
|
304
|
t1_face->ascender = (FT_Short)( ( fi->Ascender + 0x8000 ) >> 16 );
|
305
|
305
|
t1_face->descender = (FT_Short)( ( fi->Descender + 0x8000 ) >> 16 );
|
subprojects/dlg
1
|
|
-Subproject commit d142e646e263c89f93663e027c2f0d03739ab42d |
|
1
|
+Subproject commit 72dfcc858c040c54a6a0b88fcb7e70ee186d3167 |
subprojects/libpng.wrap
... |
... |
@@ -3,10 +3,11 @@ directory = libpng-1.6.39 |
3
|
3
|
source_url = https://github.com/glennrp/libpng/archive/v1.6.39.tar.gz
|
4
|
4
|
source_filename = libpng-1.6.39.tar.gz
|
5
|
5
|
source_hash = a00e9d2f2f664186e4202db9299397f851aea71b36a35e74910b8820e380d441
|
6
|
|
-patch_filename = libpng_1.6.39-2_patch.zip
|
7
|
|
-patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.39-2/get_patch
|
8
|
|
-patch_hash = 8bcf8f69f50233f3a35e3718ab3c91b0c51b4c1a08a84c87be0b1f4813adf17f
|
9
|
|
-wrapdb_version = 1.6.39-2
|
|
6
|
+patch_filename = libpng_1.6.39-3_patch.zip
|
|
7
|
+patch_url = https://wrapdb.mesonbuild.com/v2/libpng_1.6.39-3/get_patch
|
|
8
|
+patch_hash = 6af2a8d464e3f1d2e2832580896323ac7b0b786806c75f0eff0c8ec82dd603ec
|
|
9
|
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libpng_1.6.39-3/libpng-1.6.39.tar.gz
|
|
10
|
+wrapdb_version = 1.6.39-3
|
10
|
11
|
|
11
|
12
|
[provide]
|
12
|
13
|
libpng = libpng_dep |
subprojects/zlib.wrap
1
|
1
|
[wrap-file]
|
2
|
2
|
directory = zlib-1.2.13
|
3
|
3
|
source_url = http://zlib.net/fossils/zlib-1.2.13.tar.gz
|
|
4
|
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/zlib_1.2.13-4/zlib-1.2.13.tar.gz
|
4
|
5
|
source_filename = zlib-1.2.13.tar.gz
|
5
|
6
|
source_hash = b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30
|
6
|
|
-patch_filename = zlib_1.2.13-2_patch.zip
|
7
|
|
-patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.2.13-2/get_patch
|
8
|
|
-patch_hash = a7abea3ad65dc2c291ad5fbbf5355d0585a7f7b8c935d4a74335b8fe18684506
|
9
|
|
-wrapdb_version = 1.2.13-2
|
|
7
|
+patch_filename = zlib_1.2.13-4_patch.zip
|
|
8
|
+patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.2.13-4/get_patch
|
|
9
|
+patch_hash = 19636b7807e679b92240bc7a99aed85d1be908a45430b12c7687a825cb499d5e
|
|
10
|
+wrapdb_version = 1.2.13-4
|
10
|
11
|
|
11
|
12
|
[provide]
|
12
|
13
|
zlib = zlib_dep |
|