From cf7630078a53ff74b245b148bd722994068e28f9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 28 Oct 2022 15:59:37 +0100 Subject: gentoo auto-resync : 28:10:2022 - 15:59:37 --- media-libs/fontconfig/Manifest | 2 +- media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild | 216 ++++++++++++++++++++++ media-libs/fontconfig/fontconfig-2.14.1.ebuild | 215 --------------------- 3 files changed, 217 insertions(+), 216 deletions(-) create mode 100644 media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild delete mode 100644 media-libs/fontconfig/fontconfig-2.14.1.ebuild (limited to 'media-libs/fontconfig') diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest index acbb8d4be334..a1346184d9f1 100644 --- a/media-libs/fontconfig/Manifest +++ b/media-libs/fontconfig/Manifest @@ -8,5 +8,5 @@ AUX fontconfig-2.14.1-gperf-meson.patch 2559 BLAKE2B 203cdd0d208acaf417e81973810 DIST fontconfig-2.14.0.tar.xz 1431056 BLAKE2B 880f34d33ac30158ea61e922f6635900c5b244c2eb5d259f7947a364df86ee13f6190f651471b0a28bcd3c13f19c970783517903df374839e474921611dff1ff SHA512 a5257249d031b3cd1a7b1521cd58f48d235a970020da4136a727db5407ec98e74a3776bc467d7e39f30ec664f56ff9fe39068317744a5e737a65109f7a005bfc DIST fontconfig-2.14.1.tar.xz 1447044 BLAKE2B 4bee654f4196922fb07673f588b4bf8a651bbcc8b882b20712814ff253adf6457c3c4b4c2f5549bac37ed3f152e9993988f00d04e2516c911eb13747fc4a1c73 SHA512 ba42e6f90ec92914895d2157c872c373adfc17be791b92253bcc40e85674a84e43c08ab2b37c3ae85b53b2e7bd2a7847abb479043f303b732c08eeac3ee733db EBUILD fontconfig-2.14.0-r1.ebuild 6742 BLAKE2B 27a4b527cadce296d9e221c395cacc4ab22ee3fa20edbe8a736d88971e655cdd1381dc02879bae0935d0c5d97d1128a89d969b9bd764d67475d1fb185934e0c7 SHA512 b0989ef1f9365d433422ba3c2cee6d817ae0654702d59aa5ffdd05bb16e61e063fdbab912d734a7e350da5559f9f35d33d86583a00ce2748a3dab550e28cb73f -EBUILD fontconfig-2.14.1.ebuild 6556 BLAKE2B e9808d495912d487ce2ebbfa0e6a180334e75c404d1bb415dc0617e2cadf636663c2e944b3906dbc76045b563724d37f997d00cd6f37df611e38e51f26b03ed6 SHA512 412b60c8afeb9c190a516c424d6ddc500eeecbb06102fe90b906eb559d36277de39760fb11ad1373b6f976ec476e6483cda3d787c0f27ec8753dd0c0c74d1006 +EBUILD fontconfig-2.14.1-r1.ebuild 6604 BLAKE2B b48c536470267527ecea36728010bee850dacb531b2a2a34f1319a420bbd2217d258dc1dac6b1b4ed97ccfe8d7e1f16822253feb110c70f0c4e5563b3546a86b SHA512 9a89ff58f3d0c75696ac60f2f94d9066c5b329c9593d3c2cc753d6627c2cb2ab4e42ad61319039dad0f3a62447470d4178b3c6c56af4ebeb0808dfb607dc5126 MISC metadata.xml 599 BLAKE2B c83a7da35bf49bd9bdbcc0adbeed83781250873abf67a927a63fbeb76c4013582cc2363068380b95cb021368bbc0ce92e4dc101f75eb6e3405f07a14d6dc97c3 SHA512 9cc70ac770d70ceef0a24acea4089a949456e229242a2f33f35230505cfa7dc5d20fbf1f2b066c6a1bae53013db6dbabbd22304a3f2a358ec43b6843b22e0a66 diff --git a/media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild b/media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild new file mode 100644 index 000000000000..1b69d23f740f --- /dev/null +++ b/media-libs/fontconfig/fontconfig-2.14.1-r1.ebuild @@ -0,0 +1,216 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib meson-multilib 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +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=" + 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="!x86-winnt? ( 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) + "${FILESDIR}"/${P}-gperf-meson.patch + "${FILESDIR}"/${P}-gperf-meson-debugging.patch +) + +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 + ) + + 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/${P} || 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 + + 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 +} diff --git a/media-libs/fontconfig/fontconfig-2.14.1.ebuild b/media-libs/fontconfig/fontconfig-2.14.1.ebuild deleted file mode 100644 index 0cc0f9683203..000000000000 --- a/media-libs/fontconfig/fontconfig-2.14.1.ebuild +++ /dev/null @@ -1,215 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit multilib meson-multilib 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -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=" - 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="!x86-winnt? ( 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) - "${FILESDIR}"/${P}-gperf-meson.patch - "${FILESDIR}"/${P}-gperf-meson-debugging.patch -) - -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 - -Ddefault-fonts-dirs="${EPREFIX}"/usr/share/fonts - -Dadditional-fonts-dirs=$(IFS=, ; echo "${addfonts[*]}" ) - -Dtemplate-dir="${EPREFIX}"/etc/fonts/conf.avail - ) - - 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/${P} || 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 - - 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 -} -- cgit v1.2.3