public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/
Date: Wed, 27 Dec 2023 20:57:32 +0000 (UTC)	[thread overview]
Message-ID: <1703710629.f077e4e450a18e21a9787b0f408bdec74302b3a1.sam@gentoo> (raw)

commit:     f077e4e450a18e21a9787b0f408bdec74302b3a1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 27 20:54:37 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 27 20:57:09 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f077e4e4

media-libs/fontconfig: add 2.15.0

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

 media-libs/fontconfig/Manifest                 |   1 +
 media-libs/fontconfig/fontconfig-2.15.0.ebuild | 231 +++++++++++++++++++++++++
 2 files changed, 232 insertions(+)

diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest
index 330e1e1816f4..77d112707da0 100644
--- a/media-libs/fontconfig/Manifest
+++ b/media-libs/fontconfig/Manifest
@@ -1 +1,2 @@
 DIST fontconfig-2.14.2.tar.xz 1440844 BLAKE2B 4efeeb7f9a6705d493128d00b60e681a20a47556f4c0d7787a5c7a6d2cbbc22f150cad7988a9836a9e72aeb61e2b6a196c00a071c7042c62283c7720cdbb743d SHA512 23483e0ae6aa7589fd37f9949a4cf951c5bff981739dbb446881e4cea86a208c0ab31e2358666eac724af1dc6a689a42733a7ce91cd3e76d8d91eacedb318085
+DIST fontconfig-2.15.0.tar.xz 1447820 BLAKE2B 17c85fddc4ab84111c4f50afb89ecd8792c3aeaa2690b38fd39fca6f6cece69e9ce0cd3af8a2e54968c79ad1f9bee1e444699a13c068d9dfd3dfe1212ff37533 SHA512 754cd5fffa198fc07a39cf7df683e9adfa7f54ab41fdff8c0eacc078fd35d3e01069ba343f2b045e0b40df88d9f1fc1ee0f7565799f9cb194a59cf95b64c4417

diff --git a/media-libs/fontconfig/fontconfig-2.15.0.ebuild b/media-libs/fontconfig/fontconfig-2.15.0.ebuild
new file mode 100644
index 000000000000..01f18ac3a8ab
--- /dev/null
+++ b/media-libs/fontconfig/fontconfig-2.15.0.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit 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://fontconfig.org/release/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="1.0"
+if ! [[ $(ver_cut 3) -ge 90 ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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-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.14.0-skip-bubblewrap-tests.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
+
+		# 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
+
+	# 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
+
+	local ver
+	for ver in ${REPLACING_VERSIONS} ; do
+		# 2.14.2 and 2.14.2-r1 included the bad 10-sub-pixel-none.conf
+		if ver_test ${ver} -lt 2.14.2-r2 && ver_test ${ver} -ge 2.14.2 ; 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
+	done
+
+	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	other threads:[~2023-12-27 20:57 UTC|newest]

Thread overview: 135+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-27 20:57 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-18 19:05 [gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/ Arthur Zamarin
2024-10-15 12:47 Arthur Zamarin
2024-10-12 23:45 Sam James
2024-10-12 23:35 Sam James
2024-10-12 23:18 Sam James
2024-10-12 23:18 Sam James
2024-10-07  2:52 Sam James
2024-05-28 14:03 Sam James
2024-05-28 12:35 Sam James
2024-05-28 12:29 Michał Górny
2024-05-28 12:04 Michał Górny
2023-12-27 20:57 Sam James
2023-12-01 16:00 Arthur Zamarin
2023-09-28  9:05 Sam James
2023-09-28  5:12 Sam James
2023-09-28  4:35 Sam James
2023-09-27  7:44 Sam James
2023-09-27  5:23 Sam James
2023-09-27  4:58 Sam James
2023-09-27  4:51 Sam James
2023-06-01  7:56 Sam James
2023-06-01  6:31 Sam James
2023-06-01  6:27 Sam James
2023-06-01  5:28 Sam James
2023-06-01  5:22 Sam James
2023-06-01  5:22 Sam James
2023-05-01 10:32 Sam James
2023-04-27  6:39 Sam James
2023-04-15  5:08 Sam James
2023-03-04 18:23 Arthur Zamarin
2023-03-04 11:48 Arthur Zamarin
2023-03-04  9:26 Arthur Zamarin
2023-03-04  7:57 Arthur Zamarin
2023-03-04  7:56 Arthur Zamarin
2023-03-04  5:50 Arthur Zamarin
2023-03-04  5:39 Arthur Zamarin
2023-03-04  5:32 Arthur Zamarin
2023-01-29  9:04 Sam James
2022-10-29 19:11 Sam James
2022-10-29 19:11 Sam James
2022-10-28 11:25 Sam James
2022-10-27 23:46 Sam James
2022-08-30 19:06 Sam James
2022-06-28 19:27 Arthur Zamarin
2022-06-28 19:08 Arthur Zamarin
2022-06-27  7:37 Agostino Sarubbo
2022-06-27  7:34 Agostino Sarubbo
2022-06-26 17:43 Arthur Zamarin
2022-06-26 17:24 Arthur Zamarin
2022-06-26 17:20 Arthur Zamarin
2022-06-26 17:19 Arthur Zamarin
2022-05-07  4:28 WANG Xuerui
2022-04-22 17:43 Sam James
2022-04-02  4:15 Sam James
2022-04-02  3:15 Sam James
2022-04-02  3:07 Sam James
2022-04-02  3:07 Sam James
2022-03-10 22:51 Sam James
2020-12-27 17:47 Fabian Groffen
2020-11-19 11:17 Agostino Sarubbo
2020-11-18  6:55 Agostino Sarubbo
2020-11-17 19:05 Agostino Sarubbo
2020-10-31 11:10 Mikle Kolyada
2020-10-29 22:06 Sergei Trofimovich
2020-10-29 22:06 Sergei Trofimovich
2020-10-28 19:38 Thomas Deutschmann
2020-10-28 19:38 Thomas Deutschmann
2020-10-20  9:49 Sam James
2020-10-20  9:46 Sam James
2018-11-12 20:26 Sergei Trofimovich
2018-10-17 11:18 Mikle Kolyada
2018-09-19 17:41 Markus Meier
2018-09-18  7:16 Lars Wendler
2018-09-18  7:16 Lars Wendler
2018-09-17 21:34 Matt Turner
2018-09-17 21:34 Matt Turner
2018-09-14  8:28 Tobias Klausmann
2018-09-01 23:18 Sergei Trofimovich
2018-08-23  1:41 Thomas Deutschmann
2018-08-22  0:15 Mikle Kolyada
2018-08-21 18:42 Sergei Trofimovich
2018-08-21  8:25 Mart Raudsepp
2018-08-20 17:40 Mart Raudsepp
2018-07-25  8:54 Lars Wendler
2018-06-07 21:16 Mikle Kolyada
2018-06-02 17:25 Fabian Groffen
2018-06-02 14:57 Fabian Groffen
2018-06-02 14:14 Fabian Groffen
2018-05-20 21:38 Robin H. Johnson
2018-04-17 19:22 Michał Górny
2018-04-17 18:20 Thomas Deutschmann
2018-04-07  5:08 Matt Turner
2018-03-31 20:00 Sergei Trofimovich
2018-03-20 20:41 Matt Turner
2018-03-15 16:26 Mikle Kolyada
2018-03-13 20:31 Michał Górny
2018-03-08 18:10 Lars Wendler
2018-03-08 16:17 Lars Wendler
2018-03-08 16:07 Lars Wendler
2018-03-08 10:12 Lars Wendler
2018-03-05 13:57 Tobias Klausmann
2018-03-03  1:43 Mart Raudsepp
2018-02-22 10:27 Lars Wendler
2018-02-19  8:07 Sergei Trofimovich
2018-02-18 21:48 Thomas Deutschmann
2018-02-17 20:46 Sergei Trofimovich
2018-02-15 13:58 Jason Zaman
2018-02-15  9:23 Lars Wendler
2017-12-21 12:37 Lars Wendler
2017-10-05 13:04 Lars Wendler
2017-10-05 12:53 Fabian Groffen
2017-10-02  7:00 Fabian Groffen
2017-09-25  6:55 Fabian Groffen
2017-09-23 22:51 Lars Wendler
2017-09-08 22:49 Sergei Trofimovich
2017-09-08  5:06 Markus Meier
2017-09-04  7:30 Tobias Klausmann
2017-08-29 21:39 Thomas Deutschmann
2017-08-25 21:36 Mikle Kolyada
2017-08-19 15:16 Sergei Trofimovich
2017-08-17 20:18 Sergei Trofimovich
2017-07-24 13:11 Fabian Groffen
2017-07-20 10:23 Lars Wendler
2017-07-20 10:23 Lars Wendler
2017-06-20 12:37 Pacho Ramos
2017-06-03 19:27 Mike Gilbert
2017-06-02 20:49 Lars Wendler
2017-03-28 23:32 Michael Weber
2016-09-15 15:21 Michał Górny
2016-08-10 14:59 Lars Wendler
2016-08-10 14:59 Lars Wendler
2016-07-13 10:16 Lars Wendler
2016-07-13 10:16 Lars Wendler
2016-04-10 17:27 Lars Wendler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1703710629.f077e4e450a18e21a9787b0f408bdec74302b3a1.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox