gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

media-libs/freetype: update pillow patch

Browse Source 
Followup to 6bc8eb2b36.

Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2025-09-11 00:35:23 +01:00
parent 8ac72f57bb
commit ff8e708df8
2 changed files with 67 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
media-libs/freetype/files/freetype-2.14.0-pillow-tests.patch
View File

@@ -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 <behdad@behdad.org>
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

0
media-libs/freetype/freetype-2.14.0-r1.ebuild → media-libs/freetype/freetype-2.14.0-r2.ebuild
View File