Werner Lemberg pushed to branch master at FreeType / FreeType
Commits:
-
3f83daee
by Werner Lemberg at 2021-12-02T13:33:12+01:00
14 changed files:
- CMakeLists.txt
- README
- builds/toplevel.mk
- builds/unix/configure.raw
- builds/wince/vc2005-ce/index.html
- builds/wince/vc2008-ce/index.html
- builds/windows/vc2010/index.html
- builds/windows/visualc/index.html
- builds/windows/visualce/index.html
- docs/VERSIONS.TXT
- docs/freetype-config.1
- docs/release
- include/freetype/freetype.h
- src/base/ftver.rc
Changes:
| ... | ... | @@ -163,7 +163,7 @@ project(freetype C) |
| 163 | 163 |
|
| 164 | 164 |
set(VERSION_MAJOR "2")
|
| 165 | 165 |
set(VERSION_MINOR "11")
|
| 166 |
-set(VERSION_PATCH "0")
|
|
| 166 |
+set(VERSION_PATCH "1")
|
|
| 167 | 167 |
|
| 168 | 168 |
# Generate LIBRARY_VERSION and LIBRARY_SOVERSION.
|
| 169 | 169 |
set(LIBTOOL_REGEX "version_info='([0-9]+):([0-9]+):([0-9]+)'")
|
| 1 |
-FreeType 2.11.0
|
|
| 1 |
+FreeType 2.11.1
|
|
| 2 | 2 |
===============
|
| 3 | 3 |
|
| 4 | 4 |
Homepage: https://www.freetype.org
|
| ... | ... | @@ -30,9 +30,9 @@ sites. Go to |
| 30 | 30 |
|
| 31 | 31 |
and download one of the following files.
|
| 32 | 32 |
|
| 33 |
- freetype-doc-2.11.0.tar.xz
|
|
| 34 |
- freetype-doc-2.11.0.tar.gz
|
|
| 35 |
- ftdoc2110.zip
|
|
| 33 |
+ freetype-doc-2.11.1.tar.xz
|
|
| 34 |
+ freetype-doc-2.11.1.tar.gz
|
|
| 35 |
+ ftdoc2111.zip
|
|
| 36 | 36 |
|
| 37 | 37 |
To view the documentation online, go to
|
| 38 | 38 |
|
| ... | ... | @@ -226,6 +226,7 @@ patch := $(firstword $(patch)) |
| 226 | 226 |
# else
|
| 227 | 227 |
version := $(major).$(minor).$(patch)
|
| 228 | 228 |
winversion := $(major)$(minor)$(patch)
|
| 229 |
+ version_tag := VER-$(major)-$(minor)-$(patch)
|
|
| 229 | 230 |
# endif
|
| 230 | 231 |
|
| 231 | 232 |
|
| ... | ... | @@ -282,6 +283,10 @@ dist: |
| 282 | 283 |
CONFIG_GUESS = ~/git/config/config.guess
|
| 283 | 284 |
CONFIG_SUB = ~/git/config/config.sub
|
| 284 | 285 |
|
| 286 |
+# We also use this repository to access the gnulib script that converts git
|
|
| 287 |
+# commit messages to a ChangeLog file.
|
|
| 288 |
+CHANGELOG_SCRIPT = ~/git/config/gitlog-to-changelog
|
|
| 289 |
+ |
|
| 285 | 290 |
|
| 286 | 291 |
# Don't say `make do-dist'. Always use `make dist' instead.
|
| 287 | 292 |
#
|
| ... | ... | @@ -299,6 +304,15 @@ do-dist: distclean refdoc |
| 299 | 304 |
cp $(CONFIG_GUESS) builds/unix
|
| 300 | 305 |
cp $(CONFIG_SUB) builds/unix
|
| 301 | 306 |
|
| 307 |
+ @# Generate `ChangeLog' file with commits since previous release.
|
|
| 308 |
+ $(CHANGELOG_SCRIPT) \
|
|
| 309 |
+ --format='%B%n' \
|
|
| 310 |
+ --no-cluster \
|
|
| 311 |
+ -- `git describe --tags \
|
|
| 312 |
+ --abbrev=0 \
|
|
| 313 |
+ $(version_tag)^`..$(version_tag) \
|
|
| 314 |
+ > ChangeLog
|
|
| 315 |
+ |
|
| 302 | 316 |
@# Remove intermediate files created by the `refdoc' target.
|
| 303 | 317 |
rm -rf docs/markdown
|
| 304 | 318 |
rm -f docs/mkdocs.yml
|
| ... | ... | @@ -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='24:0:18'
|
|
| 20 |
+version_info='24:1:18'
|
|
| 21 | 21 |
AC_SUBST([version_info])
|
| 22 | 22 |
ft_version=`echo $version_info | tr : .`
|
| 23 | 23 |
AC_SUBST([ft_version])
|
| ... | ... | @@ -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.11.0 sources:</p>
|
|
| 24 |
+It compiles the following libraries from the FreeType 2.11.1 sources:</p>
|
|
| 25 | 25 |
|
| 26 | 26 |
<ul>
|
| 27 | 27 |
<pre>
|
| ... | ... | @@ -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.11.0 sources:</p>
|
|
| 24 |
+It compiles the following libraries from the FreeType 2.11.1 sources:</p>
|
|
| 25 | 25 |
|
| 26 | 26 |
<ul>
|
| 27 | 27 |
<pre>
|
| ... | ... | @@ -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.11.0 sources:</p>
|
|
| 15 |
+from the FreeType 2.11.1 sources:</p>
|
|
| 16 | 16 |
|
| 17 | 17 |
<ul>
|
| 18 | 18 |
<li>freetype.dll using 'Release' or 'Debug' configurations</li>
|
| ... | ... | @@ -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.11.0 sources:</p>
|
|
| 15 |
+It compiles the following libraries from the FreeType 2.11.1 sources:</p>
|
|
| 16 | 16 |
|
| 17 | 17 |
<ul>
|
| 18 | 18 |
<li>freetype.dll using 'Release' or 'Debug' configurations</li>
|
| ... | ... | @@ -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.11.0 sources:</p>
|
|
| 24 |
+It compiles the following libraries from the FreeType 2.11.1 sources:</p>
|
|
| 25 | 25 |
|
| 26 | 26 |
<ul>
|
| 27 | 27 |
<pre>
|
| ... | ... | @@ -60,6 +60,7 @@ found on _most_ systems, but not all of them: |
| 60 | 60 |
|
| 61 | 61 |
release libtool so
|
| 62 | 62 |
-------------------------------
|
| 63 |
+ 2.11.1 24.1.18 6.18.1
|
|
| 63 | 64 |
2.11.0 24.0.18 6.18.0
|
| 64 | 65 |
2.10.4 23.4.17 6.17.4
|
| 65 | 66 |
2.10.3 23.3.17 6.17.3
|
| 1 |
-.TH FREETYPE-CONFIG 1 "July 2021" "FreeType 2.11.0"
|
|
| 1 |
+.TH FREETYPE-CONFIG 1 "December 2021" "FreeType 2.11.1"
|
|
| 2 | 2 |
.
|
| 3 | 3 |
.
|
| 4 | 4 |
.SH NAME
|
| ... | ... | @@ -15,9 +15,6 @@ How to prepare a new release |
| 15 | 15 |
|
| 16 | 16 |
. docs/VERSIONS.TXT: Document changed `version_info`.
|
| 17 | 17 |
|
| 18 |
-. ChangeLog: Announce new release (both in the 'freetype' and
|
|
| 19 |
- 'freetype-demos' repositories).
|
|
| 20 |
- |
|
| 21 | 18 |
. Clone the git archive to another directory with
|
| 22 | 19 |
|
| 23 | 20 |
git clone -l -s . ../freetype.test
|
| ... | ... | @@ -175,15 +172,9 @@ How to prepare a new release |
| 175 | 172 |
`freetype-XXX.tar.xz` files as the default files to download for
|
| 176 | 173 |
'Windows' and 'Others', respectively.
|
| 177 | 174 |
|
| 178 |
-. Copy the reference files (generated by `make dist`) to
|
|
| 179 |
- |
|
| 180 |
- <freetype-web git repository>/freetype2/docs/reference
|
|
| 181 |
- |
|
| 182 |
-. Update the 'freetype-web' repository. `git push` then automatically
|
|
| 183 |
- triggers an update of the public web pages within ten minutes due to
|
|
| 184 |
- a cron script (on 'wl@freedesktop.org') that rsyncs with
|
|
| 185 |
- |
|
| 186 |
- freedesktop.org://srv/freetype.freedesktop.org/www
|
|
| 175 |
+. Trigger the automatic generation of the online API reference by
|
|
| 176 |
+ updating the `FT_VERSION` variable in file `.gitlab-ci.yml` of the
|
|
| 177 |
+ 'freetype-web' repository.
|
|
| 187 | 178 |
|
| 188 | 179 |
. Announce new release on 'freetype-announce@nongnu.org' and to
|
| 189 | 180 |
relevant newsgroups.
|
| ... | ... | @@ -4740,7 +4740,7 @@ FT_BEGIN_HEADER |
| 4740 | 4740 |
*/
|
| 4741 | 4741 |
#define FREETYPE_MAJOR 2
|
| 4742 | 4742 |
#define FREETYPE_MINOR 11
|
| 4743 |
-#define FREETYPE_PATCH 0
|
|
| 4743 |
+#define FREETYPE_PATCH 1
|
|
| 4744 | 4744 |
|
| 4745 | 4745 |
|
| 4746 | 4746 |
/**************************************************************************
|
| ... | ... | @@ -18,8 +18,8 @@ |
| 18 | 18 |
|
| 19 | 19 |
#include<windows.h>
|
| 20 | 20 |
|
| 21 |
-#define FT_VERSION 2,11,0,0
|
|
| 22 |
-#define FT_VERSION_STR "2.11.0"
|
|
| 21 |
+#define FT_VERSION 2,11,1,0
|
|
| 22 |
+#define FT_VERSION_STR "2.11.1"
|
|
| 23 | 23 |
|
| 24 | 24 |
VS_VERSION_INFO VERSIONINFO
|
| 25 | 25 |
FILEVERSION FT_VERSION
|