commit: 08eb7f258111a6fbe509078306fec729e92d37be Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Thu Aug 18 02:45:51 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu Aug 18 02:53:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08eb7f25
media-libs/fontconfig: Drop old versions Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> media-libs/fontconfig/Manifest | 1 - .../files/fontconfig-2.12.3-latin-update.patch | 68 ----- .../files/fontconfig-2.13.1-proper_homedir.patch | 313 --------------------- ...1-revert_delete_.uuid_for_empty_directory.patch | 43 --- .../files/fontconfig-2.13.1-static_build.patch | 91 ------ media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild | 182 ------------ 6 files changed, 698 deletions(-) diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest index a42cf3ac9874..24cff4b4b53f 100644 --- a/media-libs/fontconfig/Manifest +++ b/media-libs/fontconfig/Manifest @@ -1,3 +1,2 @@ -DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 SHA512 f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100 DIST fontconfig-2.13.93.tar.xz 1418288 BLAKE2B 2be273c21c16f9bb2dfe618177eaf2de48610a145d402ba53becc1c4c2d0417a9cd0ce969d4521ff00c8c71e4b1d65e4bf945da56e140434244b81e7e24ecb7a SHA512 1ba119ea3faba662e108df6fce22f242eb2b7c5ec087159ca0cb76944991b19563f744c181263343941c50547bc0c73c6437d5380df09b5029facaab80465b58 DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff SHA512 a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc diff --git a/media-libs/fontconfig/files/fontconfig-2.12.3-latin-update.patch b/media-libs/fontconfig/files/fontconfig-2.12.3-latin-update.patch deleted file mode 100644 index 397781e87acd..000000000000 --- a/media-libs/fontconfig/files/fontconfig-2.12.3-latin-update.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- fontconfig-2.12.3/conf.d/60-latin.conf -+++ fontconfig-2.12.3/conf.d/60-latin.conf -@@ -4,47 +4,50 @@ - <alias> - <family>serif</family> - <prefer> -- <family>Bitstream Vera Serif</family> -+ <family>Liberation Serif</family> - <family>DejaVu Serif</family> - <family>Times New Roman</family> -- <family>Thorndale AMT</family> - <family>Luxi Serif</family> - <family>Nimbus Roman No9 L</family> - <family>Nimbus Roman</family> - <family>Times</family> -+ <family>Thorndale AMT</family> -+ <family>Bitstream Vera Serif</family> - </prefer> - </alias> - <alias> - <family>sans-serif</family> - <prefer> -- <family>Bitstream Vera Sans</family> -+ <family>Liberation Sans</family> - <family>DejaVu Sans</family> -- <family>Verdana</family> - <family>Arial</family> -- <family>Albany AMT</family> - <family>Luxi Sans</family> - <family>Nimbus Sans L</family> - <family>Nimbus Sans</family> - <family>Helvetica</family> - <family>Lucida Sans Unicode</family> - <family>BPG Glaho International</family> <!-- lat,cyr,arab,geor --> -+ <family>Verdana</family> - <family>Tahoma</family> <!-- lat,cyr,greek,heb,arab,thai --> -+ <family>Albany AMT</family> -+ <family>Bitstream Vera Sans</family> - </prefer> - </alias> - <alias> - <family>monospace</family> - <prefer> -- <family>Bitstream Vera Sans Mono</family> -+ <family>Liberation Mono</family> - <family>DejaVu Sans Mono</family> - <family>Inconsolata</family> - <family>Andale Mono</family> - <family>Courier New</family> -- <family>Cumberland AMT</family> - <family>Luxi Mono</family> - <family>Nimbus Mono L</family> - <family>Nimbus Mono</family> - <family>Nimbus Mono PS</family> - <family>Courier</family> -+ <family>Cumberland AMT</family> -+ <family>Bitstream Vera Sans Mono</family> - </prefer> - </alias> - <!-- -@@ -65,6 +68,7 @@ - <alias> - <family>cursive</family> - <prefer> -+ <family>Comic Neue</family> - <family>ITC Zapf Chancery Std</family> - <family>Zapfino</family> - <family>Comic Sans MS</family> diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch b/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch deleted file mode 100644 index 71c27f56f644..000000000000 --- a/media-libs/fontconfig/files/fontconfig-2.13.1-proper_homedir.patch +++ /dev/null @@ -1,313 +0,0 @@ -From 806fd4c2c5164d66d978b0a4c579c157e5cbe766 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <[email protected]> -Date: Tue, 4 Sep 2018 09:08:37 +0000 -Subject: [PATCH] Fix the issue that '~' wasn't extracted to the proper homedir - -'~' in the filename was extracted to the home directory name in FcConfigFilename() though, -this behavior was broken by d1f48f11. this change fixes it back to the correct behavior. - -https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/110 ---- a/src/fccfg.c -+++ b/src/fccfg.c -@@ -2207,17 +2207,19 @@ FcConfigFilename (const FcChar8 *url) - else - file = 0; - } -- -- path = FcConfigGetPath (); -- if (!path) -- return NULL; -- for (p = path; *p; p++) -+ else - { -- file = FcConfigFileExists (*p, url); -- if (file) -- break; -+ path = FcConfigGetPath (); -+ if (!path) -+ return NULL; -+ for (p = path; *p; p++) -+ { -+ file = FcConfigFileExists (*p, url); -+ if (file) -+ break; -+ } -+ FcConfigFreePath (path); - } -- FcConfigFreePath (path); - return file; - } - ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -91,6 +91,22 @@ test_bz106632_CFLAGS = \ - test_bz106632_LDADD = $(top_builddir)/src/libfontconfig.la - TESTS += test-bz106632 - -+if !ENABLE_SHARED -+check_PROGRAMS += test-issue110 -+test_issue110_CFLAGS = \ -+ -I$(top_builddir) \ -+ -I$(top_builddir)/src \ -+ -I$(top_srcdir) \ -+ -I$(top_srcdir)/src \ -+ -DHAVE_CONFIG_H \ -+ -DFONTCONFIG_PATH='"$(BASECONFIGDIR)"' \ -+ $(NULL) -+test_issue110_LDADD = \ -+ $(top_builddir)/src/libfontconfig.la \ -+ $(NULL) -+TESTS += test-issue110 -+endif -+ - EXTRA_DIST=run-test.sh run-test-conf.sh $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names - - CLEANFILES=out out1 out2 fonts.conf out.expected ---- /dev/null -+++ b/test/test-issue110.c -@@ -0,0 +1,245 @@ -+/* -+ * fontconfig/test/test-issue110.c -+ * -+ * Copyright © 2000 Keith Packard -+ * Copyright © 2018 Akira TAGOH -+ * -+ * Permission to use, copy, modify, distribute, and sell this software and its -+ * documentation for any purpose is hereby granted without fee, provided that -+ * the above copyright notice appear in all copies and that both that -+ * copyright notice and this permission notice appear in supporting -+ * documentation, and that the name of the author(s) not be used in -+ * advertising or publicity pertaining to distribution of the software without -+ * specific, written prior permission. The authors make no -+ * representations about the suitability of this software for any purpose. It -+ * is provided "as is" without express or implied warranty. -+ * -+ * THE AUTHOR(S) DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -+ * EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -+ * PERFORMANCE OF THIS SOFTWARE. -+ */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <dirent.h> -+#include <unistd.h> -+#include <errno.h> -+#ifndef HAVE_STRUCT_DIRENT_D_TYPE -+#include <sys/types.h> -+#include <sys/stat.h> -+#endif -+#include <fontconfig/fontconfig.h> -+ -+#ifdef _WIN32 -+# define FC_DIR_SEPARATOR '\\' -+# define FC_DIR_SEPARATOR_S "\\" -+#else -+# define FC_DIR_SEPARATOR '/' -+# define FC_DIR_SEPARATOR_S "/" -+#endif -+ -+extern FcChar8 *FcConfigRealFilename (FcConfig *, FcChar8 *); -+ -+#ifdef HAVE_MKDTEMP -+#define fc_mkdtemp mkdtemp -+#else -+char * -+fc_mkdtemp (char *template) -+{ -+ if (!mktemp (template) || mkdir (template, 0700)) -+ return NULL; -+ -+ return template; -+} -+#endif -+ -+FcBool -+mkdir_p (const char *dir) -+{ -+ char *parent; -+ FcBool ret; -+ -+ if (strlen (dir) == 0) -+ return FcFalse; -+ parent = (char *) FcStrDirname ((const FcChar8 *) dir); -+ if (!parent) -+ return FcFalse; -+ if (access (parent, F_OK) == 0) -+ ret = mkdir (dir, 0755) == 0 && chmod (dir, 0755) == 0; -+ else if (access (parent, F_OK) == -1) -+ ret = mkdir_p (parent) && (mkdir (dir, 0755) == 0) && chmod (dir, 0755) == 0; -+ else -+ ret = FcFalse; -+ free (parent); -+ -+ return ret; -+} -+ -+FcBool -+unlink_dirs (const char *dir) -+{ -+ DIR *d = opendir (dir); -+ struct dirent *e; -+ size_t len = strlen (dir); -+ char *n = NULL; -+ FcBool ret = FcTrue; -+#ifndef HAVE_STRUCT_DIRENT_D_TYPE -+ struct stat statb; -+#endif -+ -+ if (!d) -+ return FcFalse; -+ while ((e = readdir (d)) != NULL) -+ { -+ size_t l; -+ -+ if (strcmp (e->d_name, ".") == 0 || -+ strcmp (e->d_name, "..") == 0) -+ continue; -+ l = strlen (e->d_name) + 1; -+ if (n) -+ free (n); -+ n = malloc (l + len + 1); -+ if (!n) -+ { -+ ret = FcFalse; -+ break; -+ } -+ strcpy (n, dir); -+ n[len] = FC_DIR_SEPARATOR; -+ strcpy (&n[len + 1], e->d_name); -+#ifdef HAVE_STRUCT_DIRENT_D_TYPE -+ if (e->d_type == DT_DIR) -+#else -+ if (stat (n, &statb) == -1) -+ { -+ fprintf (stderr, "E: %s\n", n); -+ ret = FcFalse; -+ break; -+ } -+ if (S_ISDIR (statb.st_mode)) -+#endif -+ { -+ if (!unlink_dirs (n)) -+ { -+ fprintf (stderr, "E: %s\n", n); -+ ret = FcFalse; -+ break; -+ } -+ } -+ else -+ { -+ if (unlink (n) == -1) -+ { -+ fprintf (stderr, "E: %s\n", n); -+ ret = FcFalse; -+ break; -+ } -+ } -+ } -+ if (n) -+ free (n); -+ closedir (d); -+ -+ if (rmdir (dir) == -1) -+ { -+ fprintf (stderr, "E: %s\n", dir); -+ return FcFalse; -+ } -+ -+ return ret; -+} -+ -+int -+main(void) -+{ -+ FcConfig *cfg = FcConfigCreate (); -+ char *basedir, template[512] = "/tmp/fc110-XXXXXX"; -+ char *sysroot, systempl[512] = "/tmp/fc110-XXXXXX"; -+ FcChar8 *d = NULL; -+ FcChar8 *ret = NULL; -+ FcChar8 *s = NULL; -+ FILE *fp; -+ int retval = 0; -+ -+ retval++; -+ basedir = fc_mkdtemp (template); -+ if (!basedir) -+ { -+ fprintf (stderr, "%s: %s\n", template, strerror (errno)); -+ goto bail; -+ } -+ retval++; -+ sysroot = fc_mkdtemp (systempl); -+ if (!sysroot) -+ { -+ fprintf (stderr, "%s: %s\n", systempl, strerror (errno)); -+ goto bail; -+ } -+ fprintf (stderr, "D: Creating %s\n", basedir); -+ mkdir_p (basedir); -+ setenv ("HOME", basedir, 1); -+ retval++; -+ s = FcStrBuildFilename (basedir, ".fonts.conf", NULL); -+ if (!s) -+ goto bail; -+ retval++; -+ fprintf (stderr, "D: Creating %s\n", s); -+ if ((fp = fopen (s, "wb")) == NULL) -+ goto bail; -+ fprintf (fp, "%s", s); -+ fclose (fp); -+ retval++; -+ fprintf (stderr, "D: Checking file path\n"); -+ ret = FcConfigRealFilename (cfg, "~/.fonts.conf"); -+ if (!ret) -+ goto bail; -+ retval++; -+ if (strcmp ((const char *) s, (const char *) ret) != 0) -+ goto bail; -+ free (ret); -+ free (s); -+ setenv ("FONTCONFIG_SYSROOT", sysroot, 1); -+ fprintf (stderr, "D: Creating %s\n", sysroot); -+ mkdir_p (sysroot); -+ retval++; -+ d = FcStrBuildFilename (sysroot, basedir, NULL); -+ fprintf (stderr, "D: Creating %s\n", d); -+ mkdir_p (d); -+ free (d); -+ s = FcStrBuildFilename (sysroot, basedir, ".fonts.conf", NULL); -+ if (!s) -+ goto bail; -+ retval++; -+ fprintf (stderr, "D: Creating %s\n", s); -+ if ((fp = fopen (s, "wb")) == NULL) -+ goto bail; -+ fprintf (fp, "%s", s); -+ fclose (fp); -+ retval++; -+ fprintf (stderr, "D: Checking file path\n"); -+ ret = FcConfigRealFilename (cfg, "~/.fonts.conf"); -+ if (!ret) -+ goto bail; -+ retval++; -+ if (strcmp ((const char *) s, (const char *) ret) != 0) -+ goto bail; -+ retval = 0; -+bail: -+ fprintf (stderr, "Cleaning up\n"); -+ unlink_dirs (basedir); -+ if (ret) -+ free (ret); -+ if (s) -+ free (s); -+ -+ return retval; -+} -+ diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch b/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch deleted file mode 100644 index cd66082eedd8..000000000000 --- a/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/107 - -Reversion of part of: -https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/f5dd8512bdf9fd8e01c30ae36f593758b29385cf - ---- /src/fcdir.c -+++ /src/fcdir.c -@@ -421,13 +421,6 @@ - /* Not using existing cache file, construct new cache */ - if (!cache) - cache = FcDirCacheScan (dir, config); -- if (cache) -- { -- FcFontSet *fs = FcCacheSet (cache); -- -- if (cache->dirs_count == 0 && (!fs || fs->nfont == 0)) -- FcDirCacheDeleteUUID (dir, config); -- } - - return cache; - } ---- /test/run-test.sh -+++ /test/run-test.sh -@@ -239,19 +239,4 @@ - - rm -rf $MyPWD/sysroot - --dotest "deleting .uuid file on empty dir" --prep --cp $FONT1 $FONT2 $FONTDIR --$FCCACHE $FONTDIR --sleep 1 --rm -f $FONTDIR/*pcf --$FCCACHE $FONTDIR --rmdir $FONTDIR > /dev/null 2>&1 --if [ $? != 0 ]; then -- echo "*** Test failed: $TEST" -- echo "$FONTDIR isn't empty" -- ls -al $FONTDIR -- exit 1 --fi -- - rm -rf $FONTDIR $CACHEFILE $CACHEDIR $FONTCONFIG_FILE out diff --git a/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch b/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch deleted file mode 100644 index d78317da0b3c..000000000000 --- a/media-libs/fontconfig/files/fontconfig-2.13.1-static_build.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 8208f99fa1676c42bfd8d74de3e9dac5366c150c Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <[email protected]> -Date: Mon, 3 Sep 2018 04:56:16 +0000 -Subject: [PATCH] Fix the build issue with --enable-static - -Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/109 ---- a/fontconfig/fontconfig.h -+++ b/fontconfig/fontconfig.h -@@ -1076,6 +1076,10 @@ FcUtf16Len (const FcChar8 *string, - int *nchar, - int *wchar); - -+FcPublic FcChar8 * -+FcStrBuildFilename (const FcChar8 *path, -+ ...); -+ - FcPublic FcChar8 * - FcStrDirname (const FcChar8 *file); - ---- a/src/fcint.h -+++ b/src/fcint.h -@@ -1282,10 +1282,6 @@ FcStrUsesHome (const FcChar8 *s); - FcPrivate FcBool - FcStrIsAbsoluteFilename (const FcChar8 *s); - --FcPrivate FcChar8 * --FcStrBuildFilename (const FcChar8 *path, -- ...); -- - FcPrivate FcChar8 * - FcStrLastSlash (const FcChar8 *path); - ---- a/test/test-bz106632.c -+++ b/test/test-bz106632.c -@@ -25,25 +25,26 @@ - #ifdef HAVE_CONFIG_H - #include "config.h" - #endif -+#include <stdio.h> - #include <stdlib.h> -+#include <string.h> - #include <dirent.h> -+#include <unistd.h> -+#include <errno.h> - #ifndef HAVE_STRUCT_DIRENT_D_TYPE - #include <sys/types.h> - #include <sys/stat.h> --#include <unistd.h> - #endif --#include "fcstr.c" --#undef FcConfigBuildFonts --#undef FcConfigCreate --#undef FcConfigGetCurrent --#undef FcConfigParseAndLoadFromMemory --#undef FcConfigUptoDate --#undef FcFontList --#undef FcInitReinitialize --#undef FcPatternCreate --#undef FcPatternDestroy - #include <fontconfig/fontconfig.h> - -+#ifdef _WIN32 -+# define FC_DIR_SEPARATOR '\\' -+# define FC_DIR_SEPARATOR_S "\\" -+#else -+# define FC_DIR_SEPARATOR '/' -+# define FC_DIR_SEPARATOR_S "/" -+#endif -+ - #ifdef HAVE_MKDTEMP - #define fc_mkdtemp mkdtemp - #else -@@ -154,18 +155,6 @@ unlink_dirs (const char *dir) - return ret; - } - --FcChar8 * --FcLangNormalize (const FcChar8 *lang) --{ -- return NULL; --} -- --FcChar8 * --FcConfigHome (void) --{ -- return NULL; --} -- - int - main (void) - { diff --git a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild b/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild deleted file mode 100644 index b00c1b232b14..000000000000 --- a/media-libs/fontconfig/fontconfig-2.13.1-r2.ebuild +++ /dev/null @@ -1,182 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal readme.gentoo-r1 - -DESCRIPTION="A library for configuring and customizing font access" -HOMEPAGE="https://fontconfig.org/"; -SRC_URI="https://fontconfig.org/release/${P}.tar.bz2"; - -LICENSE="MIT" -SLOT="1.0" -[[ $(ver_cut 3) -ge 90 ]] || \ -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="doc static-libs" - -# Test test-bz106632 is known to be broken, see bug #751232 -# and would require several backports. It will be fixed in -# next version. -# check-missing-doc is known to be broken, see bug #733608 -# because fontconfig-2.13.1-static_build.patch introduces a -# function FcStrBuildFilename which is lacking documentation. -# However, backporting isn't worth it. Will be fixed in -# next version. -RESTRICT="test" - -BDEPEND="dev-util/gperf - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - doc? ( - =app-text/docbook-sgml-dtd-3.1* - app-text/docbook-sgml-utils[jadetex] - )" -# Purposefully dropped the xml USE flag and libxml2 support. Expat is the -# default and used by every distro. See bug #283191. -RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] - >=media-libs/freetype-2.9[${MULTILIB_USEDEP}] - !elibc_Darwin? ( !elibc_SunOS? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) ) - elibc_Darwin? ( sys-libs/native-uuid ) - elibc_SunOS? ( sys-libs/libuuid ) - virtual/libintl[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" -PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig ) - virtual/ttf-fonts" - -PATCHES=( - "${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157 - "${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default - "${FILESDIR}"/${P}-revert_delete_.uuid_for_empty_directory.patch # 666418 - - # Patches from upstream (can usually be removed with next version bump) - "${FILESDIR}"/${P}-static_build.patch - "${FILESDIR}"/${P}-proper_homedir.patch -) - -pkg_setup() { - 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 - eautoreconf -} - -multilib_src_configure() { - local addfonts - # 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="${addfonts},/usr/X/lib/X11/fonts/Type1" - ;; - *-linux-gnu) - use prefix && [[ -d /usr/share/fonts ]] && \ - addfonts=",/usr/share/fonts" - ;; - esac - - local myeconfargs=( - $(use_enable doc docbook) - $(use_enable static-libs static) - --enable-docs - --localstatedir="${EPREFIX}"/var - --with-default-fonts="${EPREFIX}"/usr/share/fonts - --with-add-fonts="${EPREFIX}/usr/local/share/fonts${addfonts}" - --with-templatedir="${EPREFIX}"/etc/fonts/conf.avail - ) - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install() { - MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) ) - - default - - # avoid calling this multiple times, bug #459210 - if multilib_is_native_abi; then - # stuff installed from build-dir - emake -C doc DESTDIR="${D}" install-man - - insinto /etc/fonts - doins fonts.conf - fi -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -name "*.la" -delete || die - - # 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 [[ -e ${ED}/usr/share/doc/fontconfig/ ]]; then - mv "${ED}"/usr/share/doc/fontconfig/* "${ED}"/usr/share/doc/${P} || die - rm -rf "${ED}"/usr/share/doc/fontconfig - 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 - 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 - - readme.gentoo_create_doc - - keepdir /var/cache/${PN} -} - -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 - 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 - - 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 -}
