summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt2
-rw-r--r--README8
-rw-r--r--builds/toplevel.mk14
-rw-r--r--builds/unix/configure.raw2
-rw-r--r--builds/wince/vc2005-ce/index.html2
-rw-r--r--builds/wince/vc2008-ce/index.html2
-rw-r--r--builds/windows/vc2010/index.html2
-rw-r--r--builds/windows/visualc/index.html2
-rw-r--r--builds/windows/visualce/index.html2
-rw-r--r--docs/VERSIONS.TXT1
-rw-r--r--docs/freetype-config.12
-rw-r--r--docs/release15
-rw-r--r--include/freetype/freetype.h2
-rw-r--r--src/base/ftver.rc4
14 files changed, 33 insertions, 27 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb1b9a0f2..4335d66dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,7 +163,7 @@ project(freetype C)
set(VERSION_MAJOR "2")
set(VERSION_MINOR "11")
-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 5d77ef496..6a320df90 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-FreeType 2.11.0
+FreeType 2.11.1
===============
Homepage: https://www.freetype.org
@@ -30,9 +30,9 @@ sites. Go to
and download one of the following files.
- freetype-doc-2.11.0.tar.xz
- freetype-doc-2.11.0.tar.gz
- ftdoc2110.zip
+ freetype-doc-2.11.1.tar.xz
+ freetype-doc-2.11.1.tar.gz
+ ftdoc2111.zip
To view the documentation online, go to
diff --git a/builds/toplevel.mk b/builds/toplevel.mk
index 3b3fd64fe..53b6d6fc1 100644
--- a/builds/toplevel.mk
+++ b/builds/toplevel.mk
@@ -226,6 +226,7 @@ patch := $(firstword $(patch))
# else
version := $(major).$(minor).$(patch)
winversion := $(major)$(minor)$(patch)
+ version_tag := VER-$(major)-$(minor)-$(patch)
# endif
@@ -282,6 +283,10 @@ dist:
CONFIG_GUESS = ~/git/config/config.guess
CONFIG_SUB = ~/git/config/config.sub
+# We also use this repository to access the gnulib script that converts git
+# commit messages to a ChangeLog file.
+CHANGELOG_SCRIPT = ~/git/config/gitlog-to-changelog
+
# Don't say `make do-dist'. Always use `make dist' instead.
#
@@ -299,6 +304,15 @@ do-dist: distclean refdoc
cp $(CONFIG_GUESS) builds/unix
cp $(CONFIG_SUB) builds/unix
+ @# Generate `ChangeLog' file with commits since previous release.
+ $(CHANGELOG_SCRIPT) \
+ --format='%B%n' \
+ --no-cluster \
+ -- `git describe --tags \
+ --abbrev=0 \
+ $(version_tag)^`..$(version_tag) \
+ > ChangeLog
+
@# Remove intermediate files created by the `refdoc' target.
rm -rf docs/markdown
rm -f docs/mkdocs.yml
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index b035a2988..f326872cb 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='24:0:18'
+version_info='24:1:18'
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 0b6fc295f..3e42cf992 100644
--- a/builds/wince/vc2005-ce/index.html
+++ b/builds/wince/vc2005-ce/index.html
@@ -21,7 +21,7 @@ the following targets:
<li>PPC/SP WM6 (Windows Mobile 6)</li>
</ul>
-It compiles the following libraries from the FreeType 2.11.0 sources:</p>
+It compiles the following libraries from the FreeType 2.11.1 sources:</p>
<ul>
<pre>
diff --git a/builds/wince/vc2008-ce/index.html b/builds/wince/vc2008-ce/index.html
index 0c7ffcc6d..645675c72 100644
--- a/builds/wince/vc2008-ce/index.html
+++ b/builds/wince/vc2008-ce/index.html
@@ -21,7 +21,7 @@ the following targets:
<li>PPC/SP WM6 (Windows Mobile 6)</li>
</ul>
-It compiles the following libraries from the FreeType 2.11.0 sources:</p>
+It compiles the following libraries from the FreeType 2.11.1 sources:</p>
<ul>
<pre>
diff --git a/builds/windows/vc2010/index.html b/builds/windows/vc2010/index.html
index 6332d41fd..dcb1944b8 100644
--- a/builds/windows/vc2010/index.html
+++ b/builds/windows/vc2010/index.html
@@ -12,7 +12,7 @@
<p>This directory contains solution and project files for
Visual&nbsp;C++&nbsp;2010 or newer, named <tt>freetype.sln</tt>,
and <tt>freetype.vcxproj</tt>. It compiles the following libraries
-from the FreeType 2.11.0 sources:</p>
+from the FreeType 2.11.1 sources:</p>
<ul>
<li>freetype.dll using 'Release' or 'Debug' configurations</li>
diff --git a/builds/windows/visualc/index.html b/builds/windows/visualc/index.html
index dbc93ad80..d0c8f2f94 100644
--- a/builds/windows/visualc/index.html
+++ b/builds/windows/visualc/index.html
@@ -12,7 +12,7 @@
<p>This directory contains project files <tt>freetype.dsp</tt> for
Visual C++ 6.0, and <tt>freetype.vcproj</tt> for Visual C++ 2002
through 2008, which you might need to upgrade automatically.
-It compiles the following libraries from the FreeType 2.11.0 sources:</p>
+It compiles the following libraries from the FreeType 2.11.1 sources:</p>
<ul>
<li>freetype.dll using 'Release' or 'Debug' configurations</li>
diff --git a/builds/windows/visualce/index.html b/builds/windows/visualce/index.html
index 45aec7a98..b50ef79b0 100644
--- a/builds/windows/visualce/index.html
+++ b/builds/windows/visualce/index.html
@@ -21,7 +21,7 @@ the following targets:
<li>PPC/SP WM6 (Windows Mobile 6)</li>
</ul>
-It compiles the following libraries from the FreeType 2.11.0 sources:</p>
+It compiles the following libraries from the FreeType 2.11.1 sources:</p>
<ul>
<pre>
diff --git a/docs/VERSIONS.TXT b/docs/VERSIONS.TXT
index e4b16ef49..afe50a4c6 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.11.1 24.1.18 6.18.1
2.11.0 24.0.18 6.18.0
2.10.4 23.4.17 6.17.4
2.10.3 23.3.17 6.17.3
diff --git a/docs/freetype-config.1 b/docs/freetype-config.1
index 692ec79b9..8145c9f2e 100644
--- a/docs/freetype-config.1
+++ b/docs/freetype-config.1
@@ -1,4 +1,4 @@
-.TH FREETYPE-CONFIG 1 "July 2021" "FreeType 2.11.0"
+.TH FREETYPE-CONFIG 1 "December 2021" "FreeType 2.11.1"
.
.
.SH NAME
diff --git a/docs/release b/docs/release
index 288f68d49..05f730f92 100644
--- a/docs/release
+++ b/docs/release
@@ -15,9 +15,6 @@ How to prepare a new release
. docs/VERSIONS.TXT: Document changed `version_info`.
-. ChangeLog: Announce new release (both in the 'freetype' and
- 'freetype-demos' repositories).
-
. Clone the git archive to another directory with
git clone -l -s . ../freetype.test
@@ -175,15 +172,9 @@ How to prepare a new release
`freetype-XXX.tar.xz` files as the default files to download for
'Windows' and 'Others', respectively.
-. Copy the reference files (generated by `make dist`) to
-
- <freetype-web git repository>/freetype2/docs/reference
-
-. Update the 'freetype-web' repository. `git push` then automatically
- triggers an update of the public web pages within ten minutes due to
- a cron script (on 'wl@freedesktop.org') that rsyncs with
-
- freedesktop.org://srv/freetype.freedesktop.org/www
+. Trigger the automatic generation of the online API reference by
+ updating the `FT_VERSION` variable in file `.gitlab-ci.yml` of the
+ 'freetype-web' repository.
. Announce new release on 'freetype-announce@nongnu.org' and to
relevant newsgroups.
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index e3438f2bc..f6c66b94a 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -4740,7 +4740,7 @@ FT_BEGIN_HEADER
*/
#define FREETYPE_MAJOR 2
#define FREETYPE_MINOR 11
-#define FREETYPE_PATCH 0
+#define FREETYPE_PATCH 1
/**************************************************************************
diff --git a/src/base/ftver.rc b/src/base/ftver.rc
index 5fe433cbd..a3d05b378 100644
--- a/src/base/ftver.rc
+++ b/src/base/ftver.rc
@@ -18,8 +18,8 @@
#include<windows.h>
-#define FT_VERSION 2,11,0,0
-#define FT_VERSION_STR "2.11.0"
+#define FT_VERSION 2,11,1,0
+#define FT_VERSION_STR "2.11.1"
VS_VERSION_INFO VERSIONINFO
FILEVERSION FT_VERSION
View Lorry Controller Status