Date: Mon, 15 Feb 2021 19:09:15 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r565327 - in head/x11-fonts/fontconfig: . files Message-ID: <202102151909.11FJ9FTj057626@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Mon Feb 15 19:09:14 2021 New Revision: 565327 URL: https://svnweb.freebsd.org/changeset/ports/565327 Log: x11-fonts/fontconfig: Update to 2.13.93 Changelog: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/blob/master/README - Switch to meson build system PR: 253212 Exp-run by: antoine Submitted by: daniel.engberg.lists@pyret.net Added: head/x11-fonts/fontconfig/files/patch-conf.d_60-latin.conf (contents, props changed) head/x11-fonts/fontconfig/files/patch-conf.d_meson.build (contents, props changed) head/x11-fonts/fontconfig/files/patch-meson.build (contents, props changed) head/x11-fonts/fontconfig/files/patch-src_meson.build (contents, props changed) Deleted: head/x11-fonts/fontconfig/files/patch-2.13.92.diff 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 Modified: head/x11-fonts/fontconfig/Makefile head/x11-fonts/fontconfig/distinfo head/x11-fonts/fontconfig/files/patch-src_fclang.c head/x11-fonts/fontconfig/pkg-plist Modified: head/x11-fonts/fontconfig/Makefile ============================================================================== --- head/x11-fonts/fontconfig/Makefile Mon Feb 15 18:56:11 2021 (r565326) +++ head/x11-fonts/fontconfig/Makefile Mon Feb 15 19:09:14 2021 (r565327) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= fontconfig -PORTVERSION= 2.13.92 -PORTREVISION?= 2 -PORTEPOCH?= 1 +DISTVERSION= 2.13.93 +PORTEPOCH= 1 CATEGORIES= x11-fonts MASTER_SITES= https://www.freedesktop.org/software/fontconfig/release/ @@ -14,76 +13,66 @@ COMMENT= XML-based font configuration API for X Window LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -USES= gperf tar:xz - -.if !defined(REFERENCE_PORT) - LIB_DEPENDS= libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 -USES+= cpe gmake libtool pathfix pkgconfig +USES= cpe gperf meson pkgconfig python:3.6+,build shebangfix tar:xz CPE_VENDOR= fontconfig_project USE_LDCONFIG= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-configdir=${PREFIX}/etc/fonts/conf.d \ - --with-templatedir=${PREFIX}/etc/fonts/conf.avail \ - --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 \ - --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \ - --disable-docs -# D6155: static linked library linking added to support statically linked -# applications, e.g. x11/xforward static option -CONFIGURE_ARGS+= --enable-static +SHEBANG_FILES= conf.d/link_confs.py \ + conf.d/write-35-lang-normalize-conf.py \ + fc-case/fc-case.py \ + fc-lang/fc-lang.py -PKGINSTALL= ${WRKDIR}/pkg-install -INSTALL_TARGET=install-strip +TEST_TARGET= test +# Custom configuration variables +FCDEFAULTFONTS= ${PREFIX}/share/fonts +FCADDFONTS= ${LOCALBASE}/lib/X11/fonts + +# To avoid circular depdency docs (including manpages) needs to be disabled as +# they depend on textproc/docbook-utils which requires fontconfig +MESON_ARGS= -Ddefault_library=both -Ddoc=disabled + PLIST_SUB= PREFERRED_HINTING=${PREFERRED_HINTING} -PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt -OPTIONS_DEFINE= DOCS NLS NO_BITMAPS -OPTIONS_DEFAULT=HINTING_SLIGHT +OPTIONS_DEFINE= NLS BITMAPS TEST +OPTIONS_DEFAULT=BITMAPS HINTING_SLIGHT OPTIONS_SUB= yes -NO_BITMAPS_DESC= Reject bitmap fonts by default - 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 -NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls +BITMAPS_DESC= Enable bitmap fonts by default +HINTING_DESC= Preferred pixel hinting configuration -post-patch-NO_BITMAPS-on: - @${REINPLACE_CMD} -i '.bitmaps.bak' -e \ - '/^CONF_LINKS =/s|$$|\${.newline} 70-no-bitmaps.conf \\|' \ - ${WRKSRC}/conf.d/Makefile.in +NLS_USES= gettext-tools +NLS_MESON_ENABLED= nls +TEST_MESON_ENABLED= tests + +post-patch: + @${REINPLACE_CMD} -e 's|%%FCDEFAULTFONTS%%|${FCDEFAULTFONTS}|g' \ + ${PATCH_WRKSRC}/meson.build + @${REINPLACE_CMD} -e 's|%%FCADDFONTS%%|${FCADDFONTS}|g' \ + ${PATCH_WRKSRC}/meson.build + @${REINPLACE_CMD} -e 's|%%FCPREFERREDHINTING%%|${PREFERRED_HINTING}|g' \ + ${PATCH_WRKSRC}/conf.d/meson.build + post-install: - ${INSTALL_MAN} ${WRKSRC}/fc-*/*.1 \ - ${STAGEDIR}${PREFIX}/man/man1 - ${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}| ; \ - s|%%LOCALBASE%%|${LOCALBASE}|' < ${FILESDIR}/pkg-install.in \ - > ${PKGINSTALL} + ${MV} ${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf ${STAGEDIR}${PREFIX}/etc/fonts/fonts.conf.sample + @${MKDIR} ${STAGEDIR}/var/db/fontconfig -post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} +post-install-BITMAPS-off: + ${RLN} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail/70-no-bitmaps.conf ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/70-no-bitmaps.conf -.include <bsd.port.mk> +post-install-BITMAPS-on: + ${RM} ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/70-no-bitmaps.conf + ${RLN} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail/70-yes-bitmaps.conf ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/70-yes-bitmaps.conf -.endif +.include <bsd.port.mk> Modified: head/x11-fonts/fontconfig/distinfo ============================================================================== --- head/x11-fonts/fontconfig/distinfo Mon Feb 15 18:56:11 2021 (r565326) +++ head/x11-fonts/fontconfig/distinfo Mon Feb 15 19:09:14 2021 (r565327) @@ -1,3 +1,3 @@ -TIMESTAMP = 1565349179 -SHA256 (fontconfig-2.13.92.tar.xz) = 506e61283878c1726550bc94f2af26168f1e9f2106eac77eaaf0b2cdfad66e4e -SIZE (fontconfig-2.13.92.tar.xz) = 1413128 +TIMESTAMP = 1612204906 +SHA256 (fontconfig-2.13.93.tar.xz) = ea968631eadc5739bc7c8856cef5c77da812d1f67b763f5e51b57b8026c1a0a0 +SIZE (fontconfig-2.13.93.tar.xz) = 1418288 Added: head/x11-fonts/fontconfig/files/patch-conf.d_60-latin.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fonts/fontconfig/files/patch-conf.d_60-latin.conf Mon Feb 15 19:09:14 2021 (r565327) @@ -0,0 +1,62 @@ +--- conf.d/60-latin.conf.orig 2020-11-28 01:56:42 UTC ++++ conf.d/60-latin.conf +@@ -5,44 +5,47 @@ + <alias> + <family>serif</family> + <prefer> ++ <family>Liberation Serif</family> + <family>DejaVu Serif</family> + <family>Times New Roman</family> +- <family>Thorndale AMT</family> + <family>Luxi Serif</family> + <family>Nimbus Roman No9 L</family> + <family>Nimbus Roman</family> + <family>Times</family> ++ <family>Thorndale AMT</family> + </prefer> + </alias> + <alias> + <family>sans-serif</family> + <prefer> ++ <family>Liberation Sans</family> + <family>DejaVu Sans</family> +- <family>Verdana</family> + <family>Arial</family> +- <family>Albany AMT</family> + <family>Luxi Sans</family> + <family>Nimbus Sans L</family> + <family>Nimbus Sans</family> + <family>Helvetica</family> + <family>Lucida Sans Unicode</family> + <family>BPG Glaho International</family> <!-- lat,cyr,arab,geor --> ++ <family>Verdana</family> + <family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai --> ++ <family>Albany AMT</family> + </prefer> + </alias> + <alias> + <family>monospace</family> + <prefer> ++ <family>Liberation Mono</family> + <family>DejaVu Sans Mono</family> + <family>Inconsolata</family> + <family>Andale Mono</family> + <family>Courier New</family> +- <family>Cumberland AMT</family> + <family>Luxi Mono</family> + <family>Nimbus Mono L</family> + <family>Nimbus Mono</family> + <family>Nimbus Mono PS</family> + <family>Courier</family> ++ <family>Cumberland AMT</family> + </prefer> + </alias> + <!-- +@@ -63,6 +66,7 @@ + <alias> + <family>cursive</family> + <prefer> ++ <family>Comic Neue</family> + <family>ITC Zapf Chancery Std</family> + <family>Zapfino</family> + <family>Comic Sans MS</family> Added: head/x11-fonts/fontconfig/files/patch-conf.d_meson.build ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fonts/fontconfig/files/patch-conf.d_meson.build Mon Feb 15 19:09:14 2021 (r565327) @@ -0,0 +1,33 @@ +--- conf.d/meson.build.orig 2020-11-28 01:56:42 UTC ++++ conf.d/meson.build +@@ -37,7 +37,7 @@ conf_files = [ + '90-synthetic.conf', + ] + +-preferred_hinting = 'slight' ++preferred_hinting = '%%FCPREFERREDHINTING%%' + + conf_links = [ + '10-hinting-@0@.conf'.format(preferred_hinting), +@@ -59,10 +59,10 @@ conf_links = [ + '90-synthetic.conf', + ] + +-install_data(conf_files, install_dir: join_paths(get_option('datadir'), 'fontconfig/conf.avail')) ++install_data(conf_files, install_dir: join_paths(get_option('sysconfdir'), 'fonts/conf.avail')) + + meson.add_install_script('link_confs.py', +- join_paths(get_option('prefix'), get_option('datadir'), 'fontconfig/conf.avail'), ++ join_paths(get_option('prefix'), get_option('sysconfdir'), 'fonts/conf.avail'), + join_paths(get_option('sysconfdir'), 'fonts', 'conf.d'), + conf_links, + ) +@@ -79,7 +79,7 @@ endforeach + custom_target('35-lang-normalize.conf', + output: '35-lang-normalize.conf', + command: [find_program('write-35-lang-normalize-conf.py'), ','.join(orths), '@OUTPUT@'], +- install_dir: join_paths(get_option('datadir'), 'fontconfig/conf.avail'), ++ install_dir: join_paths(get_option('sysconfdir'), 'fonts/conf.avail'), + install: true) + + # README Added: head/x11-fonts/fontconfig/files/patch-meson.build ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fonts/fontconfig/files/patch-meson.build Mon Feb 15 19:09:14 2021 (r565327) @@ -0,0 +1,36 @@ +--- meson.build.orig 2020-11-28 02:38:31 UTC ++++ meson.build +@@ -212,19 +212,19 @@ else + conf.set_quoted('FC_DEFAULT_FONTS', '<dir>/System/Library/Fonts</dir> <dir>/Library/Fonts</dir> <dir>~/Library/Fonts</dir> <dir>/System/Library/Assets/com_apple_MobileAsset_Font3</dir> <dir>/System/Library/Assets/com_apple_MobileAsset_Font4</dir>') + fonts_conf.set('FC_DEFAULT_FONTS', '<dir>/System/Library/Fonts</dir> <dir>/Library/Fonts</dir> <dir>~/Library/Fonts</dir> <dir>/System/Library/Assets/com_apple_MobileAsset_Font3</dir> <dir>/System/Library/Assets/com_apple_MobileAsset_Font4</dir>') + else +- conf.set_quoted('FC_DEFAULT_FONTS', '<dir>/usr/share/fonts</dir>') +- fonts_conf.set('FC_DEFAULT_FONTS', '<dir>/usr/share/fonts</dir>') ++ conf.set_quoted('FC_DEFAULT_FONTS', '<dir>%%FCDEFAULTFONTS%%</dir> <dir>%%FCADDFONTS%%</dir>') ++ fonts_conf.set('FC_DEFAULT_FONTS', '<dir>%%FCDEFAULTFONTS%%</dir> <dir>%%FCADDFONTS%%</dir>') + endif +- fc_cachedir = join_paths(prefix, get_option('localstatedir'), 'cache', meson.project_name()) ++ fc_cachedir = '/var/db/fontconfig' + thread_dep = dependency('threads') + conf.set('HAVE_PTHREAD', 1) + deps += [thread_dep] + endif + +-fc_templatedir = join_paths(prefix, get_option('datadir'), 'fontconfig/conf.avail') ++fc_templatedir = join_paths(prefix, get_option('sysconfdir'), 'fonts/conf.avail') + fc_baseconfigdir = join_paths(prefix, get_option('sysconfdir'), 'fonts') + fc_configdir = join_paths(fc_baseconfigdir, 'conf.d') +-fc_xmldir = join_paths(prefix, get_option('datadir'), 'xml/fontconfig') ++fc_xmldir = join_paths(prefix, get_option('sysconfdir'), 'fonts') + + + conf.set_quoted('CONFIGDIR', fc_configdir) +@@ -361,7 +361,7 @@ configure_file(output: 'fonts.conf', + install: true) + + install_data('fonts.dtd', +- install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'xml/fontconfig') ++ install_dir: join_paths(get_option('prefix'), get_option('sysconfdir'), 'fonts') + ) + + fc_headers = [ Modified: head/x11-fonts/fontconfig/files/patch-src_fclang.c ============================================================================== --- head/x11-fonts/fontconfig/files/patch-src_fclang.c Mon Feb 15 18:56:11 2021 (r565326) +++ head/x11-fonts/fontconfig/files/patch-src_fclang.c Mon Feb 15 19:09:14 2021 (r565327) @@ -1,4 +1,4 @@ ---- src/fclang.c.orig 2017-09-21 04:44:27 UTC +--- src/fclang.c.orig 2020-11-28 01:56:42 UTC +++ src/fclang.c @@ -183,6 +183,7 @@ FcLangNormalize (const FcChar8 *lang) { Added: head/x11-fonts/fontconfig/files/patch-src_meson.build ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fonts/fontconfig/files/patch-src_meson.build Mon Feb 15 19:09:14 2021 (r565327) @@ -0,0 +1,12 @@ +--- src/meson.build.orig 2020-11-28 01:56:42 UTC ++++ src/meson.build +@@ -88,7 +88,7 @@ pkgmod.generate(libfontconfig, + version: fc_version, + variables: [ + 'sysconfdir=@0@'.format(join_paths(prefix, get_option('sysconfdir'))), +- 'localstatedir=@0@'.format(join_paths(prefix, get_option('localstatedir'))), ++ 'localstatedir=/var', + 'confdir=${sysconfdir}/fonts', +- 'cachedir=${localstatedir}/cache/fontconfig', ++ 'cachedir=/var/db/fontconfig', + ]) Modified: head/x11-fonts/fontconfig/pkg-plist ============================================================================== --- head/x11-fonts/fontconfig/pkg-plist Mon Feb 15 18:56:11 2021 (r565326) +++ head/x11-fonts/fontconfig/pkg-plist Mon Feb 15 19:09:14 2021 (r565327) @@ -60,6 +60,7 @@ etc/fonts/conf.d/65-fonts-persian.conf etc/fonts/conf.d/65-nonlatin.conf etc/fonts/conf.d/69-unifont.conf %%NO_BITMAPS%%etc/fonts/conf.d/70-no-bitmaps.conf +%%BITMAPS%%etc/fonts/conf.d/70-yes-bitmaps.conf etc/fonts/conf.d/80-delicious.conf etc/fonts/conf.d/90-synthetic.conf etc/fonts/conf.d/README @@ -73,16 +74,6 @@ lib/libfontconfig.so lib/libfontconfig.so.1 lib/libfontconfig.so.1.12.0 libdata/pkgconfig/fontconfig.pc -man/man1/fc-cache.1.gz -man/man1/fc-cat.1.gz -man/man1/fc-conflist.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 share/gettext/its/fontconfig.its share/gettext/its/fontconfig.loc %%NLS%%share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202102151909.11FJ9FTj057626>