diff options
| -rw-r--r-- | media-libs/fontconfig/Manifest | 2 | ||||
| -rw-r--r-- | media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch | 34 | ||||
| -rw-r--r-- | media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch | 177 | ||||
| -rw-r--r-- | media-libs/fontconfig/files/fontconfig-2.13.0-names.patch | 93 | ||||
| -rw-r--r-- | media-libs/fontconfig/fontconfig-2.12.6.ebuild | 160 | ||||
| -rw-r--r-- | media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild | 169 |
6 files changed, 0 insertions, 635 deletions
diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest index 684dfc449fd6..86eb43107570 100644 --- a/media-libs/fontconfig/Manifest +++ b/media-libs/fontconfig/Manifest @@ -1,3 +1 @@ -DIST fontconfig-2.12.6.tar.bz2 1624683 BLAKE2B 48432f3d3cc90240ec19dffb6714e7f780eb6b401693b40e2efa2bb593bc89c42b03c99fce8f2ceb7c108da254dc248d91a790849d22feaa50a725338b80fd1f SHA512 2a1d3e62cae2bfcae2e67e9cb75ab6534a35bda4215f1ad4b8bf757e77e7d9d609c016562f5288fd10046a0e94655a807f6dd044d7868ed81a146c4275c4dd06 -DIST fontconfig-2.13.0.tar.bz2 1700500 BLAKE2B bf137b27c9f73c5e2763b7a4a443a4aa5016bd3c0e35138249c2cf8841eb364c8e7bbea6495b53b88de26e3d5a429ebfb598a9f4fe7d875028a621df592ff35a SHA512 f0ad8f2542c8b1e900f5c3d213466a31dd3785da726d6eb455b6734c71c6e5751b28172203e2f9668e9c8e1512072235ea46a1a5e6a85ec54ccc332adb4e5fbc DIST fontconfig-2.13.1.tar.bz2 1723639 BLAKE2B 08b9a522a9d89bc5e5ed0f0898182359efb110f22b6b7010f6bdda0d6d516957ea74ebe0703d684d4724fd9f44a2eaf50d8329d4e0f4e45e79f50466d808b9e1 SHA512 f97f2a9db294fd72d416a7d76dd7db5934ade2cf76903764b09e7decc33e0e2eed1a1d35c5f1c7fd9ea39e2c7653b9e65365f0c6205e047e95e38ba5000dd100 diff --git a/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch b/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch deleted file mode 100644 index 6bea02b1fca8..000000000000 --- a/media-libs/fontconfig/files/fontconfig-2.13.0-add-missing-lintl.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 07bd14c5c7fed103020dc9b630d6a254861ada07 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Fri, 9 Mar 2018 11:55:43 +0900 -Subject: Fix the build issue again on MinGW with enabling nls - ---- - src/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 1ff065b..2111ce0 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -82,7 +82,7 @@ AM_CPPFLAGS = \ - -DFC_CACHEDIR='"$(FC_CACHEDIR)"' \ - -DFONTCONFIG_PATH='"$(BASECONFIGDIR)"' \ - -DFC_TEMPLATEDIR='"$(TEMPLATEDIR)"' --LDADD = $(INTLLIBS) -+LDADD = $(LIBINTL) - - EXTRA_DIST += makealias - -@@ -168,7 +168,7 @@ lib_LTLIBRARIES = libfontconfig.la - libfontconfig_la_LDFLAGS = \ - -version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols) - --libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(INTLLIBS) -+libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) $(UUID_LIBS) $(LTLIBINTL) - - libfontconfig_la_DEPENDENCIES = $(fontconfig_def_dependency) - --- -cgit v1.1 - diff --git a/media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch b/media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch deleted file mode 100644 index 002e493a409e..000000000000 --- a/media-libs/fontconfig/files/fontconfig-2.13.0-locale.patch +++ /dev/null @@ -1,177 +0,0 @@ -https://bugs.gentoo.org/650332 -Do not set locale in the library. -Patch from upstream. - ---- a/fc-cache/fc-cache.c -+++ b/fc-cache/fc-cache.c -@@ -41,6 +41,7 @@ - #include <fcntl.h> - #include <dirent.h> - #include <string.h> -+#include <locale.h> - - #if defined (_WIN32) - #define STRICT -@@ -302,6 +303,7 @@ - #if HAVE_GETOPT_LONG || HAVE_GETOPT - int c; - -+ setlocale (LC_ALL, ""); - #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "Efrsy:Vvh", longopts, NULL)) != -1) - #else ---- a/fc-cat/fc-cat.c -+++ b/fc-cat/fc-cat.c -@@ -40,6 +40,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <errno.h> -+#include <locale.h> - - #ifdef ENABLE_NLS - #include <libintl.h> -@@ -271,6 +272,7 @@ - #if HAVE_GETOPT_LONG || HAVE_GETOPT - int c; - -+ setlocale (LC_ALL, ""); - #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "Vvrh", longopts, NULL)) != -1) - #else ---- a/fc-conflist/fc-conflist.c -+++ b/fc-conflist/fc-conflist.c -@@ -38,6 +38,7 @@ - #include <unistd.h> - #include <stdlib.h> - #include <string.h> -+#include <locale.h> - - #ifdef ENABLE_NLS - #include <libintl.h> -@@ -102,6 +103,7 @@ - #if HAVE_GETOPT_LONG || HAVE_GETOPT - int c; - -+ setlocale (LC_ALL, ""); - #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "Vh", longopts, NULL)) != -1) - #else ---- a/fc-list/fc-list.c -+++ b/fc-list/fc-list.c -@@ -27,6 +27,7 @@ - #include <unistd.h> - #include <stdlib.h> - #include <string.h> -+#include <locale.h> - #ifdef HAVE_CONFIG_H - #include <config.h> - #else -@@ -117,6 +118,7 @@ - #if HAVE_GETOPT_LONG || HAVE_GETOPT - int c; - -+ setlocale (LC_ALL, ""); - #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "vbf:qVh", longopts, NULL)) != -1) - #else ---- a/fc-match/fc-match.c -+++ b/fc-match/fc-match.c -@@ -36,6 +36,7 @@ - #include <unistd.h> - #include <stdlib.h> - #include <string.h> -+#include <locale.h> - - #ifdef ENABLE_NLS - #include <libintl.h> -@@ -121,6 +122,7 @@ - #if HAVE_GETOPT_LONG || HAVE_GETOPT - int c; - -+ setlocale (LC_ALL, ""); - #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "asvbf:Vh", longopts, NULL)) != -1) - #else ---- a/fc-pattern/fc-pattern.c -+++ b/fc-pattern/fc-pattern.c -@@ -36,6 +36,7 @@ - #include <unistd.h> - #include <stdlib.h> - #include <string.h> -+#include <locale.h> - - #ifdef ENABLE_NLS - #include <libintl.h> -@@ -111,6 +112,7 @@ - #if HAVE_GETOPT_LONG || HAVE_GETOPT - int c; - -+ setlocale (LC_ALL, ""); - #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "cdf:Vh", longopts, NULL)) != -1) - #else ---- a/fc-query/fc-query.c -+++ b/fc-query/fc-query.c -@@ -39,6 +39,7 @@ - #include <unistd.h> - #include <stdlib.h> - #include <string.h> -+#include <locale.h> - - #ifdef ENABLE_NLS - #include <libintl.h> -@@ -115,6 +116,7 @@ - #if HAVE_GETOPT_LONG || HAVE_GETOPT - int c; - -+ setlocale (LC_ALL, ""); - #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "i:bf:Vh", longopts, NULL)) != -1) - #else ---- a/fc-scan/fc-scan.c -+++ b/fc-scan/fc-scan.c -@@ -39,6 +39,7 @@ - #include <unistd.h> - #include <stdlib.h> - #include <string.h> -+#include <locale.h> - - #ifdef ENABLE_NLS - #include <libintl.h> -@@ -110,6 +111,7 @@ - #if HAVE_GETOPT_LONG || HAVE_GETOPT - int c; - -+ setlocale (LC_ALL, ""); - #if HAVE_GETOPT_LONG - while ((c = getopt_long (argc, argv, "bf:Vh", longopts, NULL)) != -1) - #else ---- a/src/fccfg.c -+++ b/src/fccfg.c -@@ -26,7 +26,6 @@ - - #include "fcint.h" - #include <dirent.h> --#include <locale.h> - #include <sys/types.h> - - #if defined (_WIN32) && !defined (R_OK) -@@ -39,18 +38,6 @@ - FcConfigEnsure (void) - { - FcConfig *config; -- FcBool is_locale_initialized; -- static void *static_is_locale_initialized; --retry_locale: -- is_locale_initialized = (intptr_t) fc_atomic_ptr_get (&static_is_locale_initialized); -- if (!is_locale_initialized) -- { -- is_locale_initialized = FcTrue; -- if (!fc_atomic_ptr_cmpexch (&static_is_locale_initialized, NULL, -- (void *)(intptr_t) is_locale_initialized)) -- goto retry_locale; -- setlocale (LC_ALL, ""); -- } - retry_config: - config = fc_atomic_ptr_get (&_fcConfig); - if (!config) diff --git a/media-libs/fontconfig/files/fontconfig-2.13.0-names.patch b/media-libs/fontconfig/files/fontconfig-2.13.0-names.patch deleted file mode 100644 index dddc8bb95726..000000000000 --- a/media-libs/fontconfig/files/fontconfig-2.13.0-names.patch +++ /dev/null @@ -1,93 +0,0 @@ -https://bugs.gentoo.org/650370 - -From 198358dd8ff858c9e36531a7406ccb2246ae77b7 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Mon, 12 Mar 2018 11:49:58 +0900 -Subject: [PATCH 1/2] Allow the constant names in the range - -https://bugs.freedesktop.org/show_bug.cgi?id=105415 ---- - src/fcname.c | 34 +++++++++++++++++++++++++++++----- - 1 file changed, 29 insertions(+), 5 deletions(-) - -diff --git a/src/fcname.c b/src/fcname.c -index 79e413e..15fb659 100644 ---- a/src/fcname.c -+++ b/src/fcname.c -@@ -330,13 +330,37 @@ FcNameConvert (FcType type, FcChar8 *string) - case FcTypeRange: - if (sscanf ((char *) string, "[%lg %lg]", &b, &e) != 2) - { -- v.u.d = strtod ((char *) string, &p); -- if (p != NULL && p[0] != 0) -+ char *sc, *ec; -+ size_t len = strlen ((const char *) string); -+ int si, ei; -+ -+ sc = malloc (len); -+ ec = malloc (len); -+ if (sc && ec && sscanf ((char *) string, "[%s %[^]]]", sc, ec) == 2) - { -- v.type = FcTypeVoid; -- break; -+ if (FcNameConstant ((const FcChar8 *) sc, &si) && -+ FcNameConstant ((const FcChar8 *) ec, &ei)) -+ v.u.r = FcRangeCreateDouble (si, ei); -+ else -+ goto bail1; -+ } -+ else -+ { -+ bail1: -+ v.type = FcTypeDouble; -+ if (FcNameConstant (string, &si)) -+ { -+ v.u.d = (double) si; -+ } else { -+ v.u.d = strtod ((char *) string, &p); -+ if (p != NULL && p[0] != 0) -+ v.type = FcTypeVoid; -+ } - } -- v.type = FcTypeDouble; -+ if (sc) -+ free (sc); -+ if (ec) -+ free (ec); - } - else - v.u.r = FcRangeCreateDouble (b, e); --- -2.16.2 - -From 4699406a68321179b14fae7412f828e2f37a7033 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Wed, 14 Mar 2018 18:31:30 +0900 -Subject: [PATCH 2/2] Add the value of the constant name to the implicit object - in the pattern - -For objects which has been changed the object type to FcTypeRange. - -https://bugs.freedesktop.org/show_bug.cgi?id=105415 ---- - src/fcname.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/fcname.c b/src/fcname.c -index 15fb659..c9320ae 100644 ---- a/src/fcname.c -+++ b/src/fcname.c -@@ -490,6 +490,10 @@ FcNameParse (const FcChar8 *name) - if (!FcPatternAddBool (pat, c->object, c->value)) - goto bail2; - break; -+ case FcTypeRange: -+ if (!FcPatternAddInteger (pat, c->object, c->value)) -+ goto bail2; -+ break; - default: - break; - } --- -2.16.2 - diff --git a/media-libs/fontconfig/fontconfig-2.12.6.ebuild b/media-libs/fontconfig/fontconfig-2.12.6.ebuild deleted file mode 100644 index afb9dc10bb9a..000000000000 --- a/media-libs/fontconfig/fontconfig-2.12.6.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools multilib-minimal readme.gentoo-r1 - -DESCRIPTION="A library for configuring and customizing font access" -HOMEPAGE="http://fontconfig.org/" -SRC_URI="http://fontconfig.org/release/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="1.0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 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" - -# 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.7.1[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( =app-text/docbook-sgml-dtd-3.1* - app-text/docbook-sgml-utils[jadetex] )" -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 -) - -MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) ) - -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 - export GPERF=$(type -P true) # avoid dependency on gperf, #631980 - sed -i -e 's/FC_GPERF_SIZE_T="unsigned int"/FC_GPERF_SIZE_T=size_t/' \ - configure.ac || die # rest of gperf dependency fix, #631920 - 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() { - 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 -} - -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 [[ ${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 -} diff --git a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild b/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild deleted file mode 100644 index 338f391d2aed..000000000000 --- a/media-libs/fontconfig/fontconfig-2.13.0-r4.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools multilib-minimal readme.gentoo-r1 eapi7-ver - -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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" -IUSE="doc static-libs" - -# 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? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) - elibc_Darwin? ( sys-libs/native-uuid ) - virtual/libintl[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/gettext-0.19.8 - doc? ( =app-text/docbook-sgml-dtd-3.1* - app-text/docbook-sgml-utils[jadetex] )" -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}-locale.patch #650332 - "${FILESDIR}"/${P}-names.patch #650370 - "${FILESDIR}"/${P}-add-missing-lintl.patch #652674 -) - -MULTILIB_CHOST_TOOLS=( /usr/bin/fc-cache$(get_exeext) ) - -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 - export GPERF=$(type -P true) # avoid dependency on gperf, #631980 - sed -i -e 's/FC_GPERF_SIZE_T="unsigned int"/FC_GPERF_SIZE_T=size_t/' \ - configure.ac || die # rest of gperf dependency fix, #631920 - eautoreconf - rm test/out.expected || die #662048 -} - -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() { - 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 -} - -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 [[ ${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 -} |