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.8.
details: https://anonhg.NetBSD.org/src/rev/e5a84ede8d47
branches: trunk
changeset: 826345:e5a84ede8d47
user: mrg <mrg%NetBSD.org@localhost>
date: Tue Aug 29 09:02:10 2017 +0000
description:
updates for fontconfig 2.8.
note that we don't (yet?) install the new fc-blank as it
has a python generator.
diffstat:
distrib/sets/lists/xbase/shl.mi | 4 ++--
distrib/sets/lists/xdebug/shl.mi | 4 ++--
distrib/sets/lists/xetc/mi | 7 ++++++-
external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile | 6 +++++-
external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile | 3 ++-
external/mit/xorg/lib/fontconfig/src/Makefile | 5 +++--
external/mit/xorg/lib/fontconfig/src/shlib_version | 4 ++--
external/mit/xorg/tools/fc-cache/Makefile | 11 ++++++++---
8 files changed, 30 insertions(+), 14 deletions(-)
diffs (173 lines):
diff -r e3c639975aac -r e5a84ede8d47 distrib/sets/lists/xbase/shl.mi
--- a/distrib/sets/lists/xbase/shl.mi Tue Aug 29 07:53:54 2017 +0000
+++ b/distrib/sets/lists/xbase/shl.mi Tue Aug 29 09:02:10 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.76 2017/03/05 09:27:52 mrg Exp $
+# $NetBSD: shl.mi,v 1.77 2017/08/29 09:02:10 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -175,7 +175,7 @@
./usr/X11R7/lib/libexpat.so.2.0 -obsolete- obsolete
./usr/X11R7/lib/libfontconfig.so -unknown- xorg,compatx11file
./usr/X11R7/lib/libfontconfig.so.2 -unknown- xorg,compatx11file
-./usr/X11R7/lib/libfontconfig.so.2.2 -unknown- xorg,compatx11file
+./usr/X11R7/lib/libfontconfig.so.2.3 -unknown- xorg,compatx11file
./usr/X11R7/lib/libfontenc.so -unknown- xorg,compatx11file
./usr/X11R7/lib/libfontenc.so.2 -unknown- xorg,compatx11file
./usr/X11R7/lib/libfontenc.so.2.0 -unknown- xorg,compatx11file
diff -r e3c639975aac -r e5a84ede8d47 distrib/sets/lists/xdebug/shl.mi
--- a/distrib/sets/lists/xdebug/shl.mi Tue Aug 29 07:53:54 2017 +0000
+++ b/distrib/sets/lists/xdebug/shl.mi Tue Aug 29 09:02:10 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.39 2017/03/05 22:24:29 htodd Exp $
+# $NetBSD: shl.mi,v 1.40 2017/08/29 09:02:10 mrg Exp $
./usr/libdata/debug/usr/X11R7/lib -unknown- xorg,debug,compatx11dir
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug obsolete xorg,obsolete
@@ -58,7 +58,7 @@
./usr/libdata/debug/usr/X11R7/lib/libdrm_radeon.so.0.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libepoxy.so.0.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libexpat.so.2.0.debug -obsolete- obsolete,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.2.debug -unknown- xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libfontconfig.so.2.3.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libfontenc.so.2.0.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libfreetype.so.18.0.13.debug -unknown- xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libgbm.so.1.0.debug -unknown- xorg,debug,compatx11file
diff -r e3c639975aac -r e5a84ede8d47 distrib/sets/lists/xetc/mi
--- a/distrib/sets/lists/xetc/mi Tue Aug 29 07:53:54 2017 +0000
+++ b/distrib/sets/lists/xetc/mi Tue Aug 29 09:02:10 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.27 2016/12/15 12:56:52 kre Exp $
+# $NetBSD: mi,v 1.28 2017/08/29 09:02:10 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -58,6 +58,10 @@
./etc/X11/xsm/system.xsm -unknown- xorg
./etc/drirc -unknown- xorg
./etc/fonts/conf.avail/10-autohint.conf -unknown- xorg
+./etc/fonts/conf.avail/10-hinting-full.conf -unknown- xorg
+./etc/fonts/conf.avail/10-hinting-medium.conf -unknown- xorg
+./etc/fonts/conf.avail/10-hinting-none.conf -unknown- xorg
+./etc/fonts/conf.avail/10-hinting-slight.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
@@ -88,6 +92,7 @@
./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/10-hinting-slight.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 e3c639975aac -r e5a84ede8d47 external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile
--- a/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile Tue Aug 29 07:53:54 2017 +0000
+++ b/external/mit/xorg/lib/fontconfig/etc/conf.avail/Makefile Tue Aug 29 09:02:10 2017 +0000
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2013/06/03 20:23:39 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2017/08/29 09:02:10 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.fontconfig}/conf.d
CONFIGFILES= \
10-autohint.conf \
+ 10-hinting-full.conf \
+ 10-hinting-medium.conf \
+ 10-hinting-none.conf \
+ 10-hinting-slight.conf \
10-no-sub-pixel.conf \
10-sub-pixel-bgr.conf \
10-sub-pixel-rgb.conf \
diff -r e3c639975aac -r e5a84ede8d47 external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
--- a/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile Tue Aug 29 07:53:54 2017 +0000
+++ b/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile Tue Aug 29 09:02:10 2017 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2013/06/03 20:23:39 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2017/08/29 09:02:10 mrg Exp $
.include <bsd.own.mk>
.PATH: ${X11SRCDIR.fontconfig}/conf.d
FONTCONFIG_LINKS= \
+ 10-hinting-slight.conf \
10-scale-bitmap-fonts.conf \
20-unhint-small-vera.conf \
30-urw-aliases.conf \
diff -r e3c639975aac -r e5a84ede8d47 external/mit/xorg/lib/fontconfig/src/Makefile
--- a/external/mit/xorg/lib/fontconfig/src/Makefile Tue Aug 29 07:53:54 2017 +0000
+++ b/external/mit/xorg/lib/fontconfig/src/Makefile Tue Aug 29 09:02:10 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2016/09/27 19:18:42 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2017/08/29 09:02:10 mrg Exp $
.include <bsd.own.mk>
@@ -17,7 +17,6 @@
fcformat.c \
fcfreetype.c \
fcfs.c \
- fchash.c \
fcinit.c \
fclang.c \
fclist.c \
@@ -26,9 +25,11 @@
fcname.c \
fcobjs.c \
fcpat.c \
+ fcrange.c \
fcserialize.c \
fcstat.c \
fcstr.c \
+ fcweight.c \
fcxml.c \
ftglue.c
diff -r e3c639975aac -r e5a84ede8d47 external/mit/xorg/lib/fontconfig/src/shlib_version
--- a/external/mit/xorg/lib/fontconfig/src/shlib_version Tue Aug 29 07:53:54 2017 +0000
+++ b/external/mit/xorg/lib/fontconfig/src/shlib_version Tue Aug 29 09:02:10 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.4 2013/06/03 20:23:39 mrg Exp $
+# $NetBSD: shlib_version,v 1.5 2017/08/29 09:02:10 mrg Exp $
#
major=2
-minor=2
+minor=3
diff -r e3c639975aac -r e5a84ede8d47 external/mit/xorg/tools/fc-cache/Makefile
--- a/external/mit/xorg/tools/fc-cache/Makefile Tue Aug 29 07:53:54 2017 +0000
+++ b/external/mit/xorg/tools/fc-cache/Makefile Tue Aug 29 09:02:10 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/07/20 04:10:40 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2017/08/29 09:02:10 mrg Exp $
NOMAN= 1
@@ -16,9 +16,10 @@
.PATH: ${FONTCONFIG}/src
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 \
+ fcfreetype.c fcfs.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 \
+ fcpat.c fcrange.c fcserialize.c fcstat.c fcstr.c \
+ fcweight.c fcxml.c \
ftglue.c
.PATH: ${FREETYPE}/src/base
@@ -89,9 +90,13 @@
SRCS= ${SRCS.fc-cache} ${SRCS.fontconfig} ${SRCS.freetype} ${SRCS.expat}
# XXX FONTCONFIG_PATH was arbitrarily chosen
+# XXX ALIGNOF_VOID_P=8 not valid for 32 bit, but probably ok?
HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DESTDIR}/etc/X11/fonts"' \
-DFC_DEFAULT_FONTS='"${X11FONTDIR}/Type1"' \
-DFC_CACHEDIR='"${DESTDIR}/var/cache/fontconfig"' \
+ -DFC_GPERF_SIZE_T=unsigned \
+ -DFC_NO_MT=1 \
+ -DALIGNOF_VOID_P=8 \
-DHAVE_FT_BITMAP_SIZE_Y_PPEM \
-DHAVE_FT_GET_BDF_PROPERTY \
-DHAVE_FT_GET_NEXT_CHAR \
Home |
Main Index |
Thread Index |
Old Index