Module Name: src
Committed By: maya
Date: Wed Oct 21 15:12:15 UTC 2020
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/lib/freetype/freetype/config: Makefile
Log Message:
Build fixes for freetype 2.10.4
To generate a diff of this commit:
cvs rdiff -u -r1.217 -r1.218 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/lib/freetype/freetype/config/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.217 src/distrib/sets/lists/xcomp/mi:1.218
--- src/distrib/sets/lists/xcomp/mi:1.217 Sun Aug 30 04:51:03 2020
+++ src/distrib/sets/lists/xcomp/mi Wed Oct 21 15:12:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.217 2020/08/30 04:51:03 mrg Exp $
+# $NetBSD: mi,v 1.218 2020/10/21 15:12:15 maya Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -570,6 +570,9 @@
./usr/X11R7/include/freetype2/freetype/config/ftmodule.h xcomp-freetype2-include xorg
./usr/X11R7/include/freetype2/freetype/config/ftoption.h xcomp-freetype2-include xorg
./usr/X11R7/include/freetype2/freetype/config/ftstdlib.h xcomp-freetype2-include xorg
+./usr/X11R7/include/freetype2/freetype/config/integer-types.h xcomp-freetype2-include xorg
+./usr/X11R7/include/freetype2/freetype/config/mac-support.h xcomp-freetype2-include xorg
+./usr/X11R7/include/freetype2/freetype/config/public-macros.h xcomp-freetype2-include xorg
./usr/X11R7/include/freetype2/freetype/freetype.h xcomp-freetype2-include xorg
./usr/X11R7/include/freetype2/freetype/ftadvanc.h xcomp-freetype2-include xorg
./usr/X11R7/include/freetype2/freetype/ftautoh.h xcomp-obsolete obsolete
Index: src/external/mit/xorg/lib/freetype/freetype/config/Makefile
diff -u src/external/mit/xorg/lib/freetype/freetype/config/Makefile:1.3 src/external/mit/xorg/lib/freetype/freetype/config/Makefile:1.4
--- src/external/mit/xorg/lib/freetype/freetype/config/Makefile:1.3 Mon May 16 22:19:10 2016
+++ src/external/mit/xorg/lib/freetype/freetype/config/Makefile Wed Oct 21 15:12:15 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/05/16 22:19:10 christos Exp $
+# $NetBSD: Makefile,v 1.4 2020/10/21 15:12:15 maya Exp $
.include <bsd.own.mk>
@@ -7,6 +7,7 @@
INCSDIR=${X11INCDIR}/freetype2/freetype/config
INCS= ftconfig.h ftheader.h ftmodule.h ftoption.h ftstdlib.h
+INCS+= integer-types.h mac-support.h public-macros.h
.include <bsd.x11.mk>
.include <bsd.prog.mk>
