From e50798b72043c8b378caa46e0a854519f9028ae4 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Wed, 30 Mar 2022 14:06:21 +0200
Subject: [PATCH] * Version 2.12.0 released. ==========================

Tag sources with `VER-2-12-0'.

* docs/VERSION.TXT: Add entry for version 2.12.0.
* 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.1/2.12.0/, s/2111/2120/.

* include/freetype/freetype.h (FREETYPE_MINOR): Set to 12.
(FREETYPE_PATCH): Set to 0.

* builds/unix/configure.raw (version_info): Set to 24:2:18.
* CMakeLists.txt (VERSION_MINOR): Set to 12.
(VERSION_PATCH): Set to 0.

* builds/toplevel.mk (do-dist): Generate `ChangeLog` entries for all commits
since version 2.11.0 (when we stopped creating this file manually).
---
 CMakeLists.txt                     |  4 ++--
 README                             |  8 ++++----
 builds/toplevel.mk                 |  7 +++----
 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                       | 26 +++++++++++++++++++++++++-
 docs/VERSIONS.TXT                  |  1 +
 docs/freetype-config.1             |  2 +-
 docs/release                       |  5 +++--
 include/freetype/freetype.h        | 11 ++++++-----
 src/base/ftver.rc                  |  6 +++---
 15 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e66cde67..7168cc14d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -162,8 +162,8 @@ endif ()
 project(freetype C)
 
 set(VERSION_MAJOR "2")
-set(VERSION_MINOR "11")
-set(VERSION_PATCH "1")
+set(VERSION_MINOR "12")
+set(VERSION_PATCH "0")
 
 # Generate LIBRARY_VERSION and LIBRARY_SOVERSION.
 set(LIBTOOL_REGEX "version_info='([0-9]+):([0-9]+):([0-9]+)'")
diff --git a/README b/README
index da01bfed6..a33cb11aa 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-FreeType 2.11.1
+FreeType 2.12.0
 ===============
 
 Homepage: https://www.freetype.org
@@ -30,9 +30,9 @@ sites.  Go to
 
 and download one of the following files.
 
-  freetype-doc-2.11.1.tar.xz
-  freetype-doc-2.11.1.tar.gz
-  ftdoc2111.zip
+  freetype-doc-2.12.0.tar.xz
+  freetype-doc-2.12.0.tar.gz
+  ftdoc2120.zip
 
 To view the documentation online, go to
 
diff --git a/builds/toplevel.mk b/builds/toplevel.mk
index 36e491be0..fb0838e98 100644
--- a/builds/toplevel.mk
+++ b/builds/toplevel.mk
@@ -304,13 +304,12 @@ do-dist: distclean refdoc
 	cp $(CONFIG_GUESS) builds/unix
 	cp $(CONFIG_SUB) builds/unix
 
-	@# Generate `ChangeLog' file with commits since previous release.
+	@# Generate `ChangeLog' file with commits since release 2.11.0
+	@# (when we stopped creating this file manually).
 	$(CHANGELOG_SCRIPT) \
 	  --format='%B%n' \
 	  --no-cluster \
-	  -- `git describe --tags \
-	                   --abbrev=0 \
-	                   $(version_tag)^`..$(version_tag) \
+	  -- VER-2-11-0..$(version_tag) \
 	> ChangeLog
 
 	@# Remove intermediate files created by the `refdoc' target.
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index f0a292e9c..cfb073efa 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:1:18'
+version_info='24:2: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 3e42cf992..2289c76b8 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.1 sources:</p>
+It compiles the following libraries from the FreeType 2.12.0 sources:</p>
 
 <ul>
   <pre>
diff --git a/builds/wince/vc2008-ce/index.html b/builds/wince/vc2008-ce/index.html
index 645675c72..de0f34058 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.1 sources:</p>
+It compiles the following libraries from the FreeType 2.12.0 sources:</p>
 
 <ul>
   <pre>
diff --git a/builds/windows/vc2010/index.html b/builds/windows/vc2010/index.html
index dcb1944b8..02b9c1b30 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.1 sources:</p>
+from the FreeType 2.12.0 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 d0c8f2f94..0dabfe2b9 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.1 sources:</p>
+It compiles the following libraries from the FreeType 2.12.0 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 b50ef79b0..d11978e37 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.1 sources:</p>
+It compiles the following libraries from the FreeType 2.12.0 sources:</p>
 
 <ul>
   <pre>
diff --git a/docs/CHANGES b/docs/CHANGES
index a8372ca89..0f2d83b69 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -10,18 +10,42 @@ CHANGES BETWEEN 2.11.1 and 2.12.0
     programs  have been  set  up  to use  'librsvg'  as the  rendering
     library.
 
-    This work was Moazin Kathri's GSoC 2019 project.
+    This work was Moazin Khatti's GSoC 2019 project.
+
 
   II. MISCELLANEOUS
 
+  - The handling of fonts with an 'sbix' table has been improved.
+
+    - Corrected bitmap offsets.
+
+    - A  new tag  `FT_PARAM_TAG_IGNORE_SBIX` for  `FT_Open_Face` makes
+      FreeType ignore an 'sbix' table in a font, allowing applications
+      to access the font's outline glyphs.
+
+    - `FT_FACE_FLAG_SBIX`  and   `FT_FACE_FLAG_SBIX_OVERLAY`  together
+      with their  corresponding preprocessor macros  `FT_HAS_SBIX` and
+      `FT_HAS_SBIX_OVERLAY` enable applications to treat 'sbix' tables
+      as described in the OpenType specification.
+
   - The internal 'zlib'  code has been updated to be  in sync with the
     current 'zlib' version (1.2.11).
 
+  - The  previously internal  load  flag  `FT_LOAD_SBITS_ONLY` is  now
+    public.
+
   - Some  minor improvements  of the  building systems,  in particular
     handling of the 'zlib' library (internal vs. external).
 
+  - Support for non-desktop Universal Windows Platform.
+
   - Various other minor bug and documentation fixes.
 
+  - The `ftdump` demo  program shows more information  for Type1 fonts
+    if option `-n` is given.
+
+  - `ftgrid` can now display embedded bitmap strikes.
+
 
 ======================================================================
 
diff --git a/docs/VERSIONS.TXT b/docs/VERSIONS.TXT
index f94d2e2f6..d2d0b3ad5 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.12.0     24.2.18   6.18.2
      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
diff --git a/docs/freetype-config.1 b/docs/freetype-config.1
index 8145c9f2e..a735f4896 100644
--- a/docs/freetype-config.1
+++ b/docs/freetype-config.1
@@ -1,4 +1,4 @@
-.TH FREETYPE-CONFIG 1 "December 2021" "FreeType 2.11.1"
+.TH FREETYPE-CONFIG 1 "March 2022" "FreeType 2.12.0"
 .
 .
 .SH NAME
diff --git a/docs/release b/docs/release
index a1ff29925..d9cff6799 100644
--- a/docs/release
+++ b/docs/release
@@ -77,13 +77,14 @@ How to prepare a new release
 
     #!/bin/sh
 
-    VERSION=2.10.4
+    VERSION=2.12.0
     SAVANNAH_USER=wl
     SOURCEFORGE_USER=wlemb
+    GPG_KEY_ID=BE6C3AAC63AD8E3F
 
     #####################################################################
 
-    GPG='/usr/bin/gpg --batch --no-tty'
+    GPG="/usr/bin/gpg --batch --no-tty --local-user $GPG_KEY_ID"
 
     version=`echo $VERSION | sed "s/\\.//g"`
 
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index a6b4e3af5..0ecd15a35 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -1541,9 +1541,10 @@ FT_BEGIN_HEADER
    *
    * @note:
    *   For backward compatibility, a font with an 'sbix' table is treated as
-   *   a bitmap-only face.  Using @FT_Open_Face with @FT_PARAM_TAG_NO_SBIX,
-   *   an application can switch off 'sbix' handling so that the face is
-   *   treated as an ordinary outline font with scalable outlines.
+   *   a bitmap-only face.  Using @FT_Open_Face with
+   *   @FT_PARAM_TAG_IGNORE_SBIX, an application can switch off 'sbix'
+   *   handling so that the face is treated as an ordinary outline font with
+   *   scalable outlines.
    *
    *   Here is some pseudo code that roughly illustrates how to implement
    *   'sbix' handling according to the OpenType specification.
@@ -4940,8 +4941,8 @@ FT_BEGIN_HEADER
    *
    */
 #define FREETYPE_MAJOR  2
-#define FREETYPE_MINOR  11
-#define FREETYPE_PATCH  1
+#define FREETYPE_MINOR  12
+#define FREETYPE_PATCH  0
 
 
   /**************************************************************************
diff --git a/src/base/ftver.rc b/src/base/ftver.rc
index c8e1ee95c..2d0cb416b 100644
--- a/src/base/ftver.rc
+++ b/src/base/ftver.rc
@@ -18,8 +18,8 @@
 
 #include<windows.h>
 
-#define FT_VERSION      2,11,1,0
-#define FT_VERSION_STR  "2.11.1"
+#define FT_VERSION      2,12,0,0
+#define FT_VERSION_STR  "2.12.0"
 
 VS_VERSION_INFO      VERSIONINFO
 FILEVERSION          FT_VERSION
@@ -45,7 +45,7 @@ BEGIN
       VALUE "FileVersion",      FT_VERSION_STR
       VALUE "ProductName",      "FreeType"
       VALUE "ProductVersion",   FT_VERSION_STR
-      VALUE "LegalCopyright",   "\251 2000-2021 The FreeType Project www.freetype.org. All rights reserved."
+      VALUE "LegalCopyright",   "\251 2000-2022 The FreeType Project www.freetype.org. All rights reserved."
       VALUE "InternalName",     "freetype"
       VALUE "OriginalFilename", FT_FILENAME
     END