Module Name: src
Committed By: mrg
Date: Wed Sep 14 07:37:06 UTC 2022
Modified Files:
src/external/mit/xorg/lib/libXfont2: Makefile
Log Message:
fix defines no longer provided by config.h.
fixes eg, missing "10x20" font for me, but does require fc-cache
and X restarting to fix.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/libXfont2/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libXfont2/Makefile
diff -u src/external/mit/xorg/lib/libXfont2/Makefile:1.9 src/external/mit/xorg/lib/libXfont2/Makefile:1.10
--- src/external/mit/xorg/lib/libXfont2/Makefile:1.9 Fri Sep 9 03:56:39 2022
+++ src/external/mit/xorg/lib/libXfont2/Makefile Wed Sep 14 07:37:05 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2022/09/09 03:56:39 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2022/09/14 07:37:05 mrg Exp $
USE_FORT?= yes # data-driven bugs?
@@ -103,20 +103,26 @@ INCS= libxfont2.h
INCSDIR=${X11INCDIR}/X11/fonts
CPPFLAGS+= ${X11FLAGS.THREADLIB} ${X11FLAGS.CONNECTION}
-CPPFLAGS+= -DHAS_SNPRINTF
+CPPFLAGS+= -DHAVE_STRLCPY
CPPFLAGS+= -DHAVE_REALLOCARRAY -D_OPENBSD_SOURCE
CPPFLAGS+= -DHAVE_READLINK
CPPFLAGS+= -DHAVE_STDINT_H
CPPFLAGS+= -DHAVE_STRLCPY
CPPFLAGS+= -DHAVE_ERR_H
CPPFLAGS+= -DHAVE_REALPATH
-CPPFLAGS+= -DHAS_SNPRINTF
-CPPFLAGS+= -DBDFFORMAT -DSNFFORMAT -DPCFFORMAT -DX_GZIP_FONT_COMPRESSION -DX_BZIP2_FONT_COMPRESSION
+CPPFLAGS+= -DXFONT_BDFFORMAT
+CPPFLAGS+= -DXFONT_BITMAP
+CPPFLAGS+= -DXFONT_BUILTINS
+CPPFLAGS+= -DXFONT_FC
+CPPFLAGS+= -DXFONT_FONTFILE
+CPPFLAGS+= -DXFONT_FREETYPE
+CPPFLAGS+= -DXFONT_PCFFORMAT
+CPPFLAGS+= -DX_GZIP_FONT_COMPRESSION
+CPPFLAGS+= -DX_BZIP2_FONT_COMPRESSION
CPPFLAGS+= -DFONT_ENCODINGS_DIRECTORY=\"${X11LIBDIR}/X11/fonts/encodings/encodings.dir\"
CPPFLAGS+= -I${XFONT2DIR}/src/stubs
CPPFLAGS+= -I${XFONT2DIR}
CPPFLAGS+= -I${XFONT2DIR}/include
-CPPFLAGS+= -I${XFONT2DIR}/../include
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/fonts
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2
