Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-6]: src Add some changes for ticket #1178:
details: https://anonhg.NetBSD.org/src/rev/9c22b4ab2dc2
branches: netbsd-6
changeset: 776836:9c22b4ab2dc2
user: msaitoh <msaitoh%NetBSD.org@localhost>
date: Mon Dec 22 08:24:54 2014 +0000
description:
Add some changes for ticket #1178:
distrib/sets/lists/xbase/mi 1.117-1.118
distrib/sets/lists/xbase/shl.mi 1.47-1.49
distrib/sets/lists/xcomp/mi 1.137 via patch
distrib/sets/lists/xcomp/shl.mi patch
distrib/sets/lists/xetc/mi 1.19-1.22
external/mit/xorg/bin/Makefile 1.12-1.13
external/mit/xorg/bin/fc-pattern/Makefile new
external/mit/xorg/bin/fc-validate/Makefile new
xsrc/external/mit/fontconfig/dist/fc-pattern/Makefile.am patch
xsrc/external/mit/fontconfig/dist/fc-pattern/Makefile.in patch
xsrc/external/mit/fontconfig/dist/fc-pattern/fc-pattern.1 patch
xsrc/external/mit/fontconfig/dist/fc-pattern/fc-pattern.c patch
xsrc/external/mit/fontconfig/dist/fc-pattern/fc-pattern.sgml patch
xsrc/external/mit/fontconfig/dist/fc-validate/Makefile.am patch
xsrc/external/mit/fontconfig/dist/fc-validate/Makefile.in patch
xsrc/external/mit/fontconfig/dist/fc-validate/fc-validate.1 patch
xsrc/external/mit/fontconfig/dist/fc-validate/fc-validate.c patch
xsrc/external/mit/fontconfig/dist/fc-validate/fc-validate.sgml patch
diffstat:
distrib/sets/lists/xbase/mi | 10 +++++++++-
distrib/sets/lists/xbase/shl.mi | 4 ++--
distrib/sets/lists/xcomp/mi | 22 +++++++++++++++++++++-
distrib/sets/lists/xcomp/shl.mi | 4 ++--
distrib/sets/lists/xetc/mi | 11 ++++++++---
external/mit/xorg/bin/Makefile | 5 +++--
external/mit/xorg/bin/fc-pattern/Makefile | 18 ++++++++++++++++++
external/mit/xorg/bin/fc-validate/Makefile | 17 +++++++++++++++++
8 files changed, 80 insertions(+), 11 deletions(-)
diffs (285 lines):
diff -r bab8d90e4aba -r 9c22b4ab2dc2 distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi Mon Dec 22 04:37:45 2014 +0000
+++ b/distrib/sets/lists/xbase/mi Mon Dec 22 08:24:54 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.112.2.2 2012/06/23 23:04:48 riz Exp $
+# $NetBSD: mi,v 1.112.2.3 2014/12/22 08:24:54 msaitoh Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1370,6 +1370,8 @@
./usr/X11R7/bin/fc-match -unknown- xorg
./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
@@ -2495,6 +2497,8 @@
./usr/X11R7/man/cat1/fc-match.0 -unknown- .cat,xorg
./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
@@ -2633,6 +2637,8 @@
./usr/X11R7/man/html1/fc-match.html -unknown- html,xorg
./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
@@ -2771,6 +2777,8 @@
./usr/X11R7/man/man1/fc-match.1 -unknown- .man,xorg
./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 bab8d90e4aba -r 9c22b4ab2dc2 distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi Mon Dec 22 04:37:45 2014 +0000
+++ b/distrib/sets/lists/xbase/shl.mi Mon Dec 22 08:24:54 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.44.4.1 2012/03/02 18:27:43 riz Exp $
+# $NetBSD: shl.mi,v 1.44.4.2 2014/12/22 08:24:54 msaitoh 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.0 -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 bab8d90e4aba -r 9c22b4ab2dc2 distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi Mon Dec 22 04:37:45 2014 +0000
+++ b/distrib/sets/lists/xcomp/mi Mon Dec 22 08:24:54 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.133.4.1 2012/03/02 18:27:47 riz Exp $
+# $NetBSD: mi,v 1.133.4.2 2014/12/22 08:24:54 msaitoh Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6555,6 +6555,12 @@
./usr/X11R7/man/cat3/FcCacheNumFont.0 -unknown- .cat,xorg
./usr/X11R7/man/cat3/FcCacheNumSubdir.0 -unknown- .cat,xorg
./usr/X11R7/man/cat3/FcCacheSubdir.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat3/FcCacheCreateTagFile.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat3/FcCharSetDelChar.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat3/FcGetDefaultLangs.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat3/FcLangSetDel.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat3/FcLangSetSubtract.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat3/FcLangSetUnion.0 -unknown- .cat,xorg
./usr/X11R7/man/cat3/FcCharSetAddChar.0 -unknown- .cat,xorg
./usr/X11R7/man/cat3/FcCharSetCopy.0 -unknown- .cat,xorg
./usr/X11R7/man/cat3/FcCharSetCount.0 -unknown- .cat,xorg
@@ -7455,6 +7461,7 @@
./usr/X11R7/man/html3/FcBlanksDestroy.html -unknown- html,xorg
./usr/X11R7/man/html3/FcBlanksIsMember.html -unknown- html,xorg
./usr/X11R7/man/html3/FcCacheCopySet.html -unknown- html,xorg
+./usr/X11R7/man/html3/FcCacheCreateTagFile.html -unknown- html,xorg
./usr/X11R7/man/html3/FcCacheDir.html -unknown- html,xorg
./usr/X11R7/man/html3/FcCacheNumFont.html -unknown- html,xorg
./usr/X11R7/man/html3/FcCacheNumSubdir.html -unknown- html,xorg
@@ -7464,6 +7471,7 @@
./usr/X11R7/man/html3/FcCharSetCount.html -unknown- html,xorg
./usr/X11R7/man/html3/FcCharSetCoverage.html -unknown- html,xorg
./usr/X11R7/man/html3/FcCharSetCreate.html -unknown- html,xorg
+./usr/X11R7/man/html3/FcCharSetDelChar.html -unknown- html,xorg
./usr/X11R7/man/html3/FcCharSetDestroy.html -unknown- html,xorg
./usr/X11R7/man/html3/FcCharSetEqual.html -unknown- html,xorg
./usr/X11R7/man/html3/FcCharSetFirstPage.html -unknown- html,xorg
@@ -7529,6 +7537,7 @@
./usr/X11R7/man/html3/FcFreeTypeCharSetAndSpacing.html -unknown- html,xorg
./usr/X11R7/man/html3/FcFreeTypeQuery.html -unknown- html,xorg
./usr/X11R7/man/html3/FcFreeTypeQueryFace.html -unknown- html,xorg
+./usr/X11R7/man/html3/FcGetDefaultLangs.html -unknown- html,xorg
./usr/X11R7/man/html3/FcGetLangs.html -unknown- html,xorg
./usr/X11R7/man/html3/FcGetVersion.html -unknown- html,xorg
./usr/X11R7/man/html3/FcInit.html -unknown- html,xorg
@@ -7544,10 +7553,13 @@
./usr/X11R7/man/html3/FcLangSetContains.html -unknown- html,xorg
./usr/X11R7/man/html3/FcLangSetCopy.html -unknown- html,xorg
./usr/X11R7/man/html3/FcLangSetCreate.html -unknown- html,xorg
+./usr/X11R7/man/html3/FcLangSetDel.html -unknown- html,xorg
./usr/X11R7/man/html3/FcLangSetDestroy.html -unknown- html,xorg
./usr/X11R7/man/html3/FcLangSetEqual.html -unknown- html,xorg
./usr/X11R7/man/html3/FcLangSetHasLang.html -unknown- html,xorg
./usr/X11R7/man/html3/FcLangSetHash.html -unknown- html,xorg
+./usr/X11R7/man/html3/FcLangSetSubtract.html -unknown- html,xorg
+./usr/X11R7/man/html3/FcLangSetUnion.html -unknown- html,xorg
./usr/X11R7/man/html3/FcMatrixCopy.html -unknown- html,xorg
./usr/X11R7/man/html3/FcMatrixEqual.html -unknown- html,xorg
./usr/X11R7/man/html3/FcMatrixInit.html -unknown- html,xorg
@@ -8358,6 +8370,7 @@
./usr/X11R7/man/man3/FcBlanksDestroy.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcBlanksIsMember.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCacheCopySet.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcCacheCreateTagFile.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCacheDir.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCacheNumFont.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCacheNumSubdir.3 -unknown- .man,xorg
@@ -8367,6 +8380,7 @@
./usr/X11R7/man/man3/FcCharSetCount.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCharSetCoverage.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCharSetCreate.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcCharSetDelChar.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCharSetDestroy.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCharSetEqual.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCharSetFirstPage.3 -unknown- .man,xorg
@@ -8432,6 +8446,7 @@
./usr/X11R7/man/man3/FcFreeTypeCharSetAndSpacing.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcFreeTypeQuery.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcFreeTypeQueryFace.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcGetDefaultLangs.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcGetLangs.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcGetVersion.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcInit.3 -unknown- .man,xorg
@@ -8447,10 +8462,13 @@
./usr/X11R7/man/man3/FcLangSetContains.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangSetCopy.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangSetCreate.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcLangSetDel.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangSetDestroy.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangSetEqual.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangSetHasLang.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangSetHash.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcLangSetSubtract.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcLangSetUnion.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcMatrixCopy.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcMatrixEqual.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcMatrixInit.3 -unknown- .man,xorg
@@ -9415,8 +9433,10 @@
./usr/libdata/debug/usr/X11R7/bin/fc-cat.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fc-list.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fc-match.debug -unknown- debug,xorg
+./usr/libdata/debug/usr/X11R7/bin/fc-pattern.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-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 bab8d90e4aba -r 9c22b4ab2dc2 distrib/sets/lists/xcomp/shl.mi
--- a/distrib/sets/lists/xcomp/shl.mi Mon Dec 22 04:37:45 2014 +0000
+++ b/distrib/sets/lists/xcomp/shl.mi Mon Dec 22 08:24:54 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.30.4.1 2012/03/02 18:27:48 riz Exp $
+# $NetBSD: shl.mi,v 1.30.4.2 2014/12/22 08:24:54 msaitoh Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -232,7 +232,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.0.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 bab8d90e4aba -r 9c22b4ab2dc2 distrib/sets/lists/xetc/mi
--- a/distrib/sets/lists/xetc/mi Mon Dec 22 04:37:45 2014 +0000
+++ b/distrib/sets/lists/xetc/mi Mon Dec 22 08:24:54 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.18 2011/02/18 00:42:20 jmcneill Exp $
+# $NetBSD: mi,v 1.18.6.1 2014/12/22 08:24:54 msaitoh Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -57,12 +57,16 @@
./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
./etc/fonts/conf.avail/10-sub-pixel-vrgb.conf -unknown- xorg
./etc/fonts/conf.avail/10-unhinted.conf -unknown- xorg
-./etc/fonts/conf.avail/20-fix-globaladvance.conf -unknown- xorg
+./etc/fonts/conf.avail/11-lcdfilter-default.conf -unknown- xorg
+./etc/fonts/conf.avail/11-lcdfilter-legacy.conf -unknown- xorg
+./etc/fonts/conf.avail/11-lcdfilter-light.conf -unknown- xorg
+./etc/fonts/conf.avail/20-fix-globaladvance.conf -unknown- obsolete
./etc/fonts/conf.avail/20-unhint-small-vera.conf -unknown- xorg
./etc/fonts/conf.avail/25-unhint-nonlatin.conf -unknown- xorg
./etc/fonts/conf.avail/30-metric-aliases.conf -unknown- xorg
@@ -81,7 +85,8 @@
./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/20-fix-globaladvance.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
./etc/fonts/conf.d/30-urw-aliases.conf -unknown- xorg
diff -r bab8d90e4aba -r 9c22b4ab2dc2 external/mit/xorg/bin/Makefile
--- a/external/mit/xorg/bin/Makefile Mon Dec 22 04:37:45 2014 +0000
+++ b/external/mit/xorg/bin/Makefile Mon Dec 22 08:24:54 2014 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2011/10/22 22:23:50 jmcneill Exp $
+# $NetBSD: Makefile,v 1.11.4.1 2014/12/22 08:24:54 msaitoh Exp $
SUBDIR= appres bdftopcf bdftruncate beforelight bitmap ccmakedep \
cleanlinks cxpm editres \
- fc-cache fc-cat fc-list fc-match fc-query fc-scan \
+ 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 bab8d90e4aba -r 9c22b4ab2dc2 external/mit/xorg/bin/fc-pattern/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/bin/fc-pattern/Makefile Mon Dec 22 08:24:54 2014 +0000
@@ -0,0 +1,18 @@
+# $NetBSD
+
+.include <bsd.own.mk>
+
+PROG= fc-pattern
+
+CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I. -I${DESTDIR}${X11INCDIR}/freetype2
+
+LDADD+= -lfontconfig -lfreetype -lexpat
+DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+
+.PATH: ${X11SRCDIR.fontconfig}/${PROG}
+
+FCARCH_DEPFILE= fc-pattern.c
+.include "../../lib/fontconfig/src/Makefile.fcarch"
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
diff -r bab8d90e4aba -r 9c22b4ab2dc2 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 Dec 22 08:24:54 2014 +0000
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1.12.2 2014/12/22 08:24:54 msaitoh 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>
Home |
Main Index |
Thread Index |
Old Index