fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 fc-fontations/meson.build |    2 +-
 fc-fontations/mod.rs      |    4 ++--
 src/fcfreetype.c          |    2 +-
 src/fcint.h               |    2 +-
 src/fclang.c              |    4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c527fe1452d469e5fa1a211180dd40bcdb79fb2a
Merge: 3ba3b27 27931f2
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Jun 19 07:13:48 2025 +0000

    Merge branch 'renameLangSet' into 'main'
    
    Rename FcFreeTypeLangSet to FcLangSetFromCharSet
    
    See merge request fontconfig/fontconfig!435

commit 27931f27c380f013899975e079179080ec8f7832
Author: Dominik Röttsches <drott at chromium.org>
Date:   Wed Jun 18 13:42:01 2025 +0300

    Rename FcFreeTypeLangSet to FcLangSetFromCharset
    
    There is no FreeType specific behavior in generating an FcLangSet from
    an FcCharset. Change name to reflect that. This will help make it
    clearer that this part of the code can be built without FreeType.

diff --git a/fc-fontations/meson.build b/fc-fontations/meson.build
index 0865199..54d06a8 100644
--- a/fc-fontations/meson.build
+++ b/fc-fontations/meson.build
@@ -23,7 +23,7 @@ if (fontations.enabled())
     include_directories: incbase,
     args: [
       '--merge-extern-blocks',
-      '--allowlist-item=(FcPattern.*|FcRange.*|FC_.*_OBJECT|FcCharSet.*|FcFreeTypeLangSet)',
+      '--allowlist-item=(FcPattern.*|FcRange.*|FC_.*_OBJECT|FcCharSet.*|FcLangSetFromCharSet)',
       '--blocklist-type=(FcCharSet|FcLangSet)',
       '--raw-line=#![allow(nonstandard_style,unused)]',
       '--raw-line=extern crate fontconfig_bindings;',
diff --git a/fc-fontations/mod.rs b/fc-fontations/mod.rs
index e55fcd0..cd7f672 100644
--- a/fc-fontations/mod.rs
+++ b/fc-fontations/mod.rs
@@ -43,7 +43,7 @@ use names::add_names;
 use fontconfig_bindings::{FcFontSet, FcFontSetAdd, FcPattern};
 
 use fcint_bindings::{
-    FcFreeTypeLangSet, FC_CAPABILITY_OBJECT, FC_CHARSET_OBJECT, FC_COLOR_OBJECT, FC_FILE_OBJECT,
+    FcLangSetFromCharSet, FC_CAPABILITY_OBJECT, FC_CHARSET_OBJECT, FC_COLOR_OBJECT, FC_FILE_OBJECT,
     FC_FONTFORMAT_OBJECT, FC_FONTVERSION_OBJECT, FC_FONT_HAS_HINT_OBJECT, FC_FONT_WRAPPER_OBJECT,
     FC_FOUNDRY_OBJECT, FC_LANG_OBJECT, FC_ORDER_OBJECT, FC_OUTLINE_OBJECT, FC_SCALABLE_OBJECT,
     FC_SYMBOL_OBJECT,
@@ -242,7 +242,7 @@ fn build_patterns_for_font(
 
         unsafe {
             let langset =
-                FcLangSetWrapper::from_raw(FcFreeTypeLangSet(charset.as_ptr(), exclusive_lang)
+                FcLangSetWrapper::from_raw(FcLangSetFromCharSet(charset.as_ptr(), exclusive_lang)
                     as *mut fontconfig_bindings::_FcLangSet);
 
             pattern.append_element(PatternElement::new(
diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 394bc27..7a4d981 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -1994,7 +1994,7 @@ FcFreeTypeQueryFaceInternal (const FT_Face   face,
 	if (ls_share && *ls_share)
 	    ls = FcLangSetCopy (*ls_share);
 	else {
-	    ls = FcFreeTypeLangSet (cs, exclusiveLang);
+	    ls = FcLangSetFromCharSet (cs, exclusiveLang);
 	    if (ls_share)
 		*ls_share = FcLangSetCopy (ls);
 	}
diff --git a/src/fcint.h b/src/fcint.h
index 195f558..08ebc71 100644
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -1078,7 +1078,7 @@ struct _FcLangSet {
 };
 
 FcPrivate FcLangSet *
-FcFreeTypeLangSet (const FcCharSet *charset,
+FcLangSetFromCharSet (const FcCharSet *charset,
                    const FcChar8   *exclusiveLang);
 
 FcPrivate FcLangResult
diff --git a/src/fclang.c b/src/fclang.c
index 28038d2..0c23418 100644
--- a/src/fclang.c
+++ b/src/fclang.c
@@ -91,8 +91,8 @@ FcLangSetBitReset (FcLangSet   *ls,
 }
 
 FcLangSet *
-FcFreeTypeLangSet (const FcCharSet *charset,
-                   const FcChar8   *exclusiveLang)
+FcLangSetFromCharSet (const FcCharSet *charset,
+                      const FcChar8   *exclusiveLang)
 {
     int              i, j;
     FcChar32         missing;