commit: 2c0df721bcf0a7ca18f89f14c6050aa0dfae8d42 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Sep 11 20:53:08 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Sep 11 20:53:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c0df721
media-libs/freetype: drop 2.14.0, 2.14.0-r2, 2.14.0-r3 Use 2.14.1 instead. Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/freetype/Manifest | 3 - .../files/freetype-2.14.0-harfbuzz-call.patch | 30 --- .../files/freetype-2.14.0-iosevka-hang.patch | 44 ---- .../files/freetype-2.14.0-pillow-tests.patch | 70 ------ .../freetype/files/freetype-2.14.0-tt-hint.patch | 87 ------- media-libs/freetype/freetype-2.14.0-r2.ebuild | 258 -------------------- media-libs/freetype/freetype-2.14.0-r3.ebuild | 259 --------------------- media-libs/freetype/freetype-2.14.0.ebuild | 257 -------------------- 8 files changed, 1008 deletions(-) diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest index e0b7b9bb158a..f08b999782fb 100644 --- a/media-libs/freetype/Manifest +++ b/media-libs/freetype/Manifest @@ -1,9 +1,6 @@ DIST freetype-2.13.3.tar.xz 2617564 BLAKE2B f9591c6998df02b072adaf38a968e91deae8ed4d53ea0cb74d08982c4f0e48b1a98c1378a698164e4f730f07a3b0bea308a94fcc2e2b8ce9967dbf9478b599bd SHA512 600828d7756c8cfa974448ef34ee0db573fb8cfdb2dc1e0358b63c44a03bfd7e3d4384424b9cc5e4749034f60231a550c4b7fcb46694fcacea218787ce305504 -DIST freetype-2.14.0.tar.xz 2665548 BLAKE2B 70b79290b16bc05e156032dc8a9136bddb21c1f9fc84692959c65f2bc3dc51df681587aee672de9eb393ec77edae05f8e4fdab642a9938dade9eb1186f6d010e SHA512 287661121fc52d609bb74a46c2ebba83af384f760ce737b2dc616326a36fa39ab651f279ca08b6ebb3b2d2c7d39e11438f8b1b676afe452acc9fe1499b8646bc DIST freetype-2.14.1.tar.xz 2664948 BLAKE2B 1dc62d337a93ca94f93496e60bdf9cbabed5867d66bb2f07669f1b5f81ef16f6cc57c401f51bb62d919680316f73902fafb6a167c45183872faaf984840b5ec7 SHA512 28284da99be52e90c7883fd668131cd44227ce68b98a57767fc33b2fe73e4baa5425cba4144bf3094192946d2abec03cec7afefe6300c0cda6787fae91966bad DIST freetype-doc-2.13.3.tar.xz 2173852 BLAKE2B 84244e28ace43929387052954b92089f570300dc8a9cb77e0ceb53001f081f6d6e5785ad081448ceb58254f8102e3ccf64d1fd323b02fb0a8232a0ba3eb9f3a8 SHA512 54ef9e3a4f0c298893268ed409f59aa1620a60c656ee3f8bdddbb91ffb2e70eea2f016a85c0a02eef699de362abee4aabae4482f0fa1cbf42967b5873fc84f2d -DIST freetype-doc-2.14.0.tar.xz 2175416 BLAKE2B f8bdca0a1ef0c43e7b75f8ed0ee43cfca2a2d95427c585b8b849c42dfdf02af22348007d49b9a207b0f2cc8133227699a08dcdf552f2361755df62e57af256de SHA512 5f69e8a53b8fe20e968ffe60d911df89f116c55fee604971c2f552b32e4c25046777221d33145369c6bbcabff6efcd2ef9905d7f13386bcbf2cdeb88aec801c1 DIST freetype-doc-2.14.1.tar.xz 2175972 BLAKE2B 1065f27c6243c0ff546c091ba4267342304c78615feb700d105136930e3d9cebbae2e784df12a13ca13f9db1b82a079405b665141102f2b96d4c673b76fe45f3 SHA512 a2e0901863d59c59ff4d1ded1c2000ddaa5cf21c3ea5fdf74e8bfecee56f8cf954628d0abd7440e9c1a3ebe23801138737e297809f403574304c41231f0fb962 DIST ft2demos-2.13.3.tar.xz 342404 BLAKE2B 5f5a48e0ad839ece97ea2bd451bd819ccbf9347425dc323a368e5fed91cfddeffd61b1dfea2e7cc7d65e30e6ebb932dd142430998039eb4a8f91758a3690ddef SHA512 e662a20ad2ff80534e8ea0df2f299e8f61350f13d279f80f8257b18352e863dd2c266791b85d3410b0c83966cb12e3ff49cf398b83a651dc73772df9fcf5936c -DIST ft2demos-2.14.0.tar.xz 344120 BLAKE2B ec4552644ea652f2d562126e24f45ff6d45dac9ae7b0c7dd232bf533059e6558e8654d207dc1c41a928fe351655d8c6abf691ba339f06d09f955796d95d037da SHA512 93d663c3eccd5313fa69cfa284d05e192ffed59cadfc0978f94ca7d720e5961ca707626d38e36dd5d4d7a1a08df7d503e12fb3423c8b4861a42ef8826b996dd1 DIST ft2demos-2.14.1.tar.xz 344228 BLAKE2B d91ccdf470a6a14e4d0f6f7a8aa9d22cdaaf88bd44dfc09b65efc90becd87b59c4c9bbc62c63154f207900d0d957bc9dd4674b2228fb9ca0b55b273004ac3f74 SHA512 a6240e888807c6171f8ee5d14578f83902cb495e6e911e5fd7c17628025310a60b0dfe5cd6c6e8803d3460eacd534d7f21c6c598081934d609575e182a312877 diff --git a/media-libs/freetype/files/freetype-2.14.0-harfbuzz-call.patch b/media-libs/freetype/files/freetype-2.14.0-harfbuzz-call.patch deleted file mode 100644 index 5468a89ac111..000000000000 --- a/media-libs/freetype/files/freetype-2.14.0-harfbuzz-call.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://cgit.git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=e969f52986ce38e7082f7efc1957ef5b145ac81e -https://gitlab.freedesktop.org/freetype/freetype/-/issues/1354 - -From e969f52986ce38e7082f7efc1957ef5b145ac81e Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod <[email protected]> -Date: Mon, 8 Sep 2025 05:57:19 +0200 -Subject: [autofit] Fix HarfBuzz calling. - -* src/autofit/afadjust.c (af_reverse_character_map_new) - [FT_CONFIG_OPTION_USE_HARFBUZZ]: Use `ft_hb_enabled`. - -Fixes issue #1354. ---- - src/autofit/afadjust.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/autofit/afadjust.c b/src/autofit/afadjust.c -index f55317bcf..6637cacfc 100644 ---- a/src/autofit/afadjust.c -+++ b/src/autofit/afadjust.c -@@ -1355,6 +1355,7 @@ - - #ifdef FT_CONFIG_OPTION_USE_HARFBUZZ - -+ if ( ft_hb_enabled( globals ) ) - { - hb_font_t *hb_font; - hb_face_t *hb_face; --- -cgit v1.2.3 diff --git a/media-libs/freetype/files/freetype-2.14.0-iosevka-hang.patch b/media-libs/freetype/files/freetype-2.14.0-iosevka-hang.patch deleted file mode 100644 index dc2218da903d..000000000000 --- a/media-libs/freetype/files/freetype-2.14.0-iosevka-hang.patch +++ /dev/null @@ -1,44 +0,0 @@ -https://gitlab.freedesktop.org/freetype/freetype/-/issues/1356 -https://gitlab.freedesktop.org/freetype/freetype/-/commit/53b9319bff2deaa24eb6d29da7a304ac8c8e42a8 - -From 53b9319bff2deaa24eb6d29da7a304ac8c8e42a8 Mon Sep 17 00:00:00 2001 -From: Werner Lemberg <[email protected]> -Date: Wed, 10 Sep 2025 14:10:23 +0200 -Subject: [PATCH] * src/autofit/afgsub.c (af_map_lookup): Fix handling of - lookup type 7. - -Fixes issue #1356. ---- - src/autofit/afgsub.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/autofit/afgsub.c b/src/autofit/afgsub.c -index 6cc664ee8..386999d5c 100644 ---- a/src/autofit/afgsub.c -+++ b/src/autofit/afgsub.c -@@ -649,6 +649,8 @@ - { - FT_Error error; - -+ FT_UInt real_lookupType = lookupType; -+ - FT_Byte* subtable = table + FT_NEXT_USHORT( p ); - - -@@ -657,11 +659,11 @@ - FT_Byte* q = subtable + 2; - - -- lookupType = FT_NEXT_USHORT( q ); -- subtable += FT_PEEK_ULONG( q ); -+ real_lookupType = FT_NEXT_USHORT( q ); -+ subtable += FT_PEEK_ULONG( q ); - } - -- if ( lookupType == 1 ) -+ if ( real_lookupType == 1 ) - { - FT_UInt format = FT_PEEK_USHORT( subtable ); - --- -GitLab diff --git a/media-libs/freetype/files/freetype-2.14.0-pillow-tests.patch b/media-libs/freetype/files/freetype-2.14.0-pillow-tests.patch deleted file mode 100644 index 1ac20f302ff1..000000000000 --- a/media-libs/freetype/files/freetype-2.14.0-pillow-tests.patch +++ /dev/null @@ -1,70 +0,0 @@ -https://gitlab.freedesktop.org/freetype/freetype/-/issues/1355 -https://gitlab.freedesktop.org/freetype/freetype/-/commit/566f8805f3f7da63da8f2bd56d5f050104aac022 - -From 566f8805f3f7da63da8f2bd56d5f050104aac022 Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod <[email protected]> -Date: Wed, 10 Sep 2025 14:22:49 +0200 -Subject: [PATCH] [base] Fix return values of two Font Variation functions. - -* src/base/ftmm.c (FT_Set_Var_Design_Coordinates, - FT_Set_Var_Blend_Coordinates): Do it. - -Fixes issue #1355. ---- - src/base/ftmm.c | 34 ++++++++++++++++++++-------------- - 1 file changed, 20 insertions(+), 14 deletions(-) - -diff --git a/src/base/ftmm.c b/src/base/ftmm.c -index 35b924b1b..9e6700140 100644 ---- a/src/base/ftmm.c -+++ b/src/base/ftmm.c -@@ -307,13 +307,16 @@ - FT_Bool is_variation_old = FT_IS_VARIATION( face ); - - -- if ( error != -1 ) -- { -- if ( error == -2 ) /* -2 means is_variable. */ -- face->face_flags |= FT_FACE_FLAG_VARIATION; -- else -- face->face_flags &= ~FT_FACE_FLAG_VARIATION; -- } -+ if ( error != -1 ) -+ { -+ if ( error == -2 ) /* -2 means is_variable. */ -+ { -+ face->face_flags |= FT_FACE_FLAG_VARIATION; -+ error = FT_Err_Ok; -+ } -+ else -+ face->face_flags &= ~FT_FACE_FLAG_VARIATION; -+ } - - if ( service_mm->construct_ps_name ) - { -@@ -485,13 +488,16 @@ - FT_Bool is_variation_old = FT_IS_VARIATION( face ); - - -- if ( error != -1 ) -- { -- if ( error == -2 ) /* -2 means is_variable. */ -- face->face_flags |= FT_FACE_FLAG_VARIATION; -- else -- face->face_flags &= ~FT_FACE_FLAG_VARIATION; -- } -+ if ( error != -1 ) -+ { -+ if ( error == -2 ) /* -2 means is_variable. */ -+ { -+ face->face_flags |= FT_FACE_FLAG_VARIATION; -+ error = FT_Err_Ok; -+ } -+ else -+ face->face_flags &= ~FT_FACE_FLAG_VARIATION; -+ } - - if ( service_mm->construct_ps_name ) - { --- -GitLab diff --git a/media-libs/freetype/files/freetype-2.14.0-tt-hint.patch b/media-libs/freetype/files/freetype-2.14.0-tt-hint.patch deleted file mode 100644 index e4989ff59223..000000000000 --- a/media-libs/freetype/files/freetype-2.14.0-tt-hint.patch +++ /dev/null @@ -1,87 +0,0 @@ -https://cgit.git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=89eba38e62981d7a6f0dd4995c603a23e00c113d -https://cgit.git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=3ac49075459074d35bfd295f9384041e7a53d701 -https://cgit.git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=36f917cc6ac8b3b0c9cbc549fab2f839f6f5680b - -https://gitlab.freedesktop.org/freetype/freetype/-/issues/1353 -https://gitlab.freedesktop.org/freetype/freetype/-/issues/1349 - -From 89eba38e62981d7a6f0dd4995c603a23e00c113d Mon Sep 17 00:00:00 2001 -From: Alexei Podtelezhnikov <[email protected]> -Date: Mon, 8 Sep 2025 10:43:35 -0400 -Subject: * src/truetype/ttinterp.c (TT_Run_Context): Reset IUP tracking bits. - -Fixes #1353. ---- - src/truetype/ttinterp.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c -index 378342bbb..bf440936c 100644 ---- a/src/truetype/ttinterp.c -+++ b/src/truetype/ttinterp.c -@@ -7521,6 +7521,12 @@ - exec->func_round = (TT_Round_Func)Round_To_Grid; - Compute_Funcs( exec ); - -+#ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL -+ /* Reset IUP tracking bits in the backward compatibility mode. */ -+ /* See `ttinterp.h' for details. */ -+ exc->backward_compatibility &= ~0x6; -+#endif -+ - /* some glyphs leave something on the stack, */ - /* so we clean it before a new execution. */ - exec->top = 0; --- -cgit v1.2.3 - -From 3ac49075459074d35bfd295f9384041e7a53d701 Mon Sep 17 00:00:00 2001 -From: Alexei Podtelezhnikov <[email protected]> -Date: Mon, 8 Sep 2025 10:45:16 -0400 -Subject: Typo! - ---- - src/truetype/ttinterp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c -index bf440936c..9ae90c769 100644 ---- a/src/truetype/ttinterp.c -+++ b/src/truetype/ttinterp.c -@@ -7524,7 +7524,7 @@ - #ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL - /* Reset IUP tracking bits in the backward compatibility mode. */ - /* See `ttinterp.h' for details. */ -- exc->backward_compatibility &= ~0x6; -+ exec->backward_compatibility &= ~0x6; - #endif - - /* some glyphs leave something on the stack, */ --- -cgit v1.2.3 - -From 36f917cc6ac8b3b0c9cbc549fab2f839f6f5680b Mon Sep 17 00:00:00 2001 -From: Alexei Podtelezhnikov <[email protected]> -Date: Mon, 8 Sep 2025 11:03:24 -0400 -Subject: * src/truetype/ttinterp.c (TT_Run_Context): Fix IUP tracking bits. - -Correctly fixes #1353 and #1349. ---- - src/truetype/ttinterp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c -index 9ae90c769..7b26c9a9d 100644 ---- a/src/truetype/ttinterp.c -+++ b/src/truetype/ttinterp.c -@@ -7524,7 +7524,7 @@ - #ifdef TT_SUPPORT_SUBPIXEL_HINTING_MINIMAL - /* Reset IUP tracking bits in the backward compatibility mode. */ - /* See `ttinterp.h' for details. */ -- exec->backward_compatibility &= ~0x6; -+ exec->backward_compatibility &= ~0x3; - #endif - - /* some glyphs leave something on the stack, */ --- -cgit v1.2.3 diff --git a/media-libs/freetype/freetype-2.14.0-r2.ebuild b/media-libs/freetype/freetype-2.14.0-r2.ebuild deleted file mode 100644 index ebedb7fd3dba..000000000000 --- a/media-libs/freetype/freetype-2.14.0-r2.ebuild +++ /dev/null @@ -1,258 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools libtool multilib-minimal toolchain-funcs - -DESCRIPTION="High-quality and portable font engine" -HOMEPAGE="https://www.freetype.org/"; - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 -else - SRC_URI=" - https://downloads.sourceforge.net/freetype/${P/_/}.tar.xz - mirror://nongnu/freetype/${P/_/}.tar.xz - utils? ( - https://downloads.sourceforge.net/freetype/ft2demos-${PV}.tar.xz - mirror://nongnu/freetype/ft2demos-${PV}.tar.xz - ) - doc? ( - https://downloads.sourceforge.net/freetype/${PN}-doc-${PV}.tar.xz - mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz - ) - " - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="|| ( FTL GPL-2+ )" -SLOT="2" -IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug doc fontforge harfbuzz +png static-libs svg utils" - -RDEPEND=" - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] ) - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] ) - utils? ( - svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] ) - X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] ) - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" -PDEPEND="harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )" - -PATCHES=( - "${FILESDIR}"/${P}-harfbuzz-call.patch - "${FILESDIR}"/${P}-tt-hint.patch - "${FILESDIR}"/${PN}-2.14.0-pillow-tests.patch -) - -_egit_repo_handler() { - if [[ ${PV} == 9999 ]] ; then - local phase="${1}" - case ${phase} in - fetch|unpack) - :; - ;; - *) - die "Please use this function with either \"fetch\" or \"unpack\"" - ;; - esac - - local EGIT_REPO_URI - EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype.git"; - git-r3_src_${phase} - if use utils ; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype-demos.git"; - local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" - git-r3_src_${phase} - fi - else - default - fi -} - -pkg_pretend() { - if use svg && ! use utils ; then - einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled." - fi -} - -src_unpack() { - _egit_repo_handler ${EBUILD_PHASE} - - if [[ ${PV} == 9999 ]] ; then - # Need to copy stuff from dlg subproject (bug #758902) - local dlg_inc_dir="${S}/subprojects/dlg/include/dlg" - local dlg_src_dir="${S}/subprojects/dlg/src/dlg" - local dlg_dest_dir="${S}/include" - mkdir -p "${dlg_dest_dir}/dlg" || die - cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die - cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die - fi -} - -src_prepare() { - if [[ ${PV} == 9999 ]] ; then - # Do NOT automagically mess with submodules! - sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die - - # Inspired by shipped autogen.sh script - eval $(sed -n \ - -e 's/^#define *\(FREETYPE_MAJOR\) *\([0-9][0-9]*\).*/\1=\2/p' \ - -e 's/^#define *\(FREETYPE_MINOR\) *\([0-9][0-9]*\).*/\1=\2/p' \ - -e 's/^#define *\(FREETYPE_PATCH\) *\([0-9][0-9]*\).*/\1=\2/p' \ - include/freetype/freetype.h || die) - FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}" - [[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}" - - pushd builds/unix &>/dev/null || die - sed -e "s;@VERSION@;${FREETYPE};" \ - < configure.raw > configure.ac || die - unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE - popd &>/dev/null || die - fi - - default - - pushd builds/unix &>/dev/null || die - # eautoheader produces broken ftconfig.in - AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf - popd &>/dev/null || die - - # This is the same as the 01 patch from infinality - sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die - - enable_option() { - sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \ - include/${PN}/config/ftoption.h \ - || die "unable to enable option $1" - } - - disable_option() { - sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \ - include/${PN}/config/ftoption.h \ - || die "unable to disable option $1" - } - - if ! use cleartype-hinting ; then - disable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING - fi - - # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1" - # via environment (new since v2.8) - enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES - - # See https://freetype.org/patents.html (expired!) - enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING - - if ! use adobe-cff ; then - enable_option CFF_CONFIG_OPTION_OLD_ENGINE - fi - - if use debug ; then - enable_option FT_DEBUG_LEVEL_TRACE - enable_option FT_DEBUG_MEMORY - fi - - if use utils ; then - cd "${WORKDIR}/ft2demos-${PV}" || die - # Disable tests needing X11 when USE="-X". (bug #177597) - if ! use X ; then - sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die - fi - cd "${S}" || die - fi - - # bug #869803 - rm docs/reference/sitemap.xml.gz || die - - # We need non-/bin/sh to run configure - if [[ -n ${CONFIG_SHELL} ]] ; then - sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \ - "${S}"/builds/unix/configure || die - fi - - elibtoolize --patch-only -} - -multilib_src_configure() { - export GNUMAKE=gmake - - local myeconfargs=( - --disable-freetype-config - --enable-shared - --with-zlib - $(use_with brotli) - $(use_with bzip2) - # As of 2.14.0, FT bundles its own copies of the needed headers and dlopen()s - # harfbuzz instead, which breaks an insidious circular dependency. - $(use_with harfbuzz harfbuzz dynamic) - $(use_with png) - $(use_enable static-libs static) - $(usex utils $(use_with svg librsvg) --without-librsvg) - - # Avoid using libpng-config - LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" - LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" - ) - - case ${CHOST} in - mingw*|*-mingw*) ;; - # Workaround windows misdetection: bug #654712 - # Have to do it for both ${CHOST}-windres and windres - *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;; - esac - - export CC_BUILD="$(tc-getBUILD_CC)" - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use utils ; then - einfo "Building utils" - # Fix for Prefix, bug #339334 - emake \ - X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ - FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use utils ; then - einfo "Installing utils" - emake DESTDIR="${D}" FT2DEMOS=1 \ - TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install - fi -} - -multilib_src_install_all() { - if use fontforge ; then - # fontforge can probably cope with fewer of these, but this is simpler - einfo "Installing internal headers required for fontforge" - local header - find src/truetype include/freetype/internal -name '*.h' | \ - while read header ; do - mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - done - fi - - dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO} - if [[ ${PV} != 9999 ]] && use doc ; then - docinto html - dodoc -r docs/* - fi - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/media-libs/freetype/freetype-2.14.0-r3.ebuild b/media-libs/freetype/freetype-2.14.0-r3.ebuild deleted file mode 100644 index 100d53ed0c21..000000000000 --- a/media-libs/freetype/freetype-2.14.0-r3.ebuild +++ /dev/null @@ -1,259 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools libtool multilib-minimal toolchain-funcs - -DESCRIPTION="High-quality and portable font engine" -HOMEPAGE="https://www.freetype.org/"; - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 -else - SRC_URI=" - https://downloads.sourceforge.net/freetype/${P/_/}.tar.xz - mirror://nongnu/freetype/${P/_/}.tar.xz - utils? ( - https://downloads.sourceforge.net/freetype/ft2demos-${PV}.tar.xz - mirror://nongnu/freetype/ft2demos-${PV}.tar.xz - ) - doc? ( - https://downloads.sourceforge.net/freetype/${PN}-doc-${PV}.tar.xz - mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz - ) - " - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="|| ( FTL GPL-2+ )" -SLOT="2" -IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug doc fontforge harfbuzz +png static-libs svg utils" - -RDEPEND=" - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] ) - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] ) - utils? ( - svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] ) - X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] ) - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" -PDEPEND="harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )" - -PATCHES=( - "${FILESDIR}"/${P}-harfbuzz-call.patch - "${FILESDIR}"/${P}-tt-hint.patch - "${FILESDIR}"/${P}-pillow-tests.patch - "${FILESDIR}"/${P}-iosevka-hang.patch -) - -_egit_repo_handler() { - if [[ ${PV} == 9999 ]] ; then - local phase="${1}" - case ${phase} in - fetch|unpack) - :; - ;; - *) - die "Please use this function with either \"fetch\" or \"unpack\"" - ;; - esac - - local EGIT_REPO_URI - EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype.git"; - git-r3_src_${phase} - if use utils ; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype-demos.git"; - local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" - git-r3_src_${phase} - fi - else - default - fi -} - -pkg_pretend() { - if use svg && ! use utils ; then - einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled." - fi -} - -src_unpack() { - _egit_repo_handler ${EBUILD_PHASE} - - if [[ ${PV} == 9999 ]] ; then - # Need to copy stuff from dlg subproject (bug #758902) - local dlg_inc_dir="${S}/subprojects/dlg/include/dlg" - local dlg_src_dir="${S}/subprojects/dlg/src/dlg" - local dlg_dest_dir="${S}/include" - mkdir -p "${dlg_dest_dir}/dlg" || die - cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die - cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die - fi -} - -src_prepare() { - if [[ ${PV} == 9999 ]] ; then - # Do NOT automagically mess with submodules! - sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die - - # Inspired by shipped autogen.sh script - eval $(sed -n \ - -e 's/^#define *\(FREETYPE_MAJOR\) *\([0-9][0-9]*\).*/\1=\2/p' \ - -e 's/^#define *\(FREETYPE_MINOR\) *\([0-9][0-9]*\).*/\1=\2/p' \ - -e 's/^#define *\(FREETYPE_PATCH\) *\([0-9][0-9]*\).*/\1=\2/p' \ - include/freetype/freetype.h || die) - FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}" - [[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}" - - pushd builds/unix &>/dev/null || die - sed -e "s;@VERSION@;${FREETYPE};" \ - < configure.raw > configure.ac || die - unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE - popd &>/dev/null || die - fi - - default - - pushd builds/unix &>/dev/null || die - # eautoheader produces broken ftconfig.in - AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf - popd &>/dev/null || die - - # This is the same as the 01 patch from infinality - sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die - - enable_option() { - sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \ - include/${PN}/config/ftoption.h \ - || die "unable to enable option $1" - } - - disable_option() { - sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \ - include/${PN}/config/ftoption.h \ - || die "unable to disable option $1" - } - - if ! use cleartype-hinting ; then - disable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING - fi - - # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1" - # via environment (new since v2.8) - enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES - - # See https://freetype.org/patents.html (expired!) - enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING - - if ! use adobe-cff ; then - enable_option CFF_CONFIG_OPTION_OLD_ENGINE - fi - - if use debug ; then - enable_option FT_DEBUG_LEVEL_TRACE - enable_option FT_DEBUG_MEMORY - fi - - if use utils ; then - cd "${WORKDIR}/ft2demos-${PV}" || die - # Disable tests needing X11 when USE="-X". (bug #177597) - if ! use X ; then - sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die - fi - cd "${S}" || die - fi - - # bug #869803 - rm docs/reference/sitemap.xml.gz || die - - # We need non-/bin/sh to run configure - if [[ -n ${CONFIG_SHELL} ]] ; then - sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \ - "${S}"/builds/unix/configure || die - fi - - elibtoolize --patch-only -} - -multilib_src_configure() { - export GNUMAKE=gmake - - local myeconfargs=( - --disable-freetype-config - --enable-shared - --with-zlib - $(use_with brotli) - $(use_with bzip2) - # As of 2.14.0, FT bundles its own copies of the needed headers and dlopen()s - # harfbuzz instead, which breaks an insidious circular dependency. - $(use_with harfbuzz harfbuzz dynamic) - $(use_with png) - $(use_enable static-libs static) - $(usex utils $(use_with svg librsvg) --without-librsvg) - - # Avoid using libpng-config - LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" - LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" - ) - - case ${CHOST} in - mingw*|*-mingw*) ;; - # Workaround windows misdetection: bug #654712 - # Have to do it for both ${CHOST}-windres and windres - *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;; - esac - - export CC_BUILD="$(tc-getBUILD_CC)" - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use utils ; then - einfo "Building utils" - # Fix for Prefix, bug #339334 - emake \ - X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ - FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use utils ; then - einfo "Installing utils" - emake DESTDIR="${D}" FT2DEMOS=1 \ - TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install - fi -} - -multilib_src_install_all() { - if use fontforge ; then - # fontforge can probably cope with fewer of these, but this is simpler - einfo "Installing internal headers required for fontforge" - local header - find src/truetype include/freetype/internal -name '*.h' | \ - while read header ; do - mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - done - fi - - dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO} - if [[ ${PV} != 9999 ]] && use doc ; then - docinto html - dodoc -r docs/* - fi - - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/media-libs/freetype/freetype-2.14.0.ebuild b/media-libs/freetype/freetype-2.14.0.ebuild deleted file mode 100644 index a672b264d3ff..000000000000 --- a/media-libs/freetype/freetype-2.14.0.ebuild +++ /dev/null @@ -1,257 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools libtool multilib-minimal toolchain-funcs - -DESCRIPTION="High-quality and portable font engine" -HOMEPAGE="https://www.freetype.org/"; - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 -else - SRC_URI=" - https://downloads.sourceforge.net/freetype/${P/_/}.tar.xz - mirror://nongnu/freetype/${P/_/}.tar.xz - utils? ( - https://downloads.sourceforge.net/freetype/ft2demos-${PV}.tar.xz - mirror://nongnu/freetype/ft2demos-${PV}.tar.xz - ) - doc? ( - https://downloads.sourceforge.net/freetype/${PN}-doc-${PV}.tar.xz - mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz - ) - " - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi - -LICENSE="|| ( FTL GPL-2+ )" -SLOT="2" -IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug doc fontforge harfbuzz +png static-libs svg utils" - -RDEPEND=" - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - brotli? ( app-arch/brotli[${MULTILIB_USEDEP}] ) - bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) - png? ( >=media-libs/libpng-1.2.51:=[${MULTILIB_USEDEP}] ) - utils? ( - svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] ) - X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] ) - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig -" -PDEPEND="harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] )" - -PATCHES=( - "${FILESDIR}"/${P}-harfbuzz-call.patch - "${FILESDIR}"/${P}-tt-hint.patch -) - -_egit_repo_handler() { - if [[ ${PV} == 9999 ]] ; then - local phase="${1}" - case ${phase} in - fetch|unpack) - :; - ;; - *) - die "Please use this function with either \"fetch\" or \"unpack\"" - ;; - esac - - local EGIT_REPO_URI - EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype.git"; - git-r3_src_${phase} - if use utils ; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/freetype/freetype-demos.git"; - local EGIT_CHECKOUT_DIR="${WORKDIR}/ft2demos-${PV}" - git-r3_src_${phase} - fi - else - default - fi -} - -pkg_pretend() { - if use svg && ! use utils ; then - einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled." - fi -} - -src_unpack() { - _egit_repo_handler ${EBUILD_PHASE} - - if [[ ${PV} == 9999 ]] ; then - # Need to copy stuff from dlg subproject (bug #758902) - local dlg_inc_dir="${S}/subprojects/dlg/include/dlg" - local dlg_src_dir="${S}/subprojects/dlg/src/dlg" - local dlg_dest_dir="${S}/include" - mkdir -p "${dlg_dest_dir}/dlg" || die - cp "${dlg_inc_dir}"/{dlg,output}.h "${dlg_dest_dir}/dlg" || die - cp "${dlg_src_dir}"/* "${dlg_dest_dir}" || die - fi -} - -src_prepare() { - if [[ ${PV} == 9999 ]] ; then - # Do NOT automagically mess with submodules! - sed '/setup: copy_submodule/d' -i builds/toplevel.mk || die - - # Inspired by shipped autogen.sh script - eval $(sed -n \ - -e 's/^#define *\(FREETYPE_MAJOR\) *\([0-9][0-9]*\).*/\1=\2/p' \ - -e 's/^#define *\(FREETYPE_MINOR\) *\([0-9][0-9]*\).*/\1=\2/p' \ - -e 's/^#define *\(FREETYPE_PATCH\) *\([0-9][0-9]*\).*/\1=\2/p' \ - include/freetype/freetype.h || die) - FREETYPE="${FREETYPE_MAJOR}.${FREETYPE_MINOR}" - [[ "${FREETYPE_PATCH}" != 0 ]] && FREETYPE+=".${FREETYPE_PATCH}" - - pushd builds/unix &>/dev/null || die - sed -e "s;@VERSION@;${FREETYPE};" \ - < configure.raw > configure.ac || die - unset FREETYPE_MAJOR FREETYPE_MINOR FREETYPE_PATCH FREETYPE - popd &>/dev/null || die - fi - - default - - pushd builds/unix &>/dev/null || die - # eautoheader produces broken ftconfig.in - AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf - popd &>/dev/null || die - - # This is the same as the 01 patch from infinality - sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die - - enable_option() { - sed -i -e "/#define $1/ { s:/\* ::; s: \*/:: }" \ - include/${PN}/config/ftoption.h \ - || die "unable to enable option $1" - } - - disable_option() { - sed -i -e "/#define $1/ { s:^:/* :; s:$: */: }" \ - include/${PN}/config/ftoption.h \ - || die "unable to disable option $1" - } - - if ! use cleartype-hinting ; then - disable_option TT_CONFIG_OPTION_SUBPIXEL_HINTING - fi - - # Can be disabled with FREETYPE_PROPERTIES="pcf:no-long-family-names=1" - # via environment (new since v2.8) - enable_option PCF_CONFIG_OPTION_LONG_FAMILY_NAMES - - # See https://freetype.org/patents.html (expired!) - enable_option FT_CONFIG_OPTION_SUBPIXEL_RENDERING - - if ! use adobe-cff ; then - enable_option CFF_CONFIG_OPTION_OLD_ENGINE - fi - - if use debug ; then - enable_option FT_DEBUG_LEVEL_TRACE - enable_option FT_DEBUG_MEMORY - fi - - if use utils ; then - cd "${WORKDIR}/ft2demos-${PV}" || die - # Disable tests needing X11 when USE="-X". (bug #177597) - if ! use X ; then - sed -i -e "/EXES\ +=\ ftdiff/ s:^:#:" Makefile || die - fi - cd "${S}" || die - fi - - # bug #869803 - rm docs/reference/sitemap.xml.gz || die - - # We need non-/bin/sh to run configure - if [[ -n ${CONFIG_SHELL} ]] ; then - sed -i -e "1s:^#![[:space:]]*/bin/sh:#!${CONFIG_SHELL}:" \ - "${S}"/builds/unix/configure || die - fi - - elibtoolize --patch-only -} - -multilib_src_configure() { - export GNUMAKE=gmake - - local myeconfargs=( - --disable-freetype-config - --enable-shared - --with-zlib - $(use_with brotli) - $(use_with bzip2) - # As of 2.14.0, FT bundles its own copies of the needed headers and dlopen()s - # harfbuzz instead, which breaks an insidious circular dependency. - $(use_with harfbuzz harfbuzz dynamic) - $(use_with png) - $(use_enable static-libs static) - $(usex utils $(use_with svg librsvg) --without-librsvg) - - # Avoid using libpng-config - LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)" - LIBPNG_LDFLAGS="$($(tc-getPKG_CONFIG) --libs libpng)" - ) - - case ${CHOST} in - mingw*|*-mingw*) ;; - # Workaround windows misdetection: bug #654712 - # Have to do it for both ${CHOST}-windres and windres - *) myeconfargs+=( ac_cv_prog_RC= ac_cv_prog_ac_ct_RC= ) ;; - esac - - export CC_BUILD="$(tc-getBUILD_CC)" - - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use utils ; then - einfo "Building utils" - # Fix for Prefix, bug #339334 - emake \ - X11_PATH="${EPREFIX}/usr/$(get_libdir)" \ - FT2DEMOS=1 TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" - fi -} - -multilib_src_install() { - default - - if multilib_is_native_abi && use utils ; then - einfo "Installing utils" - emake DESTDIR="${D}" FT2DEMOS=1 \ - TOP_DIR_2="${WORKDIR}/ft2demos-${PV}" install - fi -} - -multilib_src_install_all() { - if use fontforge ; then - # fontforge can probably cope with fewer of these, but this is simpler - einfo "Installing internal headers required for fontforge" - local header - find src/truetype include/freetype/internal -name '*.h' | \ - while read header ; do - mkdir -p "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - cp ${header} "${ED}/usr/include/freetype2/internal4fontforge/$(dirname ${header})" || die - done - fi - - dodoc docs/{CHANGES,CUSTOMIZE,DEBUG,INSTALL.UNIX,*.txt,PROBLEMS,TODO} - if [[ ${PV} != 9999 ]] && use doc ; then - docinto html - dodoc -r docs/* - fi - - find "${ED}" -type f -name '*.la' -delete || die -}
