From 3f83daeecb1a78d851b660eed025eeba362c0e4a Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Wed, 1 Dec 2021 20:17:59 +0100 Subject: [PATCH] * Version 2.11.1 released. ========================== Tag sources with `VER-2-11-1'. * docs/VERSION.TXT: Add entry for version 2.11.1. * docs/CHANGES, docs/release: 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.11.0/2.11.1/, s/2110/2111/. * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. * builds/unix/configure.raw (version_info): Set to 24:1:18. * CMakeLists.txt (VERSION_PATCH): Set to 1. * builds/toplevel.mk (version_tag, CHANGELOG_SCRIPT): New variables. (do-dist): Generate `ChangeLog` file with all commits since last release. --- CMakeLists.txt | 2 +- README | 8 ++++---- builds/toplevel.mk | 14 ++++++++++++++ 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/VERSIONS.TXT | 1 + docs/freetype-config.1 | 2 +- docs/release | 15 +++------------ include/freetype/freetype.h | 2 +- src/base/ftver.rc | 4 ++-- 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:
  • PPC/SP WM6 (Windows Mobile 6)
    • -It compiles the following libraries from the FreeType 2.11.0 sources:

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

    -It compiles the following libraries from the FreeType 2.11.0 sources:

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