Date: Mon, 20 Feb 2023 15:10:58 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b57fcb31ae96 - main - x11-fonts/fontconfig: Update to 2.14.2 Message-ID: <202302201510.31KFAwOU060473@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=b57fcb31ae96e8b145167ba71d3431bbb20e1a1c commit b57fcb31ae96e8b145167ba71d3431bbb20e1a1c Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2023-02-20 14:50:31 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2023-02-20 15:10:31 +0000 x11-fonts/fontconfig: Update to 2.14.2 Upstream now supports definition of a lot of variables which means we can now drop a bunch of local patches. Changelog: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/blob/2.14.1/README PR: 268627 Approved by: desktop (tcberner) Exp-run by: antoine --- x11-fonts/fontconfig/Makefile | 23 ++++++--------- x11-fonts/fontconfig/distinfo | 6 ++-- .../fontconfig/files/patch-conf.d_meson.build | 33 ---------------------- x11-fonts/fontconfig/files/patch-meson.build | 29 ++----------------- .../fontconfig/files/patch-meson__options.txt | 8 ------ x11-fonts/fontconfig/files/patch-src_meson.build | 12 -------- x11-fonts/fontconfig/pkg-plist | 9 +++++- 7 files changed, 22 insertions(+), 98 deletions(-) diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index 037bcdc3fd2f..416665b13ffb 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -1,5 +1,5 @@ PORTNAME= fontconfig -DISTVERSION= 2.14.0 +DISTVERSION= 2.14.2 PORTEPOCH= 1 CATEGORIES= x11-fonts MASTER_SITES= https://www.freedesktop.org/software/fontconfig/release/ @@ -26,13 +26,15 @@ SHEBANG_FILES= conf.d/link_confs.py \ TEST_TARGET= test -# Custom configuration variables -FCDEFAULTFONTS= ${PREFIX}/share/fonts -FCADDFONTS= ${LOCALBASE}/lib/X11/fonts - # To avoid circular dependency rebuild of docs (including manpages) needs to be # disabled as they depend on textproc/docbook-utils which requires fontconfig -MESON_ARGS= -Ddefault_library=both -Ddoc=disabled -Dcache-build=disabled +MESON_ARGS= -Ddefault_library=both -Ddoc=disabled -Dcache-build=disabled \ + -Ddefault-fonts-dirs=${PREFIX}/share/fonts \ + -Dadditional-fonts-dirs=${LOCALBASE}/lib/X11/fonts \ + -Dlocalstatedir=/var \ + -Dcache-dir=/var/db/fontconfig \ + -Dtemplate-dir=${LOCALBASE}/etc/fonts/conf.avail \ + -Dxml-dir=${LOCALBASE}/etc/fonts PLIST_SUB= PREFERRED_HINTING=${PREFERRED_HINTING} PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt @@ -46,6 +48,7 @@ OPTIONS_SINGLE= HINTING OPTIONS_SINGLE_HINTING+= HINTING_${opt} HINTING_${opt}_DESC= ${opt:tl} HINTING_${opt}_VARS= PREFERRED_HINTING=${opt:tl} +HINTING_${opt}_MESON_ON= -Ddefault-hinting=${opt:tl} .endfor BITMAPS_DESC= Enable bitmap fonts by default @@ -56,14 +59,6 @@ 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/*.3 ${STAGEDIR}${PREFIX}/man/man3 diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo index 03f760779f37..c56035307cd7 100644 --- a/x11-fonts/fontconfig/distinfo +++ b/x11-fonts/fontconfig/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661936025 -SHA256 (fontconfig-2.14.0.tar.xz) = dcbeb84c9c74bbfdb133d535fe1c7bedc9f2221a8daf3914b984c44c520e9bac -SIZE (fontconfig-2.14.0.tar.xz) = 1431056 +TIMESTAMP = 1676011090 +SHA256 (fontconfig-2.14.2.tar.xz) = dba695b57bce15023d2ceedef82062c2b925e51f5d4cc4aef736cf13f60a468b +SIZE (fontconfig-2.14.2.tar.xz) = 1440844 diff --git a/x11-fonts/fontconfig/files/patch-conf.d_meson.build b/x11-fonts/fontconfig/files/patch-conf.d_meson.build deleted file mode 100644 index e5eb8ac9e24a..000000000000 --- a/x11-fonts/fontconfig/files/patch-conf.d_meson.build +++ /dev/null @@ -1,33 +0,0 @@ ---- 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 diff --git a/x11-fonts/fontconfig/files/patch-meson.build b/x11-fonts/fontconfig/files/patch-meson.build index 406e4bcbb06a..efaac5c92a7d 100644 --- a/x11-fonts/fontconfig/files/patch-meson.build +++ b/x11-fonts/fontconfig/files/patch-meson.build @@ -1,31 +1,6 @@ ---- meson.build.orig 2021-07-04 17:55:10 UTC +--- meson.build.orig 2022-12-27 07:24:19 UTC +++ meson.build -@@ -210,9 +210,9 @@ else - if host_machine.system() == 'darwin' - fc_fonts_path = ['/System/Library/Fonts', '/Library/Fonts', '~/Library/Fonts', '/System/Library/Assets/com_apple_MobileAsset_Font3', '/System/Library/Assets/com_apple_MobileAsset_Font4'] - else -- fc_fonts_path = ['/usr/share/fonts', '/usr/local/share/fonts'] -+ fc_fonts_path = ['%%FCDEFAULTFONTS%%', '%%FCADDFONTS%%'] - 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] -@@ -229,10 +229,10 @@ endforeach - conf.set_quoted('FC_DEFAULT_FONTS', escaped_xml_path) - fonts_conf.set('FC_DEFAULT_FONTS', xml_path) - --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) -@@ -365,7 +365,7 @@ configure_file(output: 'fonts.conf', +@@ -432,7 +432,7 @@ configure_file(output: 'fonts.conf', install: true) install_data('fonts.dtd', diff --git a/x11-fonts/fontconfig/files/patch-meson__options.txt b/x11-fonts/fontconfig/files/patch-meson__options.txt deleted file mode 100644 index 50bafa0c91ff..000000000000 --- a/x11-fonts/fontconfig/files/patch-meson__options.txt +++ /dev/null @@ -1,8 +0,0 @@ ---- meson_options.txt.orig 2020-12-03 11:45:00 UTC -+++ meson_options.txt -@@ -11,3 +11,5 @@ option('tests', type : 'feature', value : 'auto', yiel - description: 'Enable unit tests') - option('tools', type : 'feature', value : 'auto', yield : true, - description: 'Build command-line tools (fc-list, fc-query, etc.)') -+option('fc-cache', type: 'feature', value : 'enabled', -+ description : 'Run fc-cache on install') diff --git a/x11-fonts/fontconfig/files/patch-src_meson.build b/x11-fonts/fontconfig/files/patch-src_meson.build deleted file mode 100644 index e637caeb028f..000000000000 --- a/x11-fonts/fontconfig/files/patch-src_meson.build +++ /dev/null @@ -1,12 +0,0 @@ ---- 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', - ]) diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist index 5bb87a1caaad..d49fea803d6a 100644 --- a/x11-fonts/fontconfig/pkg-plist +++ b/x11-fonts/fontconfig/pkg-plist @@ -14,13 +14,15 @@ 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-no-antialias.conf etc/fonts/conf.avail/10-scale-bitmap-fonts.conf etc/fonts/conf.avail/10-sub-pixel-bgr.conf +etc/fonts/conf.avail/10-sub-pixel-none.conf etc/fonts/conf.avail/10-sub-pixel-rgb.conf etc/fonts/conf.avail/10-sub-pixel-vbgr.conf etc/fonts/conf.avail/10-sub-pixel-vrgb.conf etc/fonts/conf.avail/10-unhinted.conf +etc/fonts/conf.avail/10-yes-antialias.conf etc/fonts/conf.avail/11-lcdfilter-default.conf etc/fonts/conf.avail/11-lcdfilter-legacy.conf etc/fonts/conf.avail/11-lcdfilter-light.conf @@ -47,6 +49,8 @@ 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/10-sub-pixel-none.conf +etc/fonts/conf.d/10-yes-antialias.conf etc/fonts/conf.d/11-lcdfilter-default.conf etc/fonts/conf.d/20-unhint-small-vera.conf etc/fonts/conf.d/30-metric-aliases.conf @@ -223,6 +227,7 @@ man/man3/FcMatrixScale.3.gz man/man3/FcMatrixShear.3.gz man/man3/FcNameConstant.3.gz man/man3/FcNameGetConstant.3.gz +man/man3/FcNameGetConstantFor.3.gz man/man3/FcNameGetObjectType.3.gz man/man3/FcNameParse.3.gz man/man3/FcNameRegisterConstants.3.gz @@ -307,6 +312,8 @@ man/man3/FcWeightToOpenTypeDouble.3.gz man/man5/fonts-conf.5.gz share/gettext/its/fontconfig.its share/gettext/its/fontconfig.loc +%%NLS%%share/locale/ka/LC_MESSAGES/fontconfig-conf.mo +%%NLS%%share/locale/ka/LC_MESSAGES/fontconfig.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/fontconfig-conf.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/fontconfig.mo @dir /var/db/fontconfig
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302201510.31KFAwOU060473>