Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src - install fontconfig 2.13.1 files and new fc-conflist
details: https://anonhg.NetBSD.org/src/rev/f5b877480092
branches: trunk
changeset: 449490:f5b877480092
user: mrg <mrg%NetBSD.org@localhost>
date: Fri Mar 08 09:58:23 2019 +0000
description:
- install fontconfig 2.13.1 files and new fc-conflist
- move libuuid_ul stuff into its srcs.mk and link directly into libfontconfig.
- update reachover
- update man page list
diffstat:
distrib/sets/lists/xbase/mi | 6 +-
distrib/sets/lists/xcomp/mi | 39 ++-
distrib/sets/lists/xdebug/mi | 3 +-
distrib/sets/lists/xetc/mi | 4 +-
external/bsd/libuuid_ul/lib/libuuid_ul/Makefile | 29 +-
external/bsd/libuuid_ul/lib/libuuid_ul/srcs.mk | 40 ++
external/mit/xorg/bin/fc-conflist/Makefile | 18 +
external/mit/xorg/lib/Makefile | 5 +-
external/mit/xorg/lib/fontconfig/Makefile | 6 +-
external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile | 7 +-
external/mit/xorg/lib/fontconfig/src/Makefile | 300 +++++++++++++++---
external/mit/xorg/tools/fc-cache/Makefile | 15 +-
12 files changed, 369 insertions(+), 103 deletions(-)
diffs (truncated from 791 to 300 lines):
diff -r 6c6fe5cac73b -r f5b877480092 distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi Fri Mar 08 09:14:54 2019 +0000
+++ b/distrib/sets/lists/xbase/mi Fri Mar 08 09:58:23 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.147 2019/03/03 17:52:32 maya Exp $
+# $NetBSD: mi,v 1.148 2019/03/08 09:58:23 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -21,6 +21,7 @@
./usr/X11R7/bin/editres -unknown- xorg
./usr/X11R7/bin/fc-cache -unknown- xorg
./usr/X11R7/bin/fc-cat -unknown- xorg
+./usr/X11R7/bin/fc-conflist -unknown- xorg
./usr/X11R7/bin/fc-list -unknown- xorg
./usr/X11R7/bin/fc-match -unknown- xorg
./usr/X11R7/bin/fc-pattern -unknown- xorg
@@ -1272,6 +1273,7 @@
./usr/X11R7/man/cat1/editres.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/fc-cache.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/fc-cat.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat1/fc-conflist.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/fc-list.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/fc-match.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/fc-pattern.0 -unknown- .cat,xorg
@@ -1416,6 +1418,7 @@
./usr/X11R7/man/html1/editres.html -unknown- html,xorg
./usr/X11R7/man/html1/fc-cache.html -unknown- html,xorg
./usr/X11R7/man/html1/fc-cat.html -unknown- html,xorg
+./usr/X11R7/man/html1/fc-conflist.html -unknown- html,xorg
./usr/X11R7/man/html1/fc-list.html -unknown- html,xorg
./usr/X11R7/man/html1/fc-match.html -unknown- html,xorg
./usr/X11R7/man/html1/fc-pattern.html -unknown- html,xorg
@@ -1560,6 +1563,7 @@
./usr/X11R7/man/man1/editres.1 -unknown- .man,xorg
./usr/X11R7/man/man1/fc-cache.1 -unknown- .man,xorg
./usr/X11R7/man/man1/fc-cat.1 -unknown- .man,xorg
+./usr/X11R7/man/man1/fc-conflist.1 -unknown- .man,xorg
./usr/X11R7/man/man1/fc-list.1 -unknown- .man,xorg
./usr/X11R7/man/man1/fc-match.1 -unknown- .man,xorg
./usr/X11R7/man/man1/fc-pattern.1 -unknown- .man,xorg
diff -r 6c6fe5cac73b -r f5b877480092 distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi Fri Mar 08 09:14:54 2019 +0000
+++ b/distrib/sets/lists/xcomp/mi Fri Mar 08 09:58:23 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.201 2019/01/02 00:46:34 christos Exp $
+# $NetBSD: mi,v 1.202 2019/03/08 09:58:23 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3304,6 +3304,7 @@
./usr/X11R7/man/man3/FcCharSetIntersect.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCharSetIntersectCount.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCharSetIsSubset.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcCharSetMerge.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCharSetNew.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCharSetNextPage.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcCharSetSubtract.3 -unknown- .man,xorg
@@ -3316,6 +3317,9 @@
./usr/X11R7/man/man3/FcConfigCreate.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigDestroy.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigEnableHome.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcConfigFileInfoIterGet.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcConfigFileInfoIterInit.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcConfigFileInfoIterNext.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigFilename.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigGetBlanks.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigGetCache.3 -unknown- .man,xorg
@@ -3326,17 +3330,25 @@
./usr/X11R7/man/man3/FcConfigGetFontDirs.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigGetFonts.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigGetRescanInterval.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcConfigGetSysRoot.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigHome.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigParseAndLoad.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcConfigParseAndLoadFromMemory.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcConfigReference.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigSetCurrent.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigSetRescanInterval.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcConfigSetSysRoot.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigSubstitute.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigSubstituteWithPat.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcConfigUptoDate.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcDefaultSubstitute.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcDirCacheClean.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcDirCacheCreateUUID.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcDirCacheDeleteUUID.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcDirCacheLoad.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcDirCacheLoadFile.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcDirCacheRead.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcDirCacheRescan.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcDirCacheUnlink.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcDirCacheUnload.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcDirCacheValid.3 -unknown- .man,xorg
@@ -3361,6 +3373,7 @@
./usr/X11R7/man/man3/FcFreeTypeCharSet.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcFreeTypeCharSetAndSpacing.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcFreeTypeQuery.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcFreeTypeQueryAll.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
@@ -3373,6 +3386,7 @@
./usr/X11R7/man/man3/FcIsLower.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcIsUpper.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangGetCharSet.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcLangNormalize.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangSetAdd.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangSetCompare.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcLangSetContains.3 -unknown- .man,xorg
@@ -3381,6 +3395,7 @@
./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/FcLangSetGetLangs.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
@@ -3415,12 +3430,29 @@
./usr/X11R7/man/man3/FcPatternDuplicate.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcPatternEqual.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcPatternEqualSubset.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternFilter.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternFindIter.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternFormat.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcPatternGet-Type.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcPatternGet.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternGetWithBinding.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcPatternHash.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternIterEqual.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternIterGetObject.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternIterGetValue.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternIterIsValid.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternIterNext.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternIterStart.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternIterValueCount.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcPatternObjectCount.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcPatternPrint.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcPatternReference.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcPatternRemove.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcRangeCopy.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcRangeCreateDouble.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcRangeCreateInteger.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcRangeDestroy.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcRangeGetDouble.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcStrBasename.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcStrCmp.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcStrCmpIgnoreCase.3 -unknown- .man,xorg
@@ -3431,6 +3463,7 @@
./usr/X11R7/man/man3/FcStrFree.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcStrListCreate.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcStrListDone.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcStrListFirst.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcStrListNext.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcStrPlus.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcStrSetAdd.3 -unknown- .man,xorg
@@ -3452,6 +3485,10 @@
./usr/X11R7/man/man3/FcValueEqual.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcValuePrint.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FcValueSave.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcWeightFromOpenType.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcWeightFromOpenTypeDouble.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcWeightToOpenType.3 -unknown- .man,xorg
+./usr/X11R7/man/man3/FcWeightToOpenTypeDouble.3 -unknown- .man,xorg
./usr/X11R7/man/man3/FontCacheChangeCacheSettings.3 -unknown- obsolete
./usr/X11R7/man/man3/FontCacheGetCacheSettings.3 -unknown- obsolete
./usr/X11R7/man/man3/FontCacheGetCacheStatistics.3 -unknown- obsolete
diff -r 6c6fe5cac73b -r f5b877480092 distrib/sets/lists/xdebug/mi
--- a/distrib/sets/lists/xdebug/mi Fri Mar 08 09:14:54 2019 +0000
+++ b/distrib/sets/lists/xdebug/mi Fri Mar 08 09:58:23 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.28 2018/03/11 09:43:39 mrg Exp $
+# $NetBSD: mi,v 1.29 2019/03/08 09:58:23 mrg Exp $
./etc/mtree/set.xdebug comp-sys-root
./usr/X11R7/lib -unknown- debuglib,xorg,compatx11dir
./usr/X11R7/lib/libFS_g.a -unknown- debuglib,xorg,compatx11file
@@ -118,6 +118,7 @@
./usr/libdata/debug/usr/X11R7/bin/editres.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fc-cache.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/fc-cat.debug -unknown- debug,xorg
+./usr/libdata/debug/usr/X11R7/bin/fc-conflist.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
diff -r 6c6fe5cac73b -r f5b877480092 distrib/sets/lists/xetc/mi
--- a/distrib/sets/lists/xetc/mi Fri Mar 08 09:14:54 2019 +0000
+++ b/distrib/sets/lists/xetc/mi Fri Mar 08 09:58:23 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.31 2018/08/30 05:39:21 maya Exp $
+# $NetBSD: mi,v 1.32 2019/03/08 09:58:23 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -66,10 +66,12 @@
./etc/fonts/conf.d/30-metric-aliases.conf -unknown- xorg
./etc/fonts/conf.d/30-urw-aliases.conf -unknown- xorg
./etc/fonts/conf.d/40-nonlatin.conf -unknown- xorg
+./etc/fonts/conf.d/45-generic.conf -unknown- xorg
./etc/fonts/conf.d/45-latin.conf -unknown- xorg
./etc/fonts/conf.d/49-sansserif.conf -unknown- xorg
./etc/fonts/conf.d/50-user.conf -unknown- xorg
./etc/fonts/conf.d/51-local.conf -unknown- xorg
+./etc/fonts/conf.d/60-generic.conf -unknown- xorg
./etc/fonts/conf.d/60-latin.conf -unknown- xorg
./etc/fonts/conf.d/65-fonts-persian.conf -unknown- xorg
./etc/fonts/conf.d/65-nonlatin.conf -unknown- xorg
diff -r 6c6fe5cac73b -r f5b877480092 external/bsd/libuuid_ul/lib/libuuid_ul/Makefile
--- a/external/bsd/libuuid_ul/lib/libuuid_ul/Makefile Fri Mar 08 09:14:54 2019 +0000
+++ b/external/bsd/libuuid_ul/lib/libuuid_ul/Makefile Fri Mar 08 09:58:23 2019 +0000
@@ -1,35 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2019/03/07 03:53:51 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2019/03/08 09:58:23 mrg Exp $
# Makefile to build minimal util-linux libuuid locally, with special
# prefix on all functions to avoid conflicts with libc uuid_compare(3).
#
LIB= uuid_ul
-SRCS= compare.c copy.c \
- gen_uuid.c \
- pack.c parse.c \
- unpack.c unparse.c
-CPPFLAGS+= \
- -DHAVE_UNISTD_H \
- -DHAVE_STDLIB_H \
- -DHAVE_SYS_TIME_H \
- -DHAVE_SYS_FILE_H \
- -DHAVE_SYS_IOCTL_H \
- -DHAVE_SYS_SOCKET_H \
- -DHAVE_SYS_SOCKIO_H \
- -DHAVE_SYS_SOCKIO_H \
- -DHAVE_NETINET_IN_H \
- -DHAVE_SYS_UN_H \
- -DHAVE_TLS \
- -DHAVE_NET_IF_H \
- -DHAVE_NET_IF_DL_H \
- -DHAVE_SA_LEN
-
-CPPFLAGS+= \
- -I${.CURDIR} \
- -DUL_CLOEXECSTR=\"e\" \
- -DUUIDD_OP_BULK_TIME_UUID=0
+.include "srcs.mk"
+SRCS= ${UUID_UL_SRCS}
.include "libuuid_ul-rename.mk"
@@ -37,4 +15,3 @@
.include <bsd.lib.mk>
-.PATH: ${X11SRCDIR}/external/bsd/libuuid_ul/dist
diff -r 6c6fe5cac73b -r f5b877480092 external/bsd/libuuid_ul/lib/libuuid_ul/srcs.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/libuuid_ul/lib/libuuid_ul/srcs.mk Fri Mar 08 09:58:23 2019 +0000
@@ -0,0 +1,40 @@
+# $NetBSD: srcs.mk,v 1.1 2019/03/08 09:58:23 mrg Exp $
+
+# Sources and flags for libuuid_ul.
+
+UUID_UL_SRCS= \
+ compare.c \
+ copy.c \
+ gen_uuid.c \
+ pack.c \
+ parse.c \
+ unpack.c \
+ unparse.c
+
+UUID_UL_CPPFLAGS+= \
+ -DHAVE_UNISTD_H \
+ -DHAVE_STDLIB_H \
+ -DHAVE_SYS_TIME_H \
+ -DHAVE_SYS_FILE_H \
+ -DHAVE_SYS_IOCTL_H \
+ -DHAVE_SYS_SOCKET_H \
+ -DHAVE_SYS_SOCKIO_H \
+ -DHAVE_SYS_SOCKIO_H \
+ -DHAVE_NETINET_IN_H \
+ -DHAVE_SYS_UN_H \
+ -DHAVE_TLS \
+ -DHAVE_NET_IF_H \
+ -DHAVE_NET_IF_DL_H \
+ -DHAVE_SA_LEN
+
+UUID_UL_CPPFLAGS+= \
+ -I. \
+ -I${NETBSDSRCDIR}/external/bsd/libuuid_ul/lib/libuuid_ul \
+ -DUL_CLOEXECSTR=\"e\" \
+ -DUUIDD_OP_BULK_TIME_UUID=0
+
+.for _s in ${UUID_UL_SRCS}
+CPPFLAGS.${_s}+= ${UUID_UL_CPPFLAGS}
+.endfor
+
+.PATH: ${X11SRCDIR}/external/bsd/libuuid_ul/dist
diff -r 6c6fe5cac73b -r f5b877480092 external/mit/xorg/bin/fc-conflist/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/mit/xorg/bin/fc-conflist/Makefile Fri Mar 08 09:58:23 2019 +0000
Home |
Main Index |
Thread Index |
Old Index