commit: ff8e708df8d00a0d01024d2cb910f7ee7eca0857 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Sep 10 23:35:23 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Sep 10 23:35:42 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff8e708d
media-libs/freetype: update pillow patch Followup to 6bc8eb2b36c7056bbc7f259878899c819b6a4259. Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/freetype-2.14.0-pillow-tests.patch | 78 +++++++++++++++++++--- ...-2.14.0-r1.ebuild => freetype-2.14.0-r2.ebuild} | 0 2 files changed, 67 insertions(+), 11 deletions(-) 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 index 387f48009cf7..1ac20f302ff1 100644 --- a/media-libs/freetype/files/freetype-2.14.0-pillow-tests.patch +++ b/media-libs/freetype/files/freetype-2.14.0-pillow-tests.patch @@ -1,14 +1,70 @@ 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 -@@ -310,7 +310,10 @@ - if ( error != -1 ) - { - if ( error == -2 ) /* -2 means is_variable. */ -+ { -+ error = FT_Err_Ok; - face->face_flags |= FT_FACE_FLAG_VARIATION; -+ } - else - face->face_flags &= ~FT_FACE_FLAG_VARIATION; - } +@@ -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/freetype-2.14.0-r1.ebuild b/media-libs/freetype/freetype-2.14.0-r2.ebuild similarity index 100% rename from media-libs/freetype/freetype-2.14.0-r1.ebuild rename to media-libs/freetype/freetype-2.14.0-r2.ebuild
