From 3fed8e215415fdfc865acc39c39dbc4666b60e74 Mon Sep 17 00:00:00 2001
From: Akira Kakuto
Date: Sat, 24 Jun 2023 23:23:54 +0000
Subject: freetype 2.13.1
git-svn-id: svn://tug.org/texlive/trunk@67463 c570f23f-e606-0410-a88d-b1316a301751
---
.../libs/freetype2/freetype-src/builds/mac/README | 8 ------
.../freetype-src/builds/meson/parse_modules_cfg.py | 6 ++++-
.../freetype-src/builds/unix/config.guess | 6 ++---
.../freetype2/freetype-src/builds/unix/config.sub | 8 +++---
.../freetype2/freetype-src/builds/unix/configure | 20 +++++++--------
.../freetype-src/builds/unix/configure.ac | 4 +--
.../freetype-src/builds/unix/configure.raw | 2 +-
.../freetype-src/builds/vms/LIBS.OPT_IA64 | Bin 82 -> 0 bytes
.../freetype-src/builds/vms/_LINK.OPT_IA64 | Bin 14464 -> 0 bytes
.../freetype-src/builds/vms/apinames_vms.bash | 2 ++
.../freetype2/freetype-src/builds/vms/vmslib.dat | 28 ---------------------
.../freetype-src/builds/wince/vc2005-ce/index.html | 2 +-
.../freetype-src/builds/wince/vc2008-ce/index.html | 2 +-
.../builds/windows/vc2010/freetype.vcxproj | 16 ++++++------
.../freetype-src/builds/windows/vc2010/index.html | 2 +-
.../freetype-src/builds/windows/visualc/index.html | 2 +-
.../builds/windows/visualce/index.html | 2 +-
17 files changed, 40 insertions(+), 70 deletions(-)
delete mode 100644 Build/source/libs/freetype2/freetype-src/builds/vms/LIBS.OPT_IA64
delete mode 100644 Build/source/libs/freetype2/freetype-src/builds/vms/_LINK.OPT_IA64
create mode 100644 Build/source/libs/freetype2/freetype-src/builds/vms/apinames_vms.bash
delete mode 100644 Build/source/libs/freetype2/freetype-src/builds/vms/vmslib.dat
(limited to 'Build/source/libs/freetype2/freetype-src/builds')
diff --git a/Build/source/libs/freetype2/freetype-src/builds/mac/README b/Build/source/libs/freetype2/freetype-src/builds/mac/README
index 092487a8424..06e3d51da86 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/mac/README
+++ b/Build/source/libs/freetype2/freetype-src/builds/mac/README
@@ -200,14 +200,6 @@ environment by Metrowerks. GCC for MPW and Symantec
behaviours are not tested at all. Building ftdemos
for classic MacOS and working test is required.
- 4-3. Porting Jam onto MPW
- -------------------------
-
- FreeType uses Jam (and FT-Jam) for unified cross-
- platform building tool. At present, Jam is not ported
- to MPW. To update classic MacOS support easily,
- building by Jam is expected on MPW.
-
APPENDIX I
----------
diff --git a/Build/source/libs/freetype2/freetype-src/builds/meson/parse_modules_cfg.py b/Build/source/libs/freetype2/freetype-src/builds/meson/parse_modules_cfg.py
index 6030bb2098d..d48129fe72e 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/meson/parse_modules_cfg.py
+++ b/Build/source/libs/freetype2/freetype-src/builds/meson/parse_modules_cfg.py
@@ -97,8 +97,12 @@ def generate_ftmodule(lists):
for module in lists["AUX_MODULES"]:
if module in ("psaux", "psnames", "otvalid", "gxvalid"):
+ name = {
+ "gxvalid": "gxv",
+ "otvalid": "otv",
+ }.get(module, module)
result += (
- "FT_USE_MODULE( FT_Module_Class, %s_module_class )\n" % module
+ "FT_USE_MODULE( FT_Module_Class, %s_module_class )\n" % name
)
result += "/* EOF */\n"
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/config.guess b/Build/source/libs/freetype2/freetype-src/builds/unix/config.guess
index 980b0208381..69188da73d7 100755
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/config.guess
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2022 Free Software Foundation, Inc.
+# Copyright 1992-2023 Free Software Foundation, Inc.
# shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2022-09-17'
+timestamp='2023-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -60,7 +60,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2022 Free Software Foundation, Inc.
+Copyright 1992-2023 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub b/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub
index baf1512b3c0..de4259e4047 100755
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2022 Free Software Foundation, Inc.
+# Copyright 1992-2023 Free Software Foundation, Inc.
# shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2022-09-17'
+timestamp='2023-01-21'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -76,7 +76,7 @@ Report bugs and patches to ."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2022 Free Software Foundation, Inc.
+Copyright 1992-2023 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -1075,7 +1075,7 @@ case $cpu-$vendor in
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
cpu=i586
;;
- pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
+ pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*)
cpu=i686
;;
pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/configure b/Build/source/libs/freetype2/freetype-src/builds/unix/configure
index 99499ceebe1..ee82443f43e 100755
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/configure
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for FreeType 2.13.
+# Generated by GNU Autoconf 2.71 for FreeType 2.13.1.
#
# Report bugs to .
#
@@ -621,8 +621,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='FreeType'
PACKAGE_TARNAME='freetype'
-PACKAGE_VERSION='2.13'
-PACKAGE_STRING='FreeType 2.13'
+PACKAGE_VERSION='2.13.1'
+PACKAGE_STRING='FreeType 2.13.1'
PACKAGE_BUGREPORT='freetype@nongnu.org'
PACKAGE_URL=''
@@ -1395,7 +1395,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures FreeType 2.13 to adapt to many kinds of systems.
+\`configure' configures FreeType 2.13.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1462,7 +1462,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of FreeType 2.13:";;
+ short | recursive ) echo "Configuration of FreeType 2.13.1:";;
esac
cat <<\_ACEOF
@@ -1623,7 +1623,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-FreeType configure 2.13
+FreeType configure 2.13.1
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1974,7 +1974,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by FreeType $as_me 2.13, which was
+It was created by FreeType $as_me 2.13.1, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -2736,7 +2736,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Don't forget to update `docs/VERSIONS.TXT'!
-version_info='25:0:19'
+version_info='26:0:20'
ft_version=`echo $version_info | tr : .`
@@ -17036,7 +17036,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by FreeType $as_me 2.13, which was
+This file was extended by FreeType $as_me 2.13.1, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17104,7 +17104,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-FreeType config.status 2.13
+FreeType config.status 2.13.1
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac
index a98865a432d..9709b6a49a2 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.ac
@@ -11,13 +11,13 @@
# indicate that you have read the license and understand and accept it
# fully.
-AC_INIT([FreeType], [2.13], [freetype@nongnu.org], [freetype])
+AC_INIT([FreeType], [2.13.1], [freetype@nongnu.org], [freetype])
AC_CONFIG_SRCDIR([ftconfig.h.in])
# Don't forget to update `docs/VERSIONS.TXT'!
-version_info='25:0:19'
+version_info='26:0:20'
AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version])
diff --git a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw
index 8e982835e9f..2c152022f02 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw
+++ b/Build/source/libs/freetype2/freetype-src/builds/unix/configure.raw
@@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.h.in])
# Don't forget to update `docs/VERSIONS.TXT'!
-version_info='25:0:19'
+version_info='26:0:20'
AC_SUBST([version_info])
ft_version=`echo $version_info | tr : .`
AC_SUBST([ft_version])
diff --git a/Build/source/libs/freetype2/freetype-src/builds/vms/LIBS.OPT_IA64 b/Build/source/libs/freetype2/freetype-src/builds/vms/LIBS.OPT_IA64
deleted file mode 100644
index 6768c7662d4..00000000000
Binary files a/Build/source/libs/freetype2/freetype-src/builds/vms/LIBS.OPT_IA64 and /dev/null differ
diff --git a/Build/source/libs/freetype2/freetype-src/builds/vms/_LINK.OPT_IA64 b/Build/source/libs/freetype2/freetype-src/builds/vms/_LINK.OPT_IA64
deleted file mode 100644
index b8cbd1bc781..00000000000
Binary files a/Build/source/libs/freetype2/freetype-src/builds/vms/_LINK.OPT_IA64 and /dev/null differ
diff --git a/Build/source/libs/freetype2/freetype-src/builds/vms/apinames_vms.bash b/Build/source/libs/freetype2/freetype-src/builds/vms/apinames_vms.bash
new file mode 100644
index 00000000000..e9b1b727b41
--- /dev/null
+++ b/Build/source/libs/freetype2/freetype-src/builds/vms/apinames_vms.bash
@@ -0,0 +1,2 @@
+src/tools/apinames -wV include/freetype/*.h > freetype_vms0.opt
+mv freetype_vms0.opt freetype_vms.opt
diff --git a/Build/source/libs/freetype2/freetype-src/builds/vms/vmslib.dat b/Build/source/libs/freetype2/freetype-src/builds/vms/vmslib.dat
deleted file mode 100644
index 4c817da441d..00000000000
--- a/Build/source/libs/freetype2/freetype-src/builds/vms/vmslib.dat
+++ /dev/null
@@ -1,28 +0,0 @@
-!
-! This is a simple driver file with information used by make.com to
-! check if external libraries (like t1lib and freetype) are available on
-! the system.
-!
-! Layout of the file:
-!
-! - Lines starting with ! are treated as comments
-! - Elements in a data line are separated by # signs
-! - The elements need to be listed in the following order
-! 1.) Name of the Library
-! 2.) Location where the object library can be found
-! 3.) Location where the include files for the library can be found
-! 4.) Include file used to verify library location
-! 5.) CPP define to pass to the build to indicate availability of
-! the library
-!
-! Example: The following lines show how definitions
-! might look like. They are site specific and the locations of the
-! library and include files need almost certainly to be changed.
-!
-! Location: All of the libaries can be found at the following addresses
-!
-! ZLIB: http://www.decus.de:8080/www/vms/sw/zlib.htmlx
-!
-BZ2LIB # sys$library:libbz2.olb # decc$user_include: # bzlib.h # FT_CONFIG_OPTION_SYSTEM_ZLIB
-PNGLIB # sys$library:libpng.olb # sys$library: # png.h # FT_CONFIG_OPTION_SYSTEM_ZLIB
-ZLIB # sys$library:libz.olb # sys$library: # zlib.h # FT_CONFIG_OPTION_SYSTEM_ZLIB
diff --git a/Build/source/libs/freetype2/freetype-src/builds/wince/vc2005-ce/index.html b/Build/source/libs/freetype2/freetype-src/builds/wince/vc2005-ce/index.html
index 0a8b3c660f2..cef32c12e0a 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/wince/vc2005-ce/index.html
+++ b/Build/source/libs/freetype2/freetype-src/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.13.0 sources:
+It compiles the following libraries from the FreeType 2.13.1 sources:
diff --git a/Build/source/libs/freetype2/freetype-src/builds/wince/vc2008-ce/index.html b/Build/source/libs/freetype2/freetype-src/builds/wince/vc2008-ce/index.html
index 747370aa94f..1d36f602177 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/wince/vc2008-ce/index.html
+++ b/Build/source/libs/freetype2/freetype-src/builds/wince/vc2008-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.13.0 sources:
+It compiles the following libraries from the FreeType 2.13.1 sources:
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj b/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj
index 4c9e2b497cf..671d124502f 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/freetype.vcxproj
@@ -168,7 +168,7 @@
Level4
ProgramDatabase
Default
- 4001
+ 4001;4267
true
$(OutDir)$(TargetName).pdb
Disabled
@@ -195,7 +195,7 @@
Level4
ProgramDatabase
Default
- 4001
+ 4001;4267
true
$(OutDir)$(TargetName).pdb
Disabled
@@ -248,7 +248,7 @@
Level4
ProgramDatabase
Default
- 4001
+ 4001;4267
true
$(OutDir)$(TargetName).pdb
Disabled
@@ -274,7 +274,7 @@
Level4
ProgramDatabase
Default
- 4001
+ 4001;4267
true
$(OutDir)$(TargetName).pdb
Disabled
@@ -328,7 +328,7 @@
true
Level4
Default
- 4001
+ 4001;4267
true
NotSet
true
@@ -356,7 +356,7 @@
true
Level4
Default
- 4001
+ 4001;4267
true
true
@@ -409,7 +409,7 @@
true
Level4
Default
- 4001
+ 4001;4267
true
NotSet
true
@@ -435,7 +435,7 @@
true
Level4
Default
- 4001
+ 4001;4267
true
true
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/index.html b/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/index.html
index c03be775e7f..95e27e628ca 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/index.html
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/vc2010/index.html
@@ -12,7 +12,7 @@
This directory contains solution and project files for
Visual C++ 2010 or newer, named freetype.sln,
and freetype.vcxproj. It compiles the following libraries
-from the FreeType 2.13.0 sources:
+from the FreeType 2.13.1 sources:
- freetype.dll using 'Release' or 'Debug' configurations
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/index.html b/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/index.html
index 6a70b34b136..de957a61a6d 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/index.html
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/visualc/index.html
@@ -12,7 +12,7 @@
This directory contains project files freetype.dsp for
Visual C++ 6.0, and freetype.vcproj for Visual C++ 2002
through 2008, which you might need to upgrade automatically.
-It compiles the following libraries from the FreeType 2.13.0 sources:
+It compiles the following libraries from the FreeType 2.13.1 sources:
- freetype.dll using 'Release' or 'Debug' configurations
diff --git a/Build/source/libs/freetype2/freetype-src/builds/windows/visualce/index.html b/Build/source/libs/freetype2/freetype-src/builds/windows/visualce/index.html
index cebab29a0f0..706924a74ec 100644
--- a/Build/source/libs/freetype2/freetype-src/builds/windows/visualce/index.html
+++ b/Build/source/libs/freetype2/freetype-src/builds/windows/visualce/index.html
@@ -21,7 +21,7 @@ the following targets:
- PPC/SP WM6 (Windows Mobile 6)
-It compiles the following libraries from the FreeType 2.13.0 sources:
+It compiles the following libraries from the FreeType 2.13.1 sources:
--
cgit v1.2.3