From e67d5b4ba05349b3bf4229d0cf7d069809c4420e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 28 Dec 2023 01:37:43 +0000 Subject: gentoo auto-resync : 28:12:2023 - 01:37:43 --- media-libs/fontconfig/Manifest | 3 +- media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild | 231 ---------------------- media-libs/fontconfig/fontconfig-2.15.0.ebuild | 231 ++++++++++++++++++++++ 3 files changed, 233 insertions(+), 232 deletions(-) delete mode 100644 media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild create mode 100644 media-libs/fontconfig/fontconfig-2.15.0.ebuild (limited to 'media-libs/fontconfig') diff --git a/media-libs/fontconfig/Manifest b/media-libs/fontconfig/Manifest index ead7c4b689d4..b9d8c5d41e64 100644 --- a/media-libs/fontconfig/Manifest +++ b/media-libs/fontconfig/Manifest @@ -2,6 +2,7 @@ AUX fontconfig-2.14.0-latin-update.patch 1889 BLAKE2B 42a5faab884bb47e645a8ee6f0 AUX fontconfig-2.14.0-skip-bubblewrap-tests.patch 408 BLAKE2B 911a87e91dcdf49088e9a684a9af753464211f18fd471989410a57363dd71b7cc0940c9a8e61095d901b4d7ee804536262ebc6afb1af3f470d8cd164d2fd2113 SHA512 8302a3ccf5918c8a4c3af3ab3601752c005c0361003281996eba469195127fab0e99c8d225dcb674a1bc198f2c15b982cce49c6bb3234307cf58e47c9206ff5a AUX fontconfig-2.14.2-fix-sysroot-fc-cache.patch 2007 BLAKE2B 91a43c8aec698a9733020031bfded6871d379b20535f6c1291d0d3fa38faaef9e367f0958f6df2b88003190184988dc99f7fa7f013f6837f24b617b83a0d5546 SHA512 73e41f2f19f61514a271141ddb4b640ed3b6060c4ccdcc79a4eefa6a6b4ece0e718012bee4b4b7312561e39ca02cd9663084298000d9cc9aa210c81a16945572 DIST fontconfig-2.14.2.tar.xz 1440844 BLAKE2B 4efeeb7f9a6705d493128d00b60e681a20a47556f4c0d7787a5c7a6d2cbbc22f150cad7988a9836a9e72aeb61e2b6a196c00a071c7042c62283c7720cdbb743d SHA512 23483e0ae6aa7589fd37f9949a4cf951c5bff981739dbb446881e4cea86a208c0ab31e2358666eac724af1dc6a689a42733a7ce91cd3e76d8d91eacedb318085 -EBUILD fontconfig-2.14.2-r2.ebuild 7093 BLAKE2B 328e5726f312fdfe9404aab4873167ecaba7714f6867ee5d74ed585c1d31243fa72b7ed6fba4d7f353814f7dfb63ea05036ec76809e5f8eb46f31dbe3bf1589c SHA512 5a14e4b9481edda2f67f7dae3fbde51f75960706b68957aaaefe99e2053f14450093a3e23a895cc125b187464bc99219bcde888e0f8fc8057a2efbba5e5aac7c +DIST fontconfig-2.15.0.tar.xz 1447820 BLAKE2B 17c85fddc4ab84111c4f50afb89ecd8792c3aeaa2690b38fd39fca6f6cece69e9ce0cd3af8a2e54968c79ad1f9bee1e444699a13c068d9dfd3dfe1212ff37533 SHA512 754cd5fffa198fc07a39cf7df683e9adfa7f54ab41fdff8c0eacc078fd35d3e01069ba343f2b045e0b40df88d9f1fc1ee0f7565799f9cb194a59cf95b64c4417 EBUILD fontconfig-2.14.2-r3.ebuild 7154 BLAKE2B 81361cf13b4f9308935d15333f50883e68fc271562ca0ec6baa0e404e17ae5e89554bfed3541876fba772193dbf0f79417acb10ff64786e1f9006c57c891248f SHA512 a6d69ebbf761748c5443f5475e08b79dd71f907bdd5d9ebaadee2c1d13d5063bdf3641b5d8a94b9969aa8ba813fb3c63be3f24690fb8f25b638a26e677a14592 +EBUILD fontconfig-2.15.0.ebuild 7115 BLAKE2B 33f065c716d3e29e2f0be364b2bcab67b49e145b3071f3f4d4456ca1056ad121552927789ddc31e54bf4a213d945d3ae0d331d336db66f4797290718f58f6976 SHA512 449fc14b6fd366f98f1e2cd9e1d6584c1bd550fd00e2868da8ae3c45a0ab3c5e29739071afa4515f8727767232f4f725ae3703fb513cb91a533cad3685308943 MISC metadata.xml 672 BLAKE2B d23112b5d408aed97ad68bc9a141a570c22fd6bbf0022e979b7006817ae27bcba21be43558cb42df06f3c280cbed5570c62805bb69be8a64b1f41bd90b200bc0 SHA512 1ff9c1f22b9766127692eec4824ce966f7a7305ddfae0dd1d8b0e5b432926508dd7a898eada6c182e02c985e11c2f9a22f13eac195333ed32952af0e89015e9a diff --git a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild b/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild deleted file mode 100644 index ddbb23ce8ebb..000000000000 --- a/media-libs/fontconfig/fontconfig-2.14.2-r2.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..11} ) -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 ~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 -} 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 +} -- cgit v1.2.3