summaryrefslogtreecommitdiff
path: root/Build/source/libs/freetype2/TLpatches
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2021-12-03 04:03:12 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2021-12-03 04:03:12 +0000
commit4ee9d04bd5d518e5f1f86875f4f8184fc0552f44 (patch)
tree4f27c2cc7196ba469bf631ffe0460cb3d6bcbc9d /Build/source/libs/freetype2/TLpatches
parent39bd39ea6f91fb51d118264f372905de9accc347 (diff)
freetype 2.11.1
git-svn-id: svn://tug.org/texlive/trunk@61211 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/freetype2/TLpatches')
-rw-r--r--Build/source/libs/freetype2/TLpatches/ChangeLog7
-rw-r--r--Build/source/libs/freetype2/TLpatches/TL-Changes2
-rw-r--r--Build/source/libs/freetype2/TLpatches/patch-01-support-old-compilers44
-rw-r--r--Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag36
4 files changed, 8 insertions, 81 deletions
diff --git a/Build/source/libs/freetype2/TLpatches/ChangeLog b/Build/source/libs/freetype2/TLpatches/ChangeLog
index bd26dd5638e..a9b133960e0 100644
--- a/Build/source/libs/freetype2/TLpatches/ChangeLog
+++ b/Build/source/libs/freetype2/TLpatches/ChangeLog
@@ -1,3 +1,10 @@
+2021-12-03 Akira Kakuto <kakuto@jcom.zaq.ne.jp>
+
+ Import freetype-2.11.1 source tree from:
+ http://download.savannah.gnu.org/releases/freetype.
+ Remove patch-01-support-old-compilers.
+ Remove patch-02-try-Nelson-flag.
+
2021-09-07 Mojca Miklavec <mojca.miklavec.lists@gmail.com>
Simplified patches for Solaris (fixed upstream).
diff --git a/Build/source/libs/freetype2/TLpatches/TL-Changes b/Build/source/libs/freetype2/TLpatches/TL-Changes
index 67f5ac3b1dc..19c131081bc 100644
--- a/Build/source/libs/freetype2/TLpatches/TL-Changes
+++ b/Build/source/libs/freetype2/TLpatches/TL-Changes
@@ -1,2 +1,2 @@
-Changes applied to the freetype-2.11.0/ tree as obtained from:
+Changes applied to the freetype-2.11.1/ tree as obtained from:
http://download.savannah.gnu.org/releases/freetype/.
diff --git a/Build/source/libs/freetype2/TLpatches/patch-01-support-old-compilers b/Build/source/libs/freetype2/TLpatches/patch-01-support-old-compilers
deleted file mode 100644
index 93010775b3e..00000000000
--- a/Build/source/libs/freetype2/TLpatches/patch-01-support-old-compilers
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -ur freetype-2.11.0/src/smooth/ftgrays.c freetype-src/src/smooth/ftgrays.c
---- freetype-2.11.0/src/smooth/ftgrays.c Sat Jul 17 15:51:32 2021
-+++ freetype-src/src/smooth/ftgrays.c Wed Sep 01 11:32:04 2021
-@@ -437,17 +437,16 @@
- typedef int TCoord; /* integer scanline/pixel coordinate */
- typedef int TArea; /* cell areas, coordinate products */
-
--
-- typedef struct TCell_* PCell;
--
-- typedef struct TCell_
-+ struct TCell_
- {
- TCoord x; /* same with gray_TWorker.ex */
- TCoord cover; /* same with gray_TWorker.cover */
- TArea area;
-- PCell next;
-+ struct TCell_ *next;
-+ };
-
-- } TCell;
-+ typedef struct TCell_ TCell;
-+ typedef TCell *PCell;
-
- typedef struct TPixmap_
- {
-@@ -1938,7 +1937,7 @@
- TCoord* band;
-
- int continued = 0;
--
-+ PCell null_cell;
-
- /* set up vertical bands */
- if ( height > n )
-@@ -1959,7 +1958,7 @@
- /* Initialize the null cell at the start of the `cells` array. */
- /* Note that this requires `ras.cell_free` initialization to skip */
- /* over the first entry in the array. */
-- PCell null_cell = NULL_CELL_PTR( ras );
-+ null_cell = NULL_CELL_PTR( ras );
- null_cell->x = CELL_MAX_X_VALUE;
- null_cell->area = 0;
- null_cell->cover = 0;
diff --git a/Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag b/Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag
deleted file mode 100644
index 98e233ae602..00000000000
--- a/Build/source/libs/freetype2/TLpatches/patch-02-try-Nelson-flag
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur freetype-2.11.0/src/dlg/dlg.c freetype-src/src/dlg/dlg.c
---- freetype-2.11.0/src/dlg/dlg.c Tue Jul 20 01:08:21 2021
-+++ freetype-src/src/dlg/dlg.c Thu Sep 02 10:32:31 2021
-@@ -2,7 +2,7 @@
- // Distributed under the Boost Software License, Version 1.0.
- // See accompanying file LICENSE or copy at http://www.boost.org/LICENSE_1_0.txt
-
--#define _XOPEN_SOURCE
-+#define _XOPEN_SOURCE 600
- #define _POSIX_C_SOURCE 200809L
- #define _WIN32_WINNT 0x0600
-
-diff -ur freetype-2.11.0/src/dlg/dlgwrap.c freetype-src/src/dlg/dlgwrap.c
---- freetype-2.11.0/src/dlg/dlgwrap.c Sat Feb 13 17:16:54 2021
-+++ freetype-src/src/dlg/dlgwrap.c Thu Sep 02 10:32:53 2021
-@@ -18,7 +18,7 @@
-
- /* We have to duplicate these feature test macros from `dlg.c` */
- /* since `freetype.h` loads some affected standard headers. */
--#define _XOPEN_SOURCE
-+#define _XOPEN_SOURCE 600
- #define _POSIX_C_SOURCE 200809L
-
- #include <freetype/freetype.h>
-diff -ur freetype-2.11.0/src/tools/ftrandom/ftrandom.c freetype-src/src/tools/ftrandom/ftrandom.c
---- freetype-2.11.0/src/tools/ftrandom/ftrandom.c Thu Aug 27 15:17:20 2020
-+++ freetype-src/src/tools/ftrandom/ftrandom.c Thu Sep 02 10:28:03 2021
-@@ -29,7 +29,7 @@
- /* This file is now part of the FreeType library */
-
-
--#define _XOPEN_SOURCE 500 /* for `kill', `strdup', `random', and `srandom' */
-+#define _XOPEN_SOURCE 600 /* for `kill', `strdup', `random', and `srandom' */
-
-
- #include <stdio.h>