Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit/libXfont2/dist initial import of libXfont2-2.0.6
details: https://anonhg.NetBSD.org/xsrc/rev/d2438ffb42a7
branches: trunk
changeset: 7145:d2438ffb42a7
user: mrg <mrg%NetBSD.org@localhost>
date: Fri Sep 09 03:35:52 2022 +0000
description:
initial import of libXfont2-2.0.6
diffstat:
external/mit/libXfont2/dist/ChangeLog | 81 +
external/mit/libXfont2/dist/Makefile.am | 2 +-
external/mit/libXfont2/dist/Makefile.in | 20 +-
external/mit/libXfont2/dist/README.md | 4 +-
external/mit/libXfont2/dist/aclocal.m4 | 260 +++--
external/mit/libXfont2/dist/config.sub | 21 +-
external/mit/libXfont2/dist/configure | 444 ++++++--
external/mit/libXfont2/dist/configure.ac | 13 +-
external/mit/libXfont2/dist/doc/Makefile.in | 6 +-
external/mit/libXfont2/dist/doc/fontlib.xml | 2 +-
external/mit/libXfont2/dist/ltmain.sh | 879 +++++++++++------
external/mit/libXfont2/dist/src/FreeType/ftfuncs.c | 6 +-
external/mit/libXfont2/dist/src/FreeType/xttcap.c | 2 +-
external/mit/libXfont2/dist/src/bitmap/bdfread.c | 4 +-
external/mit/libXfont2/dist/src/bitmap/pcfread.c | 2 +-
external/mit/libXfont2/dist/src/bitmap/snfstr.h | 2 +-
external/mit/libXfont2/dist/src/fc/fserve.c | 6 +-
external/mit/libXfont2/dist/src/fontfile/decompress.c | 2 +-
external/mit/libXfont2/dist/src/fontfile/dirfile.c | 4 +-
external/mit/libXfont2/dist/src/fontfile/fontdir.c | 9 +-
external/mit/libXfont2/dist/src/fontfile/fontfile.c | 4 +-
external/mit/libXfont2/dist/src/util/utilbitmap.c | 2 +-
external/mit/libXfont2/dist/xfont2.pc.in | 2 +-
23 files changed, 1215 insertions(+), 562 deletions(-)
diffs (truncated from 3889 to 300 lines):
diff -r 1877893c882e -r d2438ffb42a7 external/mit/libXfont2/dist/ChangeLog
--- a/external/mit/libXfont2/dist/ChangeLog Fri Sep 09 03:35:49 2022 +0000
+++ b/external/mit/libXfont2/dist/ChangeLog Fri Sep 09 03:35:52 2022 +0000
@@ -1,3 +1,84 @@
+commit d54aaf2483df6a1f98fadc09004157e657b7f73e
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Fri Aug 26 16:22:15 2022 -0700
+
+ libXfont2 2.0.6
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit efb287223612e9225e5089bed76e348c236b15f0
+Author: Peter Harris <pharris%opentext.com@localhost>
+Date: Thu Mar 25 15:56:31 2021 -0400
+
+ Fix buffer overrun in FontFileMakeDir on WIN32
+
+ When dirName is "" (eg. when called by BuiltinReadDirectory),
+ FontFileMakeDir would read after the string when WIN32 is defined.
+
+ Fix the overrun issue by checking the location of the found :
+ before adding two.
+
+ Signed-off-by: Peter Harris <pharris%opentext.com@localhost>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 3c8fdf6e35bed077a5614b4094770e668c96b9e9
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Tue Jun 21 17:37:32 2022 -0700
+
+ Fix comments to reflect removal of OS/2 support
+
+ Commit 6c29007756301 removed OS/2 support from the code,
+ but missed updating the comments to match.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 8e3d94c867741319bf75b47266176cf677218641
+Author: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+Date: Mon Jun 20 23:32:52 2022 -0700
+
+ Correct fsCreateACReq length
+
+ Regressed-in: 6972ea08ee5b2ef1cfbdc2fcaf14f06bbd391561
+ Fixes: https://gitlab.freedesktop.org/xorg/lib/libxfont/-/issues/13
+ Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu%apple.com@localhost>
+
+commit 5cb3b8809b9f141a2cf8a4e00a8387c75dc6bc10
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Mon Jun 20 12:30:41 2022 -0700
+
+ configure: Use pkg-config to handle zlib dependency if possible
+
+ Preserves fallback for systems like darwin without zlib.pc
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 12bed78985af1da2d1f4954a3491ee497a878b23
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Wed Apr 6 14:37:42 2022 -0700
+
+ Fix spelling/wording issues
+
+ Found by using:
+ codespell --builtin clear,rare,usage,informal,code,names
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit f83ea5e953c6904578a458e2c2bc2e1d5ae3cb47
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Wed Apr 6 14:14:21 2022 -0700
+
+ Build xz tarballs instead of bzip2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit a6aee4c9a41a95a0509f654beca27009671731b3
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Wed Apr 6 14:10:16 2022 -0700
+
+ gitlab CI: add a basic build test
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
commit 3a4f68284c5aeea77789af1fe395cac35efc8562
Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
Date: Sun Aug 1 17:36:43 2021 -0700
diff -r 1877893c882e -r d2438ffb42a7 external/mit/libXfont2/dist/Makefile.am
--- a/external/mit/libXfont2/dist/Makefile.am Fri Sep 09 03:35:49 2022 +0000
+++ b/external/mit/libXfont2/dist/Makefile.am Fri Sep 09 03:35:52 2022 +0000
@@ -66,7 +66,7 @@
libXfont2_la_LDFLAGS = -version-number 2:0:0 -no-undefined
-libXfont2_la_LIBADD = $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS) $(LTLIBOBJS)
+libXfont2_la_LIBADD = $(ZLIB_LIBS) $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS) $(LTLIBOBJS)
if XFONT_FONTFILE
libXfont2_la_SOURCES += \
diff -r 1877893c882e -r d2438ffb42a7 external/mit/libXfont2/dist/Makefile.in
--- a/external/mit/libXfont2/dist/Makefile.in Fri Sep 09 03:35:49 2022 +0000
+++ b/external/mit/libXfont2/dist/Makefile.in Fri Sep 09 03:35:52 2022 +0000
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.16.4 from Makefile.am.
+# Makefile.in generated by automake 1.16.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2021 Free Software Foundation, Inc.
@@ -227,8 +227,8 @@
am__dirstamp = $(am__leading_dot)dirstamp
@XFONT_FREETYPE_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
libXfont2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) $(LTLIBOBJS) \
- $(am__DEPENDENCIES_2)
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(LTLIBOBJS) $(am__DEPENDENCIES_2)
am__libXfont2_la_SOURCES_DIST = src/stubs/atom.c \
src/stubs/libxfontstubs.c src/util/fontaccel.c \
src/util/fontnames.c src/util/fontutil.c src/util/fontxlfd.c \
@@ -482,9 +482,9 @@
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
done; \
reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
GZIP_ENV = --best
-DIST_TARGETS = dist-bzip2 dist-gzip
+DIST_TARGETS = dist-xz dist-gzip
# Exists only to be overridden by the user if desired.
AM_DISTCHECK_DVI_TARGET = dvi
distuninstallcheck_listfiles = find . -type f -print
@@ -527,6 +527,7 @@
ETAGS = @ETAGS@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+FILECMD = @FILECMD@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
FOP = @FOP@
@@ -591,7 +592,10 @@
XORG_SGML_PATH = @XORG_SGML_PATH@
XSL_STYLESHEET = @XSL_STYLESHEET@
X_GZIP_FONT_COMPRESSION = @X_GZIP_FONT_COMPRESSION@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+ZLIB_LIBS = @ZLIB_LIBS@
Z_LIBS = @Z_LIBS@
+Z_REQUIRES = @Z_REQUIRES@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -683,8 +687,8 @@
$(am__append_9) $(am__append_10) $(am__append_11) \
$(am__append_12)
libXfont2_la_LDFLAGS = -version-number 2:0:0 -no-undefined
-libXfont2_la_LIBADD = $(Z_LIBS) $(MATH_LIBS) $(XFONT_LIBS) \
- $(LTLIBOBJS) $(am__append_4)
+libXfont2_la_LIBADD = $(ZLIB_LIBS) $(Z_LIBS) $(MATH_LIBS) \
+ $(XFONT_LIBS) $(LTLIBOBJS) $(am__append_4)
# Test utilities
EXTRA_DIST = src/builtins/buildfont README.md test/utils/README
@@ -1303,6 +1307,7 @@
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
+
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
$(am__post_remove_distdir)
@@ -1310,7 +1315,6 @@
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
$(am__post_remove_distdir)
-
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__post_remove_distdir)
diff -r 1877893c882e -r d2438ffb42a7 external/mit/libXfont2/dist/README.md
--- a/external/mit/libXfont2/dist/README.md Fri Sep 09 03:35:49 2022 +0000
+++ b/external/mit/libXfont2/dist/README.md Fri Sep 09 03:35:52 2022 +0000
@@ -52,7 +52,7 @@
- Font services:
- * xfs font servers - allows retreiving fonts as a client of an xfs server.
+ * xfs font servers - allows retrieving fonts as a client of an xfs server.
Enabled by default, disable via --disable-fc (font client).
If enabled, you can also use the standard libxtrans flags to
@@ -74,7 +74,7 @@
https://lists.x.org/mailman/listinfo/xorg
-The master development code repository can be found at:
+The primary development code repository can be found at:
https://gitlab.freedesktop.org/xorg/lib/libXfont
diff -r 1877893c882e -r d2438ffb42a7 external/mit/libXfont2/dist/aclocal.m4
--- a/external/mit/libXfont2/dist/aclocal.m4 Fri Sep 09 03:35:49 2022 +0000
+++ b/external/mit/libXfont2/dist/aclocal.m4 Fri Sep 09 03:35:52 2022 +0000
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.16.4 -*- Autoconf -*-
+# generated automatically by aclocal 1.16.5 -*- Autoconf -*-
# Copyright (C) 1996-2021 Free Software Foundation, Inc.
@@ -35,7 +35,7 @@
[am__api_version='1.16'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.4], [],
+m4_if([$1], [1.16.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.4])dnl
+[AM_AUTOMAKE_VERSION([1.16.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -428,6 +428,10 @@
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
[AC_PREREQ([2.65])dnl
+m4_ifdef([_$0_ALREADY_INIT],
+ [m4_fatal([$0 expanded multiple times
+]m4_defn([_$0_ALREADY_INIT]))],
+ [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl
dnl Autoconf wants to disallow AM_ names. We explicitly allow
dnl the ones we care about.
m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -3516,7 +3520,8 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
-# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software
+# Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -3547,7 +3552,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
])
-# serial 58 LT_INIT
+# serial 59 LT_INIT
# LT_PREREQ(VERSION)
@@ -3697,6 +3702,7 @@
m4_require([_LT_CHECK_SHELL_FEATURES])dnl
m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_DECL_FILECMD])dnl
m4_require([_LT_CHECK_MAGIC_METHOD])dnl
m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
m4_require([_LT_CMD_OLD_ARCHIVE])dnl
@@ -3735,8 +3741,8 @@
ofile=libtool
can_build_shared=yes
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
+# All known linkers require a '.a' archive for static linking (except MSVC and
+# ICC, which need '.lib').
libext=a
with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -4288,7 +4294,7 @@
# if finds mixed CR/LF and LF-only lines. Since sed operates in
# text mode, it properly converts lines to CR/LF. This bash problem
# is reportedly fixed, but why not run on old versions too?
- sed '$q' "$ltmain" >> "$cfgfile" \
+ $SED '$q' "$ltmain" >> "$cfgfile" \
|| (rm -f "$cfgfile"; exit 1)
mv -f "$cfgfile" "$ofile" ||
@@ -4550,8 +4556,8 @@
_LT_EOF
echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
$LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+ echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+ $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
$RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
cat > conftest.c << _LT_EOF
@@ -4575,17 +4581,12 @@
_lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
- darwin*) # darwin 5.x on
Home |
Main Index |
Thread Index |
Old Index