commit:     f42ca199ec6038d2e61a07c2c1429c5bd1851512
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  2 06:50:16 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul  2 07:19:32 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f42ca199

media-libs/fontconfig: add 2.17.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/fontconfig/Manifest                 |   1 +
 media-libs/fontconfig/fontconfig-2.17.1.ebuild | 241 +++++++++++++++++++++++++
 2 files changed, 242 insertions(+)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 3d4d235aac75..92b9eab1f800 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -2,3 +2,4 @@ DIST fontconfig-2.14.2.tar.xz 1440844 BLAKE2B 
4efeeb7f9a6705d493128d00b60e681a20
 DIST fontconfig-2.15.0.tar.xz 1447820 BLAKE2B 
17c85fddc4ab84111c4f50afb89ecd8792c3aeaa2690b38fd39fca6f6cece69e9ce0cd3af8a2e54968c79ad1f9bee1e444699a13c068d9dfd3dfe1212ff37533
 SHA512 
754cd5fffa198fc07a39cf7df683e9adfa7f54ab41fdff8c0eacc078fd35d3e01069ba343f2b045e0b40df88d9f1fc1ee0f7565799f9cb194a59cf95b64c4417
 DIST fontconfig-2.16.2.tar.xz 1298436 BLAKE2B 
24fdbfc573d1a97e08fc159b91e24b77ddeb646e59ab62bb154b18f07383103a8b1e00c635299e1209fb5965dc889b8ab8f5d7228083af1a916978fa69c71136
 SHA512 
b51ac822f00b41026d74b73aabcdb5ec766b68c478fdb0a50d5ec20c5ad4661ba38417aac088ee86ef097bd1ecda708f818636389acb34502444298a08701c12
 DIST fontconfig-2.17.0.tar.xz 1326480 BLAKE2B 
daf2fa4aa263c7bc88eff1bf73fcc90e46cee7dbc4531cb7b62fedd9f24d704a0bb198684376785f47087974945c6b13faa2f34c212748e942756b2e9fb7f818
 SHA512 
dd64905c3e0e5c5881df505b8f0bea594bbac5ce145f57aedcd7130978cd285491497198d8f2d6ed26f7b2abb31268dc3ff97aa75ce998b8e57f2d5c75b240b4
+DIST fontconfig-2.17.1.tar.xz 1326312 BLAKE2B 
6a25826efacd177c89613aa63b0c94312129af500fb0f5a24de3bb16146b68cc42e45d80b020096286f15b730e0cbf0e640d57024f57299caec4a31b6d178ba9
 SHA512 
c09c1f041f61ee0d220ff906a86b5c4b329106dc96f8c04b23f8fdeb480df626717fe3613bccb41cb39e86334078139322710377f5ddaa3abe48569e798161c9

diff --git a/media-libs/fontconfig/fontconfig-2.17.1.ebuild 
b/media-libs/fontconfig/fontconfig-2.17.1.ebuild
new file mode 100644
index 000000000000..c8e8f4003a62
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.17.1.ebuild
@@ -0,0 +1,241 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..14} )
+inherit eapi9-ver multilib meson-multilib python-any-r1 readme.gentoo-r1
+
+DESCRIPTION="A library for configuring and customizing font access"
+HOMEPAGE="https://fontconfig.org/";
+SRC_URI="
+       
https://gitlab.freedesktop.org/api/v4/projects/890/packages/generic/fontconfig/${PV}/${P}.tar.xz
+       https://fontconfig.org/release/${P}.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="1.0"
+if ! [[ $(ver_cut 3) -ge 90 ]] ; then
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc 
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~x64-solaris"
+fi
+IUSE="doc nls test"
+RESTRICT="!test? ( test )"
+
+# - Check minimum freetype & other deps on bumps. See
+#   
https://gitlab.freedesktop.org/fontconfig/fontconfig/-/blob/main/configure.ac#L314.
+#   Note that FT versioning is confusing, need to map it using
+#   
https://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT
+#   But sometimes it's actually greater than that, e.g. see Fedora's spec file
+#   
https://src.fedoraproject.org/rpms/fontconfig/blob/rawhide/f/fontconfig.spec#_1
+#
+# - Purposefully dropped the xml USE flag and libxml2 support. Expat is the
+#   default and used by every distro. See bug #283191.
+#
+# - There's a test-only dep on json-c.
+#   It might become an optional(?) runtime dep in future though. Who knows.
+#   Keep an eye on it.
+RDEPEND="
+       >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+       >=media-libs/freetype-2.9.1[${MULTILIB_USEDEP}]
+       virtual/libintl[${MULTILIB_USEDEP}]
+       !elibc_Darwin? ( !elibc_SunOS? ( 
sys-apps/util-linux[${MULTILIB_USEDEP}] ) )
+       elibc_Darwin? ( sys-libs/native-uuid )
+       elibc_SunOS? ( sys-libs/libuuid )
+"
+DEPEND="
+       ${RDEPEND}
+       test? ( dev-libs/json-c )
+"
+BDEPEND="
+       ${PYTHON_DEPS}
+       >=dev-build/meson-1.6.1
+       dev-util/gperf
+       virtual/pkgconfig
+       doc? (
+               =app-text/docbook-sgml-dtd-3.1*
+               app-text/docbook-sgml-utils[jadetex]
+       )
+       nls? ( >=sys-devel/gettext-0.19.8 )
+"
+PDEPEND="virtual/ttf-fonts"
+# We need app-eselect/eselect-fontconfig in IDEPEND to update ROOT
+# when cross-compiling.
+IDEPEND="app-eselect/eselect-fontconfig"
+
+PATCHES=(
+       # bug #130466 + make liberation default
+       "${FILESDIR}"/${PN}-2.14.0-latin-update.patch
+       # Avoid test failure (bubblewrap doesn't work within sandbox)
+       "${FILESDIR}"/${PN}-2.17.0-skip-bubblewrap-tests.patch
+       # Avoid network access and unpackaged pytest-tap
+       "${FILESDIR}"/${PN}-2.17.0-network-test.patch
+       # Fix build failure with -ggdb3
+       "${FILESDIR}"/${PN}-2.17.0-macro-preprocess.patch
+
+       # Patches from upstream (can usually be removed with next version bump)
+)
+
+DOC_CONTENTS="Please make fontconfig configuration changes using
+\`eselect fontconfig\`. Any changes made to /etc/fonts/fonts.conf will be
+overwritten. If you need to reset your configuration to upstream defaults,
+delete the directory ${EROOT}/etc/fonts/conf.d/ and re-emerge fontconfig."
+
+src_prepare() {
+       default
+
+       # Test needs network access
+       # https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/319
+       # On bumps, please check to see if this has been fixed
+       # to allow local access!
+       sed -i -e '/test-crbug1004254/d' test/meson.build || die
+}
+
+multilib_src_configure() {
+       local addfonts=(
+               "${EPREFIX}"/usr/local/share/fonts
+       )
+
+       # Harvest some font locations, such that users can benefit from the
+       # host OS's installed fonts
+       case ${CHOST} in
+               *-darwin*)
+                       addfonts+=(
+                               /Library/Fonts
+                               /System/Library/Fonts
+                       )
+               ;;
+
+               *-solaris*)
+                       [[ -d /usr/X/lib/X11/fonts/TrueType ]] && \
+                               addfonts+=( /usr/X/lib/X11/fonts/TrueType )
+                       [[ -d /usr/X/lib/X11/fonts/Type1 ]] &&
+                               addfonts+=( /usr/X/lib/X11/fonts/Type1 )
+               ;;
+
+               *-linux-gnu)
+                       use prefix && [[ -d /usr/share/fonts ]] && \
+                               addfonts+=( /usr/share/fonts )
+               ;;
+       esac
+
+       local emesonargs=(
+               # USE=doc only controls the additional bits like html/pdf
+               # and regeneration of man pages from source. We always install
+               # the prebuilt man pages.
+               $(meson_native_use_feature doc)
+               $(meson_native_use_feature doc doc-txt)
+               $(meson_native_use_feature doc doc-html)
+               $(meson_native_use_feature doc doc-man)
+               $(meson_native_use_feature doc doc-pdf)
+
+               $(meson_native_use_feature nls)
+               $(meson_feature test tests)
+
+               -Dcache-build=disabled
+               -Dcache-dir="${EPREFIX}"/var/cache/fontconfig
+               -Ddefault-fonts-dirs="${EPREFIX}"/usr/share/fonts
+               -Dadditional-fonts-dirs=$(IFS=, ; echo "${addfonts[*]}" )
+               -Dtemplate-dir="${EPREFIX}"/etc/fonts/conf.avail
+               # TODO: Rust
+               -Dfontations=disabled
+               -Dxml-backend=expat
+
+               # Let users choose via eselect-fontconfig. See bug #900681
+               # and 
https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/356.
+               -Ddefault-sub-pixel-rendering=none
+       )
+
+       meson_src_configure
+}
+
+multilib_src_install() {
+       MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) )
+
+       meson_src_install
+
+       rm -rf "${ED}"/var/cache || die
+
+       # Avoid calling this multiple times, bug #459210
+       if multilib_is_native_abi; then
+               insinto /etc/fonts
+               doins fonts.conf
+       fi
+}
+
+multilib_src_install_all() {
+       einstalldocs
+
+       # fc-lang directory contains language coverage datafiles
+       # which are needed to test the coverage of fonts.
+       insinto /usr/share/fc-lang
+       doins fc-lang/*.orth
+
+       dodoc doc/fontconfig-user.{txt,pdf}
+
+       if ! use doc ; then
+               find "${S}" -name "*.[[:digit:]]" -type f -exec doman '{}' + || 
die
+       fi
+
+       if [[ -e ${ED}/usr/share/doc/fontconfig/ ]] ;  then
+               mv "${ED}"/usr/share/doc/fontconfig/* 
"${ED}"/usr/share/doc/${PF} || die
+               rm -rf "${ED}"/usr/share/doc/fontconfig || die
+       fi
+
+       # Changes should be made to /etc/fonts/local.conf, and as we had
+       # too much problems with broken fonts.conf we force update it ...
+       echo 'CONFIG_PROTECT_MASK="/etc/fonts/fonts.conf"' > 
"${T}"/37fontconfig || die
+       doenvd "${T}"/37fontconfig
+
+       # As of fontconfig 2.7, everything sticks their noses in here.
+       dodir /etc/sandbox.d
+       echo 'SANDBOX_PREDICT="/var/cache/fontconfig"' > 
"${ED}"/etc/sandbox.d/37fontconfig || die
+
+       readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+       # bug #193476
+       # /etc/fonts/conf.d/ contains symlinks to ../conf.avail/ to include 
various
+       # config files.  If we install as-is, we'll blow away user settings.
+       ebegin "Syncing fontconfig configuration to system"
+       if [[ -e ${EROOT}/etc/fonts/conf.d ]] ; then
+               local file f
+               for file in "${EROOT}"/etc/fonts/conf.avail/* ; do
+                       f=${file##*/}
+                       if [[ -L ${EROOT}/etc/fonts/conf.d/${f} ]] ; then
+                               [[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
+                                       && ln -sf ../conf.avail/"${f}" \
+                                               "${ED}"/etc/fonts/conf.d/ 
&>/dev/null
+                       else
+                               [[ -f ${ED}/etc/fonts/conf.avail/${f} ]] \
+                                       && rm "${ED}"/etc/fonts/conf.d/"${f}" 
&>/dev/null
+                       fi
+               done
+       fi
+       eend $?
+}
+
+pkg_postinst() {
+       einfo "Cleaning broken symlinks in ${EROOT}/etc/fonts/conf.d/"
+       find -L "${EROOT}"/etc/fonts/conf.d/ -type l -delete
+
+       readme.gentoo_print_elog
+
+       # 2.14.2 and 2.14.2-r1 included the bad 10-sub-pixel-none.conf
+       if ver_replacing -eq 2.14.2 || ver_replacing -eq 2.14.2-r1; then
+               if [[ -e "${EROOT}"/etc/fonts/conf.d/10-sub-pixel-none.conf ]] 
; then
+                       einfo "Deleting 10-sub-pixel-none.conf from bad 
fontconfig-2.14.2 (bug #900681)"
+                       rm "${EROOT}"/etc/fonts/conf.d/10-sub-pixel-none.conf 
|| die
+               fi
+       fi
+
+       if [[ -z ${ROOT} ]] ; then
+               multilib_pkg_postinst() {
+                       ebegin "Creating global font cache for ${ABI}"
+                       "${EPREFIX}"/usr/bin/${CHOST}-fc-cache -srf
+                       eend $?
+               }
+
+               multilib_parallel_foreach_abi multilib_pkg_postinst
+       fi
+}

Reply via email to