svn commit: r420579 - in head/x11-fonts: fontconfig fontconfig-reference fontconfig/files
Koop Mast
kwm at FreeBSD.org
Sun Aug 21 19:13:34 UTC 2016
Author: kwm
Date: Sun Aug 21 19:13:32 2016
New Revision: 420579
URL: https://svnweb.freebsd.org/changeset/ports/420579
Log:
Update fontconfig to 2.12.1.
Add license lines
Add option to select the preferred hinting configuration
Add CPE info [1]
PR: 211570
Submitted by: lightside at gmx.com, rakuco@ [1]
MFH: 2016Q3
Security: 44989c29-67d1-11e6-8b1d-c86000169601, CVE-2016-5384
Deleted:
head/x11-fonts/fontconfig/files/fc-cache.1
head/x11-fonts/fontconfig/files/fc-cat.1
head/x11-fonts/fontconfig/files/fc-list.1
head/x11-fonts/fontconfig/files/fc-match.1
head/x11-fonts/fontconfig/files/fc-query.1
head/x11-fonts/fontconfig/files/fc-scan.1
head/x11-fonts/fontconfig/files/patch-fc-cache_fc-cache.c
Modified:
head/x11-fonts/fontconfig-reference/Makefile
head/x11-fonts/fontconfig-reference/pkg-plist
head/x11-fonts/fontconfig/Makefile
head/x11-fonts/fontconfig/distinfo
head/x11-fonts/fontconfig/files/patch-Makefile.in
head/x11-fonts/fontconfig/files/patch-configure
head/x11-fonts/fontconfig/files/patch-src__fccompat.c
head/x11-fonts/fontconfig/files/patch-src_fcatomic.h
head/x11-fonts/fontconfig/pkg-plist
Modified: head/x11-fonts/fontconfig-reference/Makefile
==============================================================================
--- head/x11-fonts/fontconfig-reference/Makefile Sun Aug 21 19:12:35 2016 (r420578)
+++ head/x11-fonts/fontconfig-reference/Makefile Sun Aug 21 19:13:32 2016 (r420579)
@@ -4,6 +4,8 @@
PORTREVISION= 0
PORTEPOCH= 0
+NO_ARCH= yes
+
DOCSDIR= ${PREFIX}/share/doc/fontconfig-devel
do-install:
Modified: head/x11-fonts/fontconfig-reference/pkg-plist
==============================================================================
--- head/x11-fonts/fontconfig-reference/pkg-plist Sun Aug 21 19:12:35 2016 (r420578)
+++ head/x11-fonts/fontconfig-reference/pkg-plist Sun Aug 21 19:13:32 2016 (r420579)
@@ -156,6 +156,11 @@ man/man3/FcPatternHash.3.gz
man/man3/FcPatternPrint.3.gz
man/man3/FcPatternReference.3.gz
man/man3/FcPatternRemove.3.gz
+man/man3/FcRangeCopy.3.gz
+man/man3/FcRangeCreateDouble.3.gz
+man/man3/FcRangeCreateInteger.3.gz
+man/man3/FcRangeDestroy.3.gz
+man/man3/FcRangeGetDouble.3.gz
man/man3/FcStrBasename.3.gz
man/man3/FcStrCmp.3.gz
man/man3/FcStrCmpIgnoreCase.3.gz
@@ -188,3 +193,5 @@ man/man3/FcValueDestroy.3.gz
man/man3/FcValueEqual.3.gz
man/man3/FcValuePrint.3.gz
man/man3/FcValueSave.3.gz
+man/man3/FcWeightFromOpenType.3.gz
+man/man3/FcWeightToOpenType.3.gz
Modified: head/x11-fonts/fontconfig/Makefile
==============================================================================
--- head/x11-fonts/fontconfig/Makefile Sun Aug 21 19:12:35 2016 (r420578)
+++ head/x11-fonts/fontconfig/Makefile Sun Aug 21 19:13:32 2016 (r420579)
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= fontconfig
-PORTVERSION= 2.11.1
-PORTREVISION?= 3
+PORTVERSION= 2.12.1
+PORTREVISION?= 0
PORTEPOCH?= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://www.freedesktop.org/software/fontconfig/release/
@@ -11,6 +11,9 @@ MASTER_SITES= http://www.freedesktop.org
MAINTAINER= gnome at FreeBSD.org
COMMENT= XML-based font configuration API for X Windows
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/COPYING
+
USES= tar:bzip2
.if !defined(REFERENCE_PORT)
@@ -18,7 +21,8 @@ USES= tar:bzip2
LIB_DEPENDS= libfreetype.so:print/freetype2 \
libexpat.so:textproc/expat2
-USES+= gmake libtool pathfix pkgconfig
+USES+= cpe gmake libtool pathfix pkgconfig
+CPE_VENDOR= fontconfig_project
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-configdir=${PREFIX}/etc/fonts/conf.d \
@@ -26,6 +30,7 @@ CONFIGURE_ARGS= --with-configdir=${PREFI
--with-xmldir=${PREFIX}/etc/fonts \
--with-expat-includes=${LOCALBASE}/include \
--with-expat-lib=${LOCALBASE}/lib \
+ --with-default-hinting=${PREFERRED_HINTING} \
--with-default-fonts=${PREFIX}/share/fonts \
--with-add-fonts=${LOCALBASE}/lib/X11/fonts \
--with-cache-dir=/var/db/fontconfig \
@@ -34,25 +39,32 @@ CONFIGURE_ARGS= --with-configdir=${PREFI
# D6155: static linked library linking added to support statically linked
# applications, e.g. x11/xforward static option
-CONFIGURE_ARGS+= --enable-static
+CONFIGURE_ARGS+= --enable-static
+# Python is not required, because fc-blanks.h is available in distfile
+CONFIGURE_ENV= PYTHON=":"
MAKE_ENV= LC_ALL=C
PKGINSTALL= ${WRKDIR}/pkg-install
INSTALL_TARGET=install-strip
-MAN1PAGES= fc-cache.1 fc-cat.1 fc-list.1 fc-match.1 fc-query.1 fc-scan.1
-MAN5PAGES= fonts-conf.5
+PLIST_SUB= PREFERRED_HINTING=${PREFERRED_HINTING}
PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
OPTIONS_DEFINE= DOCS
+OPTIONS_SINGLE= HINTING
+HINTING_DESC= Preferred pixel hinting configuration
+.for opt in NONE SLIGHT MEDIUM FULL
+OPTIONS_SINGLE_HINTING+= HINTING_${opt}
+HINTING_${opt}_DESC= ${opt:tl}
+HINTING_${opt}_VARS= PREFERRED_HINTING=${opt:tl}
+.endfor
+OPTIONS_DEFAULT= HINTING_SLIGHT
post-install:
- ${INSTALL_MAN} ${MAN5PAGES:S|^|${WRKSRC}/doc/|} \
- ${STAGEDIR}${PREFIX}/man/man5
-.for manpage in ${MAN1PAGES}
- ${INSTALL_MAN} ${FILESDIR}/${manpage} \
+ ${INSTALL_MAN} ${WRKSRC}/fc-*/*.1 \
${STAGEDIR}${PREFIX}/man/man1
-.endfor
+ ${INSTALL_MAN} ${WRKSRC}/doc/*.5 \
+ ${STAGEDIR}${PREFIX}/man/man5
${INSTALL_DATA} ${WRKSRC}/fonts.conf \
${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf.sample
@${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \
Modified: head/x11-fonts/fontconfig/distinfo
==============================================================================
--- head/x11-fonts/fontconfig/distinfo Sun Aug 21 19:12:35 2016 (r420578)
+++ head/x11-fonts/fontconfig/distinfo Sun Aug 21 19:13:32 2016 (r420579)
@@ -1,2 +1,3 @@
-SHA256 (fontconfig-2.11.1.tar.bz2) = dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99
-SIZE (fontconfig-2.11.1.tar.bz2) = 1516095
+TIMESTAMP = 1470376167
+SHA256 (fontconfig-2.12.1.tar.bz2) = b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3
+SIZE (fontconfig-2.12.1.tar.bz2) = 1608901
Modified: head/x11-fonts/fontconfig/files/patch-Makefile.in
==============================================================================
--- head/x11-fonts/fontconfig/files/patch-Makefile.in Sun Aug 21 19:12:35 2016 (r420578)
+++ head/x11-fonts/fontconfig/files/patch-Makefile.in Sun Aug 21 19:13:32 2016 (r420579)
@@ -1,6 +1,6 @@
---- Makefile.in.orig 2012-11-01 10:55:40.000000000 +0000
-+++ Makefile.in 2012-11-01 10:56:37.000000000 +0000
-@@ -932,28 +932,6 @@
+--- Makefile.in.orig 2016-08-05 05:49:13 UTC
++++ Makefile.in
+@@ -1027,28 +1027,6 @@ fonts.conf: fonts.conf.in Makefile
mv $@.tmp $@
install-data-local: fonts.conf
Modified: head/x11-fonts/fontconfig/files/patch-configure
==============================================================================
--- head/x11-fonts/fontconfig/files/patch-configure Sun Aug 21 19:12:35 2016 (r420578)
+++ head/x11-fonts/fontconfig/files/patch-configure Sun Aug 21 19:13:32 2016 (r420579)
@@ -1,6 +1,6 @@
---- configure.orig 2013-12-27 19:47:10.000000000 +0100
-+++ configure 2013-12-27 19:47:24.000000000 +0100
-@@ -654,6 +654,7 @@
+--- configure.orig 2016-08-05 05:49:14 UTC
++++ configure
+@@ -654,6 +654,7 @@ ax_pthread_config
XMLDIR
CONFIGDIR
BASECONFIGDIR
Modified: head/x11-fonts/fontconfig/files/patch-src__fccompat.c
==============================================================================
--- head/x11-fonts/fontconfig/files/patch-src__fccompat.c Sun Aug 21 19:12:35 2016 (r420578)
+++ head/x11-fonts/fontconfig/files/patch-src__fccompat.c Sun Aug 21 19:13:32 2016 (r420579)
@@ -4,9 +4,9 @@ Removing this code from ARM builds resol
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=183536
---- src/fccompat.c.orig 2014-08-12 16:34:15.875384345 +0200
-+++ src/fccompat.c 2014-08-12 16:35:04.752379905 +0200
-@@ -191,7 +191,7 @@
+--- src/fccompat.c.orig 2016-07-11 02:41:06 UTC
++++ src/fccompat.c
+@@ -191,7 +191,7 @@ FcRandom(void)
#else
random_r (&fcrandbuf, &result);
#endif
Modified: head/x11-fonts/fontconfig/files/patch-src_fcatomic.h
==============================================================================
--- head/x11-fonts/fontconfig/files/patch-src_fcatomic.h Sun Aug 21 19:12:35 2016 (r420578)
+++ head/x11-fonts/fontconfig/files/patch-src_fcatomic.h Sun Aug 21 19:13:32 2016 (r420579)
@@ -1,6 +1,6 @@
---- ./src/fcatomic.h.orig 2013-10-11 03:10:18.000000000 +0000
-+++ ./src/fcatomic.h 2014-12-06 21:48:12.136252912 +0000
-@@ -96,7 +96,17 @@
+--- src/fcatomic.h.orig 2016-07-11 02:41:06 UTC
++++ src/fcatomic.h
+@@ -96,7 +96,17 @@ typedef int fc_atomic_int_t;
#define fc_atomic_int_add(AI, V) __sync_fetch_and_add (&(AI), (V))
#define fc_atomic_ptr_get(P) (void *) (__sync_synchronize (), *(P))
Modified: head/x11-fonts/fontconfig/pkg-plist
==============================================================================
--- head/x11-fonts/fontconfig/pkg-plist Sun Aug 21 19:12:35 2016 (r420578)
+++ head/x11-fonts/fontconfig/pkg-plist Sun Aug 21 19:13:32 2016 (r420579)
@@ -7,6 +7,10 @@ bin/fc-query
bin/fc-scan
bin/fc-validate
etc/fonts/conf.avail/10-autohint.conf
+etc/fonts/conf.avail/10-hinting-full.conf
+etc/fonts/conf.avail/10-hinting-medium.conf
+etc/fonts/conf.avail/10-hinting-none.conf
+etc/fonts/conf.avail/10-hinting-slight.conf
etc/fonts/conf.avail/10-no-sub-pixel.conf
etc/fonts/conf.avail/10-scale-bitmap-fonts.conf
etc/fonts/conf.avail/10-sub-pixel-bgr.conf
@@ -35,6 +39,7 @@ etc/fonts/conf.avail/70-no-bitmaps.conf
etc/fonts/conf.avail/70-yes-bitmaps.conf
etc/fonts/conf.avail/80-delicious.conf
etc/fonts/conf.avail/90-synthetic.conf
+etc/fonts/conf.d/10-hinting-%%PREFERRED_HINTING%%.conf
etc/fonts/conf.d/10-scale-bitmap-fonts.conf
etc/fonts/conf.d/20-unhint-small-vera.conf
etc/fonts/conf.d/30-metric-aliases.conf
@@ -59,13 +64,15 @@ include/fontconfig/fontconfig.h
lib/libfontconfig.a
lib/libfontconfig.so
lib/libfontconfig.so.1
-lib/libfontconfig.so.1.8.0
+lib/libfontconfig.so.1.9.2
libdata/pkgconfig/fontconfig.pc
man/man1/fc-cache.1.gz
man/man1/fc-cat.1.gz
man/man1/fc-list.1.gz
man/man1/fc-match.1.gz
+man/man1/fc-pattern.1.gz
man/man1/fc-query.1.gz
man/man1/fc-scan.1.gz
+man/man1/fc-validate.1.gz
man/man5/fonts-conf.5.gz
@dir /var/db/fontconfig
More information about the svn-ports-head
mailing list