Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src updates for fontconfig 2.10.93.
details: https://anonhg.NetBSD.org/src/rev/cc42c85258c1
branches: trunk
changeset: 787136:cc42c85258c1
user: mrg <mrg%NetBSD.org@localhost>
date: Mon Jun 03 20:23:39 2013 +0000
description:
updates for fontconfig 2.10.93.
diffstat:
distrib/sets/lists/xbase/mi | 6 ++++-
distrib/sets/lists/xbase/shl.mi | 4 +-
distrib/sets/lists/xdebug/mi | 4 ++-
distrib/sets/lists/xdebug/shl.mi | 4 +-
distrib/sets/lists/xetc/mi | 4 ++-
external/mit/xorg/bin/Makefile | 3 +-
external/mit/xorg/bin/fc-cache/Makefile | 3 +-
external/mit/xorg/bin/fc-cat/Makefile | 3 +-
external/mit/xorg/bin/fc-list/Makefile | 3 +-
external/mit/xorg/bin/fc-match/Makefile | 3 +-
external/mit/xorg/bin/fc-query/Makefile | 1 -
external/mit/xorg/bin/fc-scan/Makefile | 3 +-
external/mit/xorg/bin/fc-validate/Makefile | 17 ++++++++++++++++
external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile | 3 +-
external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile | 3 +-
external/mit/xorg/lib/fontconfig/src/Makefile | 6 +++-
external/mit/xorg/lib/fontconfig/src/shlib_version | 4 +-
external/mit/xorg/tools/fc-cache/Makefile | 15 ++++++++-----
18 files changed, 58 insertions(+), 31 deletions(-)
diffs (truncated from 375 to 300 lines):
diff -r a238d241b8a1 -r cc42c85258c1 distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi Mon Jun 03 18:47:52 2013 +0000
+++ b/distrib/sets/lists/xbase/mi Mon Jun 03 20:23:39 2013 +0000
@@ -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
diff -r a238d241b8a1 -r cc42c85258c1 distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi Mon Jun 03 18:47:52 2013 +0000
+++ b/distrib/sets/lists/xbase/shl.mi Mon Jun 03 20:23:39 2013 +0000
@@ -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
diff -r a238d241b8a1 -r cc42c85258c1 distrib/sets/lists/xdebug/mi
--- a/distrib/sets/lists/xdebug/mi Mon Jun 03 18:47:52 2013 +0000
+++ b/distrib/sets/lists/xdebug/mi Mon Jun 03 20:23:39 2013 +0000
@@ -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
diff -r a238d241b8a1 -r cc42c85258c1 distrib/sets/lists/xdebug/shl.mi
--- a/distrib/sets/lists/xdebug/shl.mi Mon Jun 03 18:47:52 2013 +0000
+++ b/distrib/sets/lists/xdebug/shl.mi Mon Jun 03 20:23:39 2013 +0000
@@ -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
diff -r a238d241b8a1 -r cc42c85258c1 distrib/sets/lists/xetc/mi
--- a/distrib/sets/lists/xetc/mi Mon Jun 03 18:47:52 2013 +0000
+++ b/distrib/sets/lists/xetc/mi Mon Jun 03 20:23:39 2013 +0000
@@ -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
diff -r a238d241b8a1 -r cc42c85258c1 external/mit/xorg/bin/Makefile
--- a/external/mit/xorg/bin/Makefile Mon Jun 03 18:47:52 2013 +0000
+++ b/external/mit/xorg/bin/Makefile Mon Jun 03 20:23:39 2013 +0000
@@ -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 \
diff -r a238d241b8a1 -r cc42c85258c1 external/mit/xorg/bin/fc-cache/Makefile
--- a/external/mit/xorg/bin/fc-cache/Makefile Mon Jun 03 18:47:52 2013 +0000
+++ b/external/mit/xorg/bin/fc-cache/Makefile Mon Jun 03 20:23:39 2013 +0000
@@ -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 @@
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
-FCARCH_DEPFILE= fc-cache.c
.include "../../lib/fontconfig/src/Makefile.fcarch"
.include <bsd.x11.mk>
diff -r a238d241b8a1 -r cc42c85258c1 external/mit/xorg/bin/fc-cat/Makefile
--- a/external/mit/xorg/bin/fc-cat/Makefile Mon Jun 03 18:47:52 2013 +0000
+++ b/external/mit/xorg/bin/fc-cat/Makefile Mon Jun 03 20:23:39 2013 +0000
@@ -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 @@
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
-FCARCH_DEPFILE= fc-cat.c
.include "../../lib/fontconfig/src/Makefile.fcarch"
.include <bsd.x11.mk>
diff -r a238d241b8a1 -r cc42c85258c1 external/mit/xorg/bin/fc-list/Makefile
--- a/external/mit/xorg/bin/fc-list/Makefile Mon Jun 03 18:47:52 2013 +0000
+++ b/external/mit/xorg/bin/fc-list/Makefile Mon Jun 03 20:23:39 2013 +0000
@@ -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 @@
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
-FCARCH_DEPFILE= fc-list.c
.include "../../lib/fontconfig/src/Makefile.fcarch"
.include <bsd.x11.mk>
diff -r a238d241b8a1 -r cc42c85258c1 external/mit/xorg/bin/fc-match/Makefile
--- a/external/mit/xorg/bin/fc-match/Makefile Mon Jun 03 18:47:52 2013 +0000
+++ b/external/mit/xorg/bin/fc-match/Makefile Mon Jun 03 20:23:39 2013 +0000
@@ -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 @@
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
-FCARCH_DEPFILE= fc-list.c
.include "../../lib/fontconfig/src/Makefile.fcarch"
.include <bsd.x11.mk>
diff -r a238d241b8a1 -r cc42c85258c1 external/mit/xorg/bin/fc-query/Makefile
--- a/external/mit/xorg/bin/fc-query/Makefile Mon Jun 03 18:47:52 2013 +0000
+++ b/external/mit/xorg/bin/fc-query/Makefile Mon Jun 03 20:23:39 2013 +0000
@@ -11,7 +11,6 @@
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
-FCARCH_DEPFILE= fc-cat.c
.include "../../lib/fontconfig/src/Makefile.fcarch"
.include <bsd.x11.mk>
diff -r a238d241b8a1 -r cc42c85258c1 external/mit/xorg/bin/fc-scan/Makefile
--- a/external/mit/xorg/bin/fc-scan/Makefile Mon Jun 03 18:47:52 2013 +0000
+++ b/external/mit/xorg/bin/fc-scan/Makefile Mon Jun 03 20:23:39 2013 +0000
@@ -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 @@
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
-FCARCH_DEPFILE= fc-cat.c
.include "../../lib/fontconfig/src/Makefile.fcarch"
.include <bsd.x11.mk>
diff -r a238d241b8a1 -r cc42c85258c1 external/mit/xorg/bin/fc-validate/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/bin/fc-validate/Makefile Mon Jun 03 20:23:39 2013 +0000
@@ -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>
diff -r a238d241b8a1 -r cc42c85258c1 external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
--- a/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile Mon Jun 03 18:47:52 2013 +0000
+++ b/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile Mon Jun 03 20:23:39 2013 +0000
@@ -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 @@
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 \
diff -r a238d241b8a1 -r cc42c85258c1 external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
--- a/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile Mon Jun 03 18:47:52 2013 +0000
+++ b/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile Mon Jun 03 20:23:39 2013 +0000
@@ -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 \
diff -r a238d241b8a1 -r cc42c85258c1 external/mit/xorg/lib/fontconfig/src/Makefile
--- a/external/mit/xorg/lib/fontconfig/src/Makefile Mon Jun 03 18:47:52 2013 +0000
+++ b/external/mit/xorg/lib/fontconfig/src/Makefile Mon Jun 03 20:23:39 2013 +0000
@@ -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 @@
fccache.c \
fccfg.c \
fccharset.c \
+ fccompat.c \
fcdbg.c \
fcdefault.c \
fcdir.c \
Home |
Main Index |
Thread Index |
Old Index