updates for fontconfig 2.10.93.
This commit is contained in:
mrg
parent
997d64307d
commit
4194596dec
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: mi,v 1.117 2013/06/03 07:08:20 mrg Exp $
|
||||
# $NetBSD: mi,v 1.118 2013/06/03 20:23:40 mrg Exp $
|
||||
#
|
||||
# Note: don't delete entries from here - mark them as "obsolete" instead.
|
||||
#
|
||||
|
|
@ -1371,6 +1371,7 @@
|
|||
./usr/X11R7/bin/fc-query -unknown- xorg
|
||||
./usr/X11R7/bin/fc-scan -unknown- xorg
|
||||
./usr/X11R7/bin/fc-pattern -unknown- xorg
|
||||
./usr/X11R7/bin/fc-validate -unknown- xorg
|
||||
./usr/X11R7/bin/fillblnk -unknown- xorg
|
||||
./usr/X11R7/bin/fonttosfnt -unknown- xorg
|
||||
./usr/X11R7/bin/fslsfonts -unknown- xorg
|
||||
|
|
@ -2499,6 +2500,7 @@
|
|||
./usr/X11R7/man/cat1/fc-query.0 -unknown- .cat,xorg
|
||||
./usr/X11R7/man/cat1/fc-scan.0 -unknown- .cat,xorg
|
||||
./usr/X11R7/man/cat1/fc-pattern.0 -unknown- .cat,xorg
|
||||
./usr/X11R7/man/cat1/fc-validate.0 -unknown- .cat,xorg
|
||||
./usr/X11R7/man/cat1/fonttosfnt.0 -unknown- .cat,xorg
|
||||
./usr/X11R7/man/cat1/fslsfonts.0 -unknown- .cat,xorg
|
||||
./usr/X11R7/man/cat1/fstobdf.0 -unknown- .cat,xorg
|
||||
|
|
@ -2638,6 +2640,7 @@
|
|||
./usr/X11R7/man/html1/fc-query.html -unknown- html,xorg
|
||||
./usr/X11R7/man/html1/fc-scan.html -unknown- html,xorg
|
||||
./usr/X11R7/man/html1/fc-pattern.html -unknown- html,xorg
|
||||
./usr/X11R7/man/html1/fc-validate.html -unknown- html,xorg
|
||||
./usr/X11R7/man/html1/fonttosfnt.html -unknown- html,xorg
|
||||
./usr/X11R7/man/html1/fslsfonts.html -unknown- html,xorg
|
||||
./usr/X11R7/man/html1/fstobdf.html -unknown- html,xorg
|
||||
|
|
@ -2777,6 +2780,7 @@
|
|||
./usr/X11R7/man/man1/fc-query.1 -unknown- .man,xorg
|
||||
./usr/X11R7/man/man1/fc-scan.1 -unknown- .man,xorg
|
||||
./usr/X11R7/man/man1/fc-pattern.1 -unknown- .man,xorg
|
||||
./usr/X11R7/man/man1/fc-validate.1 -unknown- .man,xorg
|
||||
./usr/X11R7/man/man1/fonttosfnt.1 -unknown- .man,xorg
|
||||
./usr/X11R7/man/man1/fslsfonts.1 -unknown- .man,xorg
|
||||
./usr/X11R7/man/man1/fstobdf.1 -unknown- .man,xorg
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: shl.mi,v 1.48 2013/06/03 07:24:11 mrg Exp $
|
||||
# $NetBSD: shl.mi,v 1.49 2013/06/03 20:23:40 mrg Exp $
|
||||
#
|
||||
# Note: don't delete entries from here - mark them as "obsolete" instead.
|
||||
#
|
||||
|
|
@ -311,7 +311,7 @@
|
|||
./usr/X11R7/lib/libexpat.so.2.0 -obsolete- obsolete
|
||||
./usr/X11R7/lib/libfontconfig.so -unknown- xorg
|
||||
./usr/X11R7/lib/libfontconfig.so.2 -unknown- xorg
|
||||
./usr/X11R7/lib/libfontconfig.so.2.1 -unknown- xorg
|
||||
./usr/X11R7/lib/libfontconfig.so.2.2 -unknown- xorg
|
||||
./usr/X11R7/lib/libfontenc.so -unknown- xorg
|
||||
./usr/X11R7/lib/libfontenc.so.2 -unknown- xorg
|
||||
./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: mi,v 1.3 2013/01/17 21:42:18 christos Exp $
|
||||
# $NetBSD: mi,v 1.4 2013/06/03 20:23:40 mrg Exp $
|
||||
./etc/mtree/set.xdebug comp-sys-root
|
||||
./usr/libdata/debug/usr/X11R6/bin/Xdmx.debug -unknown- debug,x11
|
||||
./usr/libdata/debug/usr/X11R6/bin/Xnest.debug -unknown- debug,x11
|
||||
|
|
@ -156,6 +156,8 @@
|
|||
./usr/libdata/debug/usr/X11R7/bin/fc-match.debug -unknown- debug,xorg
|
||||
./usr/libdata/debug/usr/X11R7/bin/fc-query.debug -unknown- debug,xorg
|
||||
./usr/libdata/debug/usr/X11R7/bin/fc-scan.debug -unknown- debug,xorg
|
||||
./usr/libdata/debug/usr/X11R7/bin/fc-pattern.debug -unknown- debug,xorg
|
||||
./usr/libdata/debug/usr/X11R7/bin/fc-validate.debug -unknown- debug,xorg
|
||||
./usr/libdata/debug/usr/X11R7/bin/fonttosfnt.debug -unknown- debug,xorg
|
||||
./usr/libdata/debug/usr/X11R7/bin/fslsfonts.debug -unknown- debug,xorg
|
||||
./usr/libdata/debug/usr/X11R7/bin/fstobdf.debug -unknown- debug,xorg
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: shl.mi,v 1.7 2013/06/03 07:24:11 mrg Exp $
|
||||
# $NetBSD: shl.mi,v 1.8 2013/06/03 20:23:40 mrg Exp $
|
||||
./usr/libdata/debug/usr/X11R6/lib/libFS.so.6.0.debug -unknown- x11,debug
|
||||
./usr/libdata/debug/usr/X11R6/lib/libGL.so.1.2.debug -unknown- x11,debug
|
||||
./usr/libdata/debug/usr/X11R6/lib/libGLU.so.1.3.debug -unknown- x11,debug
|
||||
|
|
@ -101,7 +101,7 @@
|
|||
./usr/libdata/debug/usr/X11R7/lib/libdrm.so.3.2.debug -unknown- xorg,debug
|
||||
./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug -unknown- xorg,debug
|
||||
./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete
|
||||
./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.1.debug -unknown- xorg,debug
|
||||
./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug -unknown- xorg,debug
|
||||
./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug
|
||||
./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.7.3.debug -unknown- xorg,debug
|
||||
./usr/libdata/debug/usr/X11R7/lib/libglut.so.4.0.debug -unknown- xorg,debug
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: mi,v 1.21 2013/06/03 17:58:28 mrg Exp $
|
||||
# $NetBSD: mi,v 1.22 2013/06/03 20:23:40 mrg Exp $
|
||||
#
|
||||
# Note: don't delete entries from here - mark them as "obsolete" instead.
|
||||
#
|
||||
|
|
@ -57,6 +57,7 @@
|
|||
./etc/X11/xsm/system.xsm -unknown- xorg
|
||||
./etc/fonts/conf.avail/10-autohint.conf -unknown- xorg
|
||||
./etc/fonts/conf.avail/10-no-sub-pixel.conf -unknown- xorg
|
||||
./etc/fonts/conf.avail/10-scale-bitmap-fonts.conf -unknown- xorg
|
||||
./etc/fonts/conf.avail/10-sub-pixel-bgr.conf -unknown- xorg
|
||||
./etc/fonts/conf.avail/10-sub-pixel-rgb.conf -unknown- xorg
|
||||
./etc/fonts/conf.avail/10-sub-pixel-vbgr.conf -unknown- xorg
|
||||
|
|
@ -84,6 +85,7 @@
|
|||
./etc/fonts/conf.avail/70-yes-bitmaps.conf -unknown- xorg
|
||||
./etc/fonts/conf.avail/80-delicious.conf -unknown- xorg
|
||||
./etc/fonts/conf.avail/90-synthetic.conf -unknown- xorg
|
||||
./etc/fonts/conf.d/10-scale-bitmap-fonts.conf -unknown- xorg
|
||||
./etc/fonts/conf.d/20-fix-globaladvance.conf -unknown- obsolete
|
||||
./etc/fonts/conf.d/20-unhint-small-vera.conf -unknown- xorg
|
||||
./etc/fonts/conf.d/30-metric-aliases.conf -unknown- xorg
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
# $NetBSD: Makefile,v 1.12 2013/06/03 06:56:32 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.13 2013/06/03 20:23:39 mrg Exp $
|
||||
|
||||
SUBDIR= appres bdftopcf bdftruncate beforelight bitmap ccmakedep \
|
||||
cleanlinks cxpm editres \
|
||||
fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan \
|
||||
fc-validate \
|
||||
fonttosfnt fslsfonts fstobdf glxgears glxinfo \
|
||||
iceauth ico imake listres lndir luit makedepend \
|
||||
makeg makestrs mergelib mkdirhier mkfontdir \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.2 2013/06/03 06:56:32 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2013/06/03 20:23:39 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -12,7 +12,6 @@ DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
|
|||
|
||||
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
|
||||
|
||||
FCARCH_DEPFILE= fc-cache.c
|
||||
.include "../../lib/fontconfig/src/Makefile.fcarch"
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.2 2013/06/03 20:23:39 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -11,7 +11,6 @@ DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
|
|||
|
||||
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
|
||||
|
||||
FCARCH_DEPFILE= fc-cat.c
|
||||
.include "../../lib/fontconfig/src/Makefile.fcarch"
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.2 2013/06/03 20:23:39 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -11,7 +11,6 @@ DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
|
|||
|
||||
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
|
||||
|
||||
FCARCH_DEPFILE= fc-list.c
|
||||
.include "../../lib/fontconfig/src/Makefile.fcarch"
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.2 2013/06/03 20:23:39 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -11,7 +11,6 @@ DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
|
|||
|
||||
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
|
||||
|
||||
FCARCH_DEPFILE= fc-list.c
|
||||
.include "../../lib/fontconfig/src/Makefile.fcarch"
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
|
|||
|
||||
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
|
||||
|
||||
FCARCH_DEPFILE= fc-cat.c
|
||||
.include "../../lib/fontconfig/src/Makefile.fcarch"
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.1 2010/11/21 07:20:06 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.2 2013/06/03 20:23:39 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -11,7 +11,6 @@ DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
|
|||
|
||||
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
|
||||
|
||||
FCARCH_DEPFILE= fc-cat.c
|
||||
.include "../../lib/fontconfig/src/Makefile.fcarch"
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
# $NetBSD: Makefile,v 1.1 2013/06/03 20:23:39 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
PROG= fc-validate
|
||||
|
||||
CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I. -I${DESTDIR}${X11INCDIR}/freetype2
|
||||
|
||||
LDADD+= -lfontconfig -lfreetype -lexpat
|
||||
DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
|
||||
|
||||
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
|
||||
|
||||
.include "../../lib/fontconfig/src/Makefile.fcarch"
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
.include <bsd.prog.mk>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.3 2013/06/03 17:50:28 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2013/06/03 20:23:39 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -10,6 +10,7 @@ CONFIGFILES= \
|
|||
10-sub-pixel-rgb.conf \
|
||||
10-sub-pixel-vbgr.conf \
|
||||
10-sub-pixel-vrgb.conf \
|
||||
10-scale-bitmap-fonts.conf \
|
||||
10-unhinted.conf \
|
||||
11-lcdfilter-default.conf \
|
||||
11-lcdfilter-legacy.conf \
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
# $NetBSD: Makefile,v 1.2 2013/06/03 06:46:54 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.3 2013/06/03 20:23:39 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
.PATH: ${X11SRCDIR.fontconfig}/conf.d
|
||||
FONTCONFIG_LINKS= \
|
||||
10-scale-bitmap-fonts.conf \
|
||||
20-unhint-small-vera.conf \
|
||||
30-urw-aliases.conf \
|
||||
30-metric-aliases.conf \
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.11 2013/06/03 07:23:02 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.12 2013/06/03 20:23:39 mrg Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
|
|
@ -10,18 +10,21 @@ SRCS= fcatomic.c \
|
|||
fccache.c \
|
||||
fccfg.c \
|
||||
fccharset.c \
|
||||
fccompat.c \
|
||||
fcdbg.c \
|
||||
fcdefault.c \
|
||||
fcdir.c \
|
||||
fcformat.c \
|
||||
fcfreetype.c \
|
||||
fcfs.c \
|
||||
fchash.c \
|
||||
fcinit.c \
|
||||
fclang.c \
|
||||
fclist.c \
|
||||
fcmatch.c \
|
||||
fcmatrix.c \
|
||||
fcname.c \
|
||||
fcobjs.c \
|
||||
fcpat.c \
|
||||
fcserialize.c \
|
||||
fcstat.c \
|
||||
|
|
@ -113,7 +116,6 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 \
|
|||
-I. \
|
||||
-I${X11SRCDIR.${LIB}}
|
||||
|
||||
FCARCH_DEPFILE= fccache.c
|
||||
.include "Makefile.fcarch"
|
||||
|
||||
CLEANFILES+= fcarch.h
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: shlib_version,v 1.3 2013/06/03 07:21:32 mrg Exp $
|
||||
# $NetBSD: shlib_version,v 1.4 2013/06/03 20:23:39 mrg Exp $
|
||||
#
|
||||
major=2
|
||||
minor=1
|
||||
minor=2
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.7 2013/06/03 06:56:32 mrg Exp $
|
||||
# $NetBSD: Makefile,v 1.8 2013/06/03 20:23:40 mrg Exp $
|
||||
|
||||
NOMAN= 1
|
||||
|
||||
|
|
@ -14,10 +14,12 @@ EXPAT= ${NETBSDSRCDIR}/external/mit/expat/dist
|
|||
SRCS.fc-cache= fc-cache.c
|
||||
|
||||
.PATH: ${FONTCONFIG}/src
|
||||
SRCS.fontconfig= fcatomic.c fcblanks.c fccache.c fccfg.c fccharset.c fcdbg.c \
|
||||
fcdefault.c fcdir.c fcfreetype.c fcfs.c fcinit.c fclang.c \
|
||||
fclist.c fcmatch.c fcmatrix.c fcname.c fcpat.c fcserialize.c \
|
||||
fcstat.c fcstr.c fcxml.c ftglue.h ftglue.c
|
||||
SRCS.fontconfig= fcatomic.c fcblanks.c fccache.c fccfg.c \
|
||||
fccharset.c fcdbg.c fccompat.c fcdefault.c fcdir.c \
|
||||
fcfreetype.c fcfs.c fchash.c fcinit.c fclang.c \
|
||||
fclist.c fcmatch.c fcmatrix.c fcname.c fcobjs.c \
|
||||
fcpat.c fcserialize.c fcstat.c fcstr.c fcxml.c \
|
||||
ftglue.c
|
||||
|
||||
.PATH: ${FREETYPE}/src/base
|
||||
SRCS.freetype= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftglyph.c \
|
||||
|
|
@ -100,6 +102,8 @@ HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DESTDIR}/etc/X11/fonts"' \
|
|||
-DFT2_BUILD_LIBRARY \
|
||||
-DXML_BYTE_ORDER=0 -DHAVE_MEMMOVE=1 \
|
||||
-DHAVE_STDINT_H -DHAVE_RANDOM -DDARWIN_NO_CARBON \
|
||||
-DHAVE_SYS_TYPES_H -DHAVE_FCNTL_H -DHAVE_SYS_STAT_H \
|
||||
-DHAVE_MKSTEMP \
|
||||
-DFLEXIBLE_ARRAY_MEMBER="/**/"
|
||||
HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
|
||||
HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREETYPE} \
|
||||
|
|
@ -110,7 +114,6 @@ HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREETYPE} \
|
|||
LDADD= -lz
|
||||
#LDADD+= -lbz2
|
||||
|
||||
FCARCH_DEPFILE= fc-cache.c
|
||||
.include "../../lib/fontconfig/src/Makefile.fcarch"
|
||||
|
||||
.include <bsd.x11.mk>
|
||||
|
|
|
|||
Loading…
Reference in New Issue