fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 src/fcfreetype.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit dbc920f262f40d61dfd4e95a7a18cbacd5a974ab
Merge: f71f39e 5514509
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Jun 19 02:15:58 2025 +0000

    Merge branch 'removeUnusedlabel' into 'main'
    
    Make "retry:" label conditional
    
    See merge request fontconfig/fontconfig!433

commit 5514509b183ca8198f4a8d40f6c7a48012ada004
Author: Dominik Röttsches <drott at chromium.org>
Date:   Tue Jun 17 12:17:24 2025 +0300

    Make "retry:" label conditional on ICONV
    
    Label is only used from ICONV code after revision e29d5a7ab2f98.

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 010ec2a..394bc27 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -695,7 +695,9 @@ FcSfntNameTranscode (FT_SfntName *sname)
 	return 0;
     fromcode = fcFtEncoding[i].fromcode;
 
+#if USE_ICONV
 retry:
+#endif
     /*
      * Many names encoded for TT_PLATFORM_MACINTOSH are broken
      * in various ways. Kludge around them.