[gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/

["Sam James" <sam@gentoo.org>]

commit:     994cc012905d733e8dbfb0fa94d7eade79223345
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 06:37:56 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 06:39:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=994cc012

media-libs/fontconfig: don't override user prefs. on antialiasing

2.14.2 installed 10-sub-pixel-none.conf unconditionally outside of our own
preference management system (eselect). For versions 2.14.2 <= x <= 2.14.2-r2,
delete that file if it's installed.

Closes: https://bugs.gentoo.org/900681
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...ontconfig-2.14.2-r1.ebuild => fontconfig-2.14.2-r2.ebuild} | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r1.ebuild b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
similarity index 94%
rename from media-libs/fontconfig/fontconfig-2.14.2-r1.ebuild
rename to media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
index 025d4099fc68..ceae1d19f3e5 100644
--- a/media-libs/fontconfig/fontconfig-2.14.2-r1.ebuild
+++ b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild
@@ -208,6 +208,17 @@ pkg_postinst() {
 
 	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}"