summaryrefslogtreecommitdiff
path: root/x11-fonts
diff options
context:
space:
mode:
Diffstat (limited to 'x11-fonts')
-rw-r--r--x11-fonts/fontconfig/Makefile32
-rw-r--r--x11-fonts/fontconfig/distinfo6
-rw-r--r--x11-fonts/fontconfig/files/patch-meson.build12
-rw-r--r--x11-fonts/fontconfig/files/patch-src_fclang.c51
-rw-r--r--x11-fonts/fontconfig/pkg-plist14
-rw-r--r--x11-fonts/py-shaperglot/Makefile2
-rw-r--r--x11-fonts/py-vfblib/Makefile4
-rw-r--r--x11-fonts/py-vfblib/distinfo6
8 files changed, 44 insertions, 83 deletions
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 6d2d51eaa975..ce816a40bf89 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -1,9 +1,8 @@
PORTNAME= fontconfig
-DISTVERSION= 2.15.0
-PORTREVISION= 3
+DISTVERSION= 2.17.1
PORTEPOCH= 1
CATEGORIES= x11-fonts
-MASTER_SITES= https://www.freedesktop.org/software/${PORTNAME}/release/
+MASTER_SITES= https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/${PORTNAME}/${DISTVERSION}/
MAINTAINER= desktop@FreeBSD.org
COMMENT= XML-based font configuration API for X Windows
@@ -23,7 +22,11 @@ USE_LDCONFIG= yes
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
+ fc-lang/fc-lang.py \
+ src/cutout.py \
+ src/makealias.py \
+ test/run-test-map.sh \
+ test/run-test.sh
TEST_TARGET= test
@@ -32,10 +35,12 @@ SUB_LIST= LOCALBASE=${LOCALBASE}
# 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 \
- -Ddefault-fonts-dirs=${PREFIX}/share/fonts \
- -Dadditional-fonts-dirs=${LOCALBASE}/lib/X11/fonts \
+MESON_ARGS= -Dadditional-fonts-dirs=${LOCALBASE}/lib/X11/fonts \
+ -Dcache-build=disabled \
-Dcache-dir=/var/db/fontconfig \
+ -Ddefault_library=both \
+ -Ddefault-fonts-dirs=${PREFIX}/share/fonts \
+ -Ddoc=disabled \
-Dtemplate-dir=${LOCALBASE}/etc/fonts/conf.avail \
-Dxml-dir=${LOCALBASE}/etc/fonts
@@ -57,10 +62,14 @@ HINTING_${opt}_MESON_ON= -Ddefault-hinting=${opt:tl}
BITMAPS_DESC= Enable bitmap fonts by default
HINTING_DESC= Preferred pixel hinting configuration
-NLS_USES= gettext-tools
+BITMAPS_MESON_YES= bitmap-conf
+
+NLS_USES= gettext-runtime gettext-tools
NLS_MESON_ENABLED= nls
+TEST_TEST_DEPENDS= bash:shells/bash
TEST_MESON_ENABLED= tests
+TESTING_UNSAFE= Requires network access for fetching fonts
post-install:
${INSTALL_MAN} ${WRKSRC}/fc-*/*.1 ${STAGEDIR}${PREFIX}/share/man/man1
@@ -73,11 +82,4 @@ 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
-
-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
-
.include <bsd.port.mk>
diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo
index fa71397bcfd7..82f2ffd81b83 100644
--- a/x11-fonts/fontconfig/distinfo
+++ b/x11-fonts/fontconfig/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1703411132
-SHA256 (fontconfig-2.15.0.tar.xz) = 63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e
-SIZE (fontconfig-2.15.0.tar.xz) = 1447820
+TIMESTAMP = 1763905186
+SHA256 (fontconfig-2.17.1.tar.xz) = 9f5cae93f4fffc1fbc05ae99cdfc708cd60dfd6612ffc0512827025c026fa541
+SIZE (fontconfig-2.17.1.tar.xz) = 1326312
diff --git a/x11-fonts/fontconfig/files/patch-meson.build b/x11-fonts/fontconfig/files/patch-meson.build
index a920cdfcf4d8..708382099dd5 100644
--- a/x11-fonts/fontconfig/files/patch-meson.build
+++ b/x11-fonts/fontconfig/files/patch-meson.build
@@ -1,11 +1,11 @@
---- meson.build.orig 2023-12-24 09:46:41 UTC
+--- meson.build.orig 2025-03-13 11:16:47 UTC
+++ meson.build
-@@ -440,7 +440,7 @@ install_data('fonts.dtd',
- install: true)
+@@ -539,7 +539,7 @@ install_data('fonts.dtd',
+ install_tag: 'runtime')
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')
- )
+- install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'xml/fontconfig'),
++ install_dir: join_paths(get_option('prefix'), get_option('sysconfdir'), 'fonts'),
+ install_tag: 'runtime')
fc_headers = [
diff --git a/x11-fonts/fontconfig/files/patch-src_fclang.c b/x11-fonts/fontconfig/files/patch-src_fclang.c
deleted file mode 100644
index 873307acda2c..000000000000
--- a/x11-fonts/fontconfig/files/patch-src_fclang.c
+++ /dev/null
@@ -1,51 +0,0 @@
---- src/fclang.c.orig 2020-11-28 01:56:42 UTC
-+++ src/fclang.c
-@@ -183,6 +183,7 @@ FcLangNormalize (const FcChar8 *lang)
- {
- FcChar8 *result = NULL, *s, *orig;
- char *territory, *encoding, *modifier;
-+ char *script;
- size_t llen, tlen = 0, mlen = 0;
-
- if (!lang || !*lang)
-@@ -246,27 +247,33 @@ FcLangNormalize (const FcChar8 *lang)
- modifier = encoding;
- }
- }
-- territory = strchr ((const char *) s, '_');
-- if (!territory)
-- territory = strchr ((const char *) s, '-');
-+ territory = strrchr ((const char *) s, '_');
- if (territory)
- {
- *territory = 0;
- territory++;
- tlen = strlen (territory);
- }
-+ /* There might by a script component, e.g. sr_Cyrl_RS@UTF-8. We can't assume all legal locale
-+ names are in the form <lang>_<country code>.<encoding>. If the script component is here,
-+ skip it to define the language properly (e.g. "sr" instead of "sr_Cyrl") */
-+ script = strchr ((const char *) s, '_');
-+ if (script)
-+ {
-+ *script = 0;
-+ }
- llen = strlen ((const char *) s);
- if (llen < 2 || llen > 3)
- {
-- fprintf (stderr, "Fontconfig warning: ignoring %s: not a valid language tag\n",
-- lang);
-+ fprintf (stderr, "Fontconfig warning: ignoring %s: not a valid language tag (%s)\n",
-+ s, lang);
- goto bail0;
- }
- if (territory && (tlen < 2 || tlen > 3) &&
- !(territory[0] == 'z' && tlen < 5))
- {
-- fprintf (stderr, "Fontconfig warning: ignoring %s: not a valid region tag\n",
-- lang);
-+ fprintf (stderr, "Fontconfig warning: ignoring %s: not a valid region tag (%s)\n",
-+ territory, lang);
- goto bail0;
- }
- if (territory)
diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist
index dfa70ae1be48..98f64c4c6ef7 100644
--- a/x11-fonts/fontconfig/pkg-plist
+++ b/x11-fonts/fontconfig/pkg-plist
@@ -34,6 +34,7 @@ etc/fonts/conf.avail/35-lang-normalize.conf
etc/fonts/conf.avail/40-nonlatin.conf
etc/fonts/conf.avail/45-generic.conf
etc/fonts/conf.avail/45-latin.conf
+etc/fonts/conf.avail/48-guessfamily.conf
etc/fonts/conf.avail/48-spacing.conf
etc/fonts/conf.avail/49-sansserif.conf
etc/fonts/conf.avail/50-user.conf
@@ -44,6 +45,8 @@ etc/fonts/conf.avail/65-fonts-persian.conf
etc/fonts/conf.avail/65-khmer.conf
etc/fonts/conf.avail/65-nonlatin.conf
etc/fonts/conf.avail/69-unifont.conf
+etc/fonts/conf.avail/70-no-bitmaps-and-emoji.conf
+etc/fonts/conf.avail/70-no-bitmaps-except-emoji.conf
etc/fonts/conf.avail/70-no-bitmaps.conf
etc/fonts/conf.avail/70-yes-bitmaps.conf
etc/fonts/conf.avail/80-delicious.conf
@@ -67,7 +70,7 @@ etc/fonts/conf.d/60-latin.conf
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
+%%NO_BITMAPS%%etc/fonts/conf.d/70-no-bitmaps-and-emoji.conf
%%BITMAPS%%etc/fonts/conf.d/70-yes-bitmaps.conf
etc/fonts/conf.d/80-delicious.conf
etc/fonts/conf.d/90-synthetic.conf
@@ -80,7 +83,7 @@ include/fontconfig/fontconfig.h
lib/libfontconfig.a
lib/libfontconfig.so
lib/libfontconfig.so.1
-lib/libfontconfig.so.1.14.0
+lib/libfontconfig.so.1.16.0
libdata/pkgconfig/fontconfig.pc
share/man/man1/fc-cache.1.gz
share/man/man1/fc-cat.1.gz
@@ -128,6 +131,8 @@ share/man/man3/FcCharSetNextPage.3.gz
share/man/man3/FcCharSetSubtract.3.gz
share/man/man3/FcCharSetSubtractCount.3.gz
share/man/man3/FcCharSetUnion.3.gz
+share/man/man3/FcConfigAcceptFilter.3.gz
+share/man/man3/FcConfigAcceptFont.3.gz
share/man/man3/FcConfigAppFontAddDir.3.gz
share/man/man3/FcConfigAppFontAddFile.3.gz
share/man/man3/FcConfigAppFontClear.3.gz
@@ -145,6 +150,7 @@ share/man/man3/FcConfigGetCacheDirs.3.gz
share/man/man3/FcConfigGetConfigDirs.3.gz
share/man/man3/FcConfigGetConfigFiles.3.gz
share/man/man3/FcConfigGetCurrent.3.gz
+share/man/man3/FcConfigGetDefaultLangs.3.gz
share/man/man3/FcConfigGetFilename.3.gz
share/man/man3/FcConfigGetFontDirs.3.gz
share/man/man3/FcConfigGetFonts.3.gz
@@ -153,8 +159,11 @@ share/man/man3/FcConfigGetSysRoot.3.gz
share/man/man3/FcConfigHome.3.gz
share/man/man3/FcConfigParseAndLoad.3.gz
share/man/man3/FcConfigParseAndLoadFromMemory.3.gz
+share/man/man3/FcConfigPreferAppFont.3.gz
share/man/man3/FcConfigReference.3.gz
share/man/man3/FcConfigSetCurrent.3.gz
+share/man/man3/FcConfigSetDefaultSubstitute.3.gz
+share/man/man3/FcConfigSetFontSetFilter.3.gz
share/man/man3/FcConfigSetRescanInterval.3.gz
share/man/man3/FcConfigSetSysRoot.3.gz
share/man/man3/FcConfigSubstitute.3.gz
@@ -188,6 +197,7 @@ share/man/man3/FcFontSetPrint.3.gz
share/man/man3/FcFontSetSort.3.gz
share/man/man3/FcFontSetSortDestroy.3.gz
share/man/man3/FcFontSort.3.gz
+share/man/man3/FcFontationsQueryAll.3.gz
share/man/man3/FcFreeTypeCharIndex.3.gz
share/man/man3/FcFreeTypeCharSet.3.gz
share/man/man3/FcFreeTypeCharSetAndSpacing.3.gz
diff --git a/x11-fonts/py-shaperglot/Makefile b/x11-fonts/py-shaperglot/Makefile
index 4f115cc43597..e028f44c7a6f 100644
--- a/x11-fonts/py-shaperglot/Makefile
+++ b/x11-fonts/py-shaperglot/Makefile
@@ -1,6 +1,6 @@
PORTNAME= shaperglot
PORTVERSION= 1.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-fonts/py-vfblib/Makefile b/x11-fonts/py-vfblib/Makefile
index 2f5570c8b527..0ba6f4ecec93 100644
--- a/x11-fonts/py-vfblib/Makefile
+++ b/x11-fonts/py-vfblib/Makefile
@@ -1,5 +1,5 @@
PORTNAME= vfblib
-PORTVERSION= 0.10.5
+PORTVERSION= 0.10.6
CATEGORIES= x11-fonts python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=61:devel/py-setuptools@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}setuptools-scm>=6.2:devel/py-setuptools-scm@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>=4.60.1:print/py-fonttools@${PY_FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fonttools>=4.61.0:print/py-fonttools@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}orjson>=3.11.4<4:devel/py-orjson@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.15.0:devel/py-typing-extensions@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}ufolib2>=0.18.1:print/py-ufolib2@${PY_FLAVOR} \
diff --git a/x11-fonts/py-vfblib/distinfo b/x11-fonts/py-vfblib/distinfo
index d09dab6a2624..adb872181054 100644
--- a/x11-fonts/py-vfblib/distinfo
+++ b/x11-fonts/py-vfblib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1763853488
-SHA256 (vfblib-0.10.5.tar.gz) = eb3f4a5aa264f7072e11c79c9a0492b24b43c23c57a4868df7cf6bb164ddffab
-SIZE (vfblib-0.10.5.tar.gz) = 8079593
+TIMESTAMP = 1765895762
+SHA256 (vfblib-0.10.6.tar.gz) = 804f3fd23eae09276a5d284e3ed2eebd3c4b9e7f86833be09e0ba1840f3e4fe1
+SIZE (vfblib-0.10.6.tar.gz) = 8079732
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-19 02:33:31 +0000