Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit/fonttosfnt/dist initial import of fonttosfnt-...
details: https://anonhg.NetBSD.org/xsrc/rev/4d38abe6e624
branches: trunk
changeset: 10744:4d38abe6e624
user: mrg <mrg%NetBSD.org@localhost>
date: Sat Jul 10 23:20:16 2021 +0000
description:
initial import of fonttosfnt-1.2.2
diffstat:
external/mit/fonttosfnt/dist/ChangeLog | 22 +++++++++++++++++
external/mit/fonttosfnt/dist/Makefile.in | 1 +
external/mit/fonttosfnt/dist/aclocal.m4 | 4 +-
external/mit/fonttosfnt/dist/configure | 34 ++++++++++++++++++--------
external/mit/fonttosfnt/dist/configure.ac | 4 +-
external/mit/fonttosfnt/dist/man/Makefile.in | 1 +
external/mit/fonttosfnt/dist/write.c | 35 +++++++++++++++------------
7 files changed, 70 insertions(+), 31 deletions(-)
diffs (truncated from 335 to 300 lines):
diff -r 3403ccbf39d6 -r 4d38abe6e624 external/mit/fonttosfnt/dist/ChangeLog
--- a/external/mit/fonttosfnt/dist/ChangeLog Sun Jul 04 07:03:16 2021 +0000
+++ b/external/mit/fonttosfnt/dist/ChangeLog Sat Jul 10 23:20:16 2021 +0000
@@ -1,3 +1,25 @@
+commit 2726947ea34653a90f89163849887c11179b2d6d
+Author: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+Date: Tue Jun 15 10:33:54 2021 +1000
+
+ Bump to 1.2.2
+
+commit 9ea3677ba344c7ebd47f8078d11f69d117b9541e
+Author: Christopher Zimmermann <madroach%gmerlin.de@localhost>
+Date: Mon Oct 26 12:17:45 2020 +0100
+
+ 1em is font size, not height
+
+commit 49524b5db4867b5e896ed299fd66b390e68f1ffc
+Author: Peter Hutterer <peter.hutterer%who-t.net@localhost>
+Date: Tue May 25 09:50:45 2021 +1000
+
+ Fail if ftell fails
+
+ Fixes a coverity warning: ftell may return -1 on error which we then pass into
+ fseek later. We properly fail there anyway, so this change is unlikely to have
+ any real effect.
+
commit 33f944705c6c42e1b52f6ec62131d31f737c638f
Author: Peter Hutterer <peter.hutterer%who-t.net@localhost>
Date: Wed Dec 16 15:14:11 2020 +1000
diff -r 3403ccbf39d6 -r 4d38abe6e624 external/mit/fonttosfnt/dist/Makefile.in
--- a/external/mit/fonttosfnt/dist/Makefile.in Sun Jul 04 07:03:16 2021 +0000
+++ b/external/mit/fonttosfnt/dist/Makefile.in Sat Jul 10 23:20:16 2021 +0000
@@ -369,6 +369,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -r 3403ccbf39d6 -r 4d38abe6e624 external/mit/fonttosfnt/dist/aclocal.m4
--- a/external/mit/fonttosfnt/dist/aclocal.m4 Sun Jul 04 07:03:16 2021 +0000
+++ b/external/mit/fonttosfnt/dist/aclocal.m4 Sat Jul 10 23:20:16 2021 +0000
@@ -403,7 +403,7 @@
# See the "minimum version" comment for each macro you use to see what
# version you require.
m4_defun([XORG_MACROS_VERSION],[
-m4_define([vers_have], [1.19.2])
+m4_define([vers_have], [1.19.3])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,
@@ -423,7 +423,7 @@
# such as man pages and config files
AC_DEFUN([XORG_PROG_RAWCPP],[
AC_REQUIRE([AC_PROG_CPP])
-AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
+AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}],
[$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
# Check for flag to avoid builtin definitions - assumes unix is predefined,
diff -r 3403ccbf39d6 -r 4d38abe6e624 external/mit/fonttosfnt/dist/configure
--- a/external/mit/fonttosfnt/dist/configure Sun Jul 04 07:03:16 2021 +0000
+++ b/external/mit/fonttosfnt/dist/configure Sat Jul 10 23:20:16 2021 +0000
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for fonttosfnt 1.2.1.
+# Generated by GNU Autoconf 2.69 for fonttosfnt 1.2.2.
#
# Report bugs to <https://gitlab.freedesktop.org/xorg/app/fonttosfnt/issues>.
#
@@ -581,8 +581,8 @@
# Identity of this package.
PACKAGE_NAME='fonttosfnt'
PACKAGE_TARNAME='fonttosfnt'
-PACKAGE_VERSION='1.2.1'
-PACKAGE_STRING='fonttosfnt 1.2.1'
+PACKAGE_VERSION='1.2.2'
+PACKAGE_STRING='fonttosfnt 1.2.2'
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/fonttosfnt/issues'
PACKAGE_URL=''
@@ -727,6 +727,7 @@
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -807,6 +808,7 @@
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1059,6 +1061,15 @@
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1196,7 +1207,7 @@
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
- libdir localedir mandir
+ libdir localedir mandir runstatedir
do
eval ac_val=\$$ac_var
# Remove trailing slashes.
@@ -1309,7 +1320,7 @@
# 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 fonttosfnt 1.2.1 to adapt to many kinds of systems.
+\`configure' configures fonttosfnt 1.2.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1349,6 +1360,7 @@
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -1379,7 +1391,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of fonttosfnt 1.2.1:";;
+ short | recursive ) echo "Configuration of fonttosfnt 1.2.2:";;
esac
cat <<\_ACEOF
@@ -1485,7 +1497,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-fonttosfnt configure 1.2.1
+fonttosfnt configure 1.2.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1809,7 +1821,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by fonttosfnt $as_me 1.2.1, which was
+It was created by fonttosfnt $as_me 1.2.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2677,7 +2689,7 @@
# Define the identity of the package.
PACKAGE='fonttosfnt'
- VERSION='1.2.1'
+ VERSION='1.2.2'
cat >>confdefs.h <<_ACEOF
@@ -11372,7 +11384,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by fonttosfnt $as_me 1.2.1, which was
+This file was extended by fonttosfnt $as_me 1.2.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -11438,7 +11450,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-fonttosfnt config.status 1.2.1
+fonttosfnt config.status 1.2.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -r 3403ccbf39d6 -r 4d38abe6e624 external/mit/fonttosfnt/dist/configure.ac
--- a/external/mit/fonttosfnt/dist/configure.ac Sun Jul 04 07:03:16 2021 +0000
+++ b/external/mit/fonttosfnt/dist/configure.ac Sat Jul 10 23:20:16 2021 +0000
@@ -1,6 +1,6 @@
dnl Copyright 2005 Red Hat, Inc.
-dnl
+dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
dnl documentation for any purpose is hereby granted without fee, provided that
dnl the above copyright notice appear in all copies and that both that
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT(fonttosfnt,[1.2.1], [https://gitlab.freedesktop.org/xorg/app/fonttosfnt/issues],fonttosfnt)
+AC_INIT(fonttosfnt,[1.2.2], [https://gitlab.freedesktop.org/xorg/app/fonttosfnt/issues],fonttosfnt)
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
diff -r 3403ccbf39d6 -r 4d38abe6e624 external/mit/fonttosfnt/dist/man/Makefile.in
--- a/external/mit/fonttosfnt/dist/man/Makefile.in Sun Jul 04 07:03:16 2021 +0000
+++ b/external/mit/fonttosfnt/dist/man/Makefile.in Sat Jul 10 23:20:16 2021 +0000
@@ -261,6 +261,7 @@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
+runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
diff -r 3403ccbf39d6 -r 4d38abe6e624 external/mit/fonttosfnt/dist/write.c
--- a/external/mit/fonttosfnt/dist/write.c Sun Jul 04 07:03:16 2021 +0000
+++ b/external/mit/fonttosfnt/dist/write.c Sat Jul 10 23:20:16 2021 +0000
@@ -238,66 +238,65 @@
if (count) font->metrics.awidth = sumAwidth / count;
- font->metrics.height = TWO_SIXTEENTH;
+ font->metrics.size = TWO_SIXTEENTH;
if(font->pxMetrics.size == UNDEF) {
font->pxMetrics.size = font->pxMetrics.height;
- font->metrics.size = font->metrics.height;
}
- font->metrics.size = font->pxMetrics.size
- * TWO_SIXTEENTH / font->pxMetrics.height;
+ font->metrics.height = font->pxMetrics.height
+ * font->metrics.size / font->pxMetrics.size;
if(font->pxMetrics.ascent == UNDEF) {
font->metrics.ascent = font->metrics.maxY;
font->pxMetrics.ascent =
font->metrics.ascent
- * font->pxMetrics.height / TWO_SIXTEENTH;
+ * font->pxMetrics.size / font->metrics.size;
}
else
font->metrics.ascent =
font->pxMetrics.ascent
- * TWO_SIXTEENTH / font->pxMetrics.height;
+ * font->metrics.size / font->pxMetrics.size;
if(font->pxMetrics.descent == UNDEF) {
font->metrics.descent = - font->metrics.minY;
font->pxMetrics.descent =
font->metrics.descent
- * font->pxMetrics.height / TWO_SIXTEENTH;
+ * font->pxMetrics.size / font->metrics.size;
}
else
font->metrics.descent =
font->pxMetrics.descent
- * TWO_SIXTEENTH / font->pxMetrics.height;
+ * font->metrics.size / font->pxMetrics.size;
if(font->pxMetrics.capHeight == UNDEF) {
if(glyphMetrics(font, 'X', NULL, NULL, NULL, NULL, &font->metrics.capHeight) != 1)
font->metrics.capHeight = font->metrics.ascent;
font->pxMetrics.capHeight =
- font->metrics.capHeight * font->pxMetrics.height / TWO_SIXTEENTH;
+ font->metrics.capHeight * font->pxMetrics.size / font->metrics.size;
}
else
font->metrics.capHeight =
font->pxMetrics.capHeight
- * TWO_SIXTEENTH / font->pxMetrics.height;
+ * font->metrics.size / font->pxMetrics.size;
if(font->pxMetrics.xHeight == UNDEF) {
if(glyphMetrics(font, 'x', NULL, NULL, NULL, NULL, &font->metrics.xHeight) != 1)
font->metrics.xHeight = font->metrics.capHeight * 2 / 3;
font->pxMetrics.xHeight =
- font->metrics.xHeight * font->pxMetrics.height / TWO_SIXTEENTH;
+ font->metrics.xHeight * font->pxMetrics.size / font->metrics.size;
}
else
font->metrics.xHeight =
font->pxMetrics.xHeight
- * TWO_SIXTEENTH / font->pxMetrics.height;
+ * font->metrics.size / font->pxMetrics.size;
if(font->pxMetrics.underlinePosition == UNDEF)
font->metrics.underlinePosition = - font->metrics.descent * 2;
Home |
Main Index |
Thread Index |
Old Index