[fontconfig] Update to 2.17.1 (#48484)

Co-authored-by: Schaich, Alonso <[email protected]>

Author: dg0yt

ports/fontconfig/dllexport.diff

@@ -0,0 +1,45 @@
+diff --git a/fontconfig/fontconfig.h.in b/fontconfig/fontconfig.h.in
+index e8944f9..a76230b 100644
+--- a/fontconfig/fontconfig.h.in
++++ b/fontconfig/fontconfig.h.in
+@@ -39,7 +39,7 @@
+ #endif
+ 
+ #ifndef FcPublic
+-#  define FcPublic
++#  define FcPublic @DEFAULT_FCPUBLIC@
+ #endif
+ 
+ typedef unsigned char  FcChar8;
+diff --git a/fontconfig/meson.build b/fontconfig/meson.build
+index 1ad1e58..1d9ac14 100644
+--- a/fontconfig/meson.build
++++ b/fontconfig/meson.build
+@@ -1,5 +1,14 @@
+ fontconfig_h_conf = configuration_data()
+ fontconfig_h_conf.set('CACHE_VERSION', cacheversion)
++default_FcPublic = ''
++if get_option('default_library') != 'static'
++    if host_machine.system() == 'windows'
++        default_FcPublic = '__declspec(dllimport)'
++    else
++        default_FcPublic = '__attribute__((visibility(\"default\")))'
++    endif
++endif
++fontconfig_h_conf.set('DEFAULT_FCPUBLIC', default_FcPublic)
+ fontconfig_h = configure_file(output: 'fontconfig.h',
+                               input: 'fontconfig.h.in',
+                               configuration: fontconfig_h_conf)
+diff --git a/src/meson.build b/src/meson.build
+index bf5a781..c892a34 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -1,7 +1,7 @@
+ 
+ win_export_args = []
+ # Define FcPublic appropriately for exports on windows
+-if host_machine.system() == 'windows'
++if host_machine.system() == 'windows' and get_option('default_library') != 'static'
+   win_export_args += '-DFcPublic=__declspec(dllexport)'
+   win_export_args += '-DDLL_EXPORT'
+ endif

ports/fontconfig/emscripten.diff

@@ -1,119 +1,96 @@
-diff --git a/fc-cache/meson.build b/fc-cache/meson.build
-index 5e40fac..3c3e46b 100644
 --- a/fc-cache/meson.build
 +++ b/fc-cache/meson.build
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,6 @@
  fccache = executable('fc-cache', ['fc-cache.c', fcstdint_h, alias_headers, ft_alias_headers],
    include_directories: [incbase, incsrc],
+-  dependencies: [libintl_dep],
++  dependencies: [getopt_dep, libintl_dep],
    link_with: [libfontconfig],
-+  dependencies: [getopt_dep],
    c_args: c_args,
    install: true,
- )
-diff --git a/fc-cat/meson.build b/fc-cat/meson.build
-index f26e4b8..476c0f9 100644
 --- a/fc-cat/meson.build
 +++ b/fc-cat/meson.build
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,6 @@
  fccat = executable('fc-cat', ['fc-cat.c', fcstdint_h, alias_headers, ft_alias_headers],
    include_directories: [incbase, incsrc],
+-  dependencies: [libintl_dep],
++  dependencies: [getopt_dep, libintl_dep],
    link_with: [libfontconfig],
-+  dependencies: [getopt_dep],
    c_args: c_args,
    install: true,
- )
-diff --git a/fc-conflist/meson.build b/fc-conflist/meson.build
-index f543cf9..f06640b 100644
 --- a/fc-conflist/meson.build
 +++ b/fc-conflist/meson.build
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,6 @@
  fcconflist = executable('fc-conflist', ['fc-conflist.c', fcstdint_h, alias_headers, ft_alias_headers],
    include_directories: [incbase, incsrc],
+-  dependencies: [libintl_dep],
++  dependencies: [getopt_dep, libintl_dep],
    link_with: [libfontconfig],
-+  dependencies: [getopt_dep],
    c_args: c_args,
    install: true,
- )
-diff --git a/fc-list/meson.build b/fc-list/meson.build
-index 2f679d5..4b0fb62 100644
 --- a/fc-list/meson.build
 +++ b/fc-list/meson.build
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,6 @@
  fclist = executable('fc-list', ['fc-list.c', fcstdint_h, alias_headers, ft_alias_headers],
    include_directories: [incbase, incsrc],
+-  dependencies: [libintl_dep],
++  dependencies: [getopt_dep, libintl_dep],
    link_with: [libfontconfig],
-+  dependencies: [getopt_dep],
    c_args: c_args,
    install: true,
- )
-diff --git a/fc-match/meson.build b/fc-match/meson.build
-index aca8bc8..cab4f09 100644
 --- a/fc-match/meson.build
 +++ b/fc-match/meson.build
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,6 @@
  fcmatch = executable('fc-match', ['fc-match.c', fcstdint_h, alias_headers, ft_alias_headers],
    include_directories: [incbase, incsrc],
+-  dependencies: [libintl_dep],
++  dependencies: [getopt_dep, libintl_dep],
    link_with: [libfontconfig],
-+  dependencies: [getopt_dep],
    c_args: c_args,
    install: true,
- )
-diff --git a/fc-pattern/meson.build b/fc-pattern/meson.build
-index 07de245..b957c67 100644
 --- a/fc-pattern/meson.build
 +++ b/fc-pattern/meson.build
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,6 @@
  fcpattern = executable('fc-pattern', ['fc-pattern.c', fcstdint_h, alias_headers, ft_alias_headers],
    include_directories: [incbase, incsrc],
+-  dependencies: [libintl_dep],
++  dependencies: [getopt_dep, libintl_dep],
    link_with: [libfontconfig],
-+  dependencies: [getopt_dep],
    c_args: c_args,
    install: true,
- )
-diff --git a/fc-query/meson.build b/fc-query/meson.build
-index d0f2dd4..940b021 100644
 --- a/fc-query/meson.build
 +++ b/fc-query/meson.build
-@@ -1,7 +1,7 @@
+@@ -1,6 +1,6 @@
  fcquery = executable('fc-query', ['fc-query.c', fcstdint_h, alias_headers, ft_alias_headers],
    include_directories: [incbase, incsrc],
+-  dependencies: [freetype_dep, libintl_dep],
++  dependencies: [freetype_dep, getopt_dep, libintl_dep],
    link_with: [libfontconfig],
--  dependencies: [freetype_dep],
-+  dependencies: [freetype_dep, getopt_dep],
    c_args: c_args,
    install: true,
- )
-diff --git a/fc-scan/meson.build b/fc-scan/meson.build
-index 4de2134..c5b2b67 100644
 --- a/fc-scan/meson.build
 +++ b/fc-scan/meson.build
-@@ -1,7 +1,7 @@
+@@ -1,6 +1,6 @@
  fcscan = executable('fc-scan', ['fc-scan.c', fcstdint_h, alias_headers, ft_alias_headers],
    include_directories: [incbase, incsrc],
+-  dependencies: [freetype_dep, libintl_dep],
++  dependencies: [freetype_dep, getopt_dep, libintl_dep],
    link_with: [libfontconfig],
--  dependencies: [freetype_dep],
-+  dependencies: [freetype_dep, getopt_dep],
    c_args: c_args,
    install: true,
- )
-diff --git a/fc-validate/meson.build b/fc-validate/meson.build
-index e2b956e..8902d59 100644
 --- a/fc-validate/meson.build
 +++ b/fc-validate/meson.build
-@@ -1,7 +1,7 @@
+@@ -1,6 +1,6 @@
  fcvalidate = executable('fc-validate', ['fc-validate.c', fcstdint_h, alias_headers, ft_alias_headers],
    include_directories: [incbase, incsrc],
+-  dependencies: [freetype_dep, libintl_dep],
++  dependencies: [freetype_dep, getopt_dep, libintl_dep],
    link_with: [libfontconfig],
--  dependencies: [freetype_dep],
-+  dependencies: [freetype_dep, getopt_dep],
    c_args: c_args,
    install: true,
- )
-diff --git a/meson.build b/meson.build
-index f616600..6d82a16 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -202,6 +202,14 @@ if cc.links(files('meson-cc-tests/solaris-atomic-operations.c'), name: 'Solaris
+@@ -319,6 +319,14 @@ if cc.links(files('meson-cc-tests/solaris-atomic-operations.c'), name: 'Solaris
    conf.set('HAVE_SOLARIS_ATOMIC_OPS', 1)
  endif
 
@@ -126,5 +103,5 @@ index f616600..6d82a16 100644
 +endif
 +
 
- # Check iconv support
- iconv_dep = []
+ prefix = get_option('prefix')
+ 

ports/fontconfig/libgetopt.patch

@@ -0,0 +1,21 @@
+diff --git a/meson.build b/meson.build
+index e742ea6..1d795d1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -200,10 +200,16 @@ gettext_args = [ '--msgid-bugs-address=@0@'.format(conf.get('PACKAGE_BUGREPORT')
+ 
+ # Check for libintl.h
+ opt_nls = get_option('nls')
++libintl_dep = dependency('', required: false)
++if opt_nls.allowed()
+ libintl_dep = dependency('intl', required: opt_nls, fallback: ['libintl', 'libintl_dep'])
++endif
+ if libintl_dep.found()
+   conf.set('ENABLE_NLS', opt_nls.allowed().to_int())
+   deps += [libintl_dep]
++  if host_machine.system() == 'darwin'
++    deps += [dependency('CoreFoundation', method: 'extraframework')]
++  endif
+ else
+   opt_nls = opt_nls.require(false)
+ endif

ports/fontconfig/libintl.diff

@@ -3,16 +3,22 @@ vcpkg_from_gitlab(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO fontconfig/fontconfig
     REF ${VERSION}
-    SHA512 daa6d1e6058e12c694d9e1512e09be957ff7f3fa375246b9d13eb0a8cf2f21e1512a5cabe93f270e96790e2c20420bf7422d213e43ab9749da3255286ea65a7c
+    SHA512 8e05cad63cd0c5ca15d1359e19a605912198fcc0ec6ecc11d5a0ef596d72e795cd8128e4d350716e63cbc01612c3807b1455b8153901333790316170c9ef8e75
     HEAD_REF master
     PATCHES
-        emscripten.diff
+        dllexport.diff
         no-etc-symlinks.patch
         libgetopt.patch
+        libintl.diff
         fix-wasm-shared-memory-atomics.patch
 )
 
 set(options "")
+if("iconv" IN_LIST FEATURES)
+    list(APPEND options "-Diconv=enabled")
+else()
+    list(APPEND options "-Diconv=disabled")
+endif()
 if("nls" IN_LIST FEATURES)
     list(APPEND options "-Dnls=enabled")
 else()
@@ -30,7 +36,7 @@ vcpkg_configure_meson(
         ${options}
         -Ddoc=disabled
         -Dcache-build=disabled
-        -Diconv=enabled
+        -Dxml-backend=expat
         -Dtests=disabled
     ADDITIONAL_BINARIES
         "gperf = ['${CURRENT_HOST_INSTALLED_DIR}/tools/gperf/gperf${VCPKG_HOST_EXECUTABLE_SUFFIX}']"
@@ -43,13 +49,11 @@ set(replacement "")
 if(VCPKG_TARGET_IS_WINDOWS)
     set(replacement "**invalid-fontconfig-dir-do-not-use**")
 endif()
-set(configfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.h")
+set(configfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/meson-config.h")
 vcpkg_replace_string("${configfile}" "${CURRENT_PACKAGES_DIR}" "${replacement}")
-vcpkg_replace_string("${configfile}" "#define FC_TEMPLATEDIR \"/share/fontconfig/conf.avail\"" "#define FC_TEMPLATEDIR \"/usr/share/fontconfig/conf.avail\"" IGNORE_UNCHANGED)
 if(NOT VCPKG_BUILD_TYPE)
-    set(configfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/config.h")
-    vcpkg_replace_string("${configfile}" "${CURRENT_PACKAGES_DIR}/debug" "${replacement}")
-    vcpkg_replace_string("${configfile}" "#define FC_TEMPLATEDIR \"/share/fontconfig/conf.avail\"" "#define FC_TEMPLATEDIR \"/usr/share/fontconfig/conf.avail\"" IGNORE_UNCHANGED)
+    set(configfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/meson-config.h")
+    vcpkg_replace_string("${configfile}" "${CURRENT_PACKAGES_DIR}" "${replacement}")
 endif()
 
 vcpkg_install_meson(ADD_BIN_TO_PATH)
@@ -65,12 +69,10 @@ endif()
 vcpkg_fixup_pkgconfig()
 
 # Fix paths in debug pc file.
-set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontconfig.pc")
-if(EXISTS "${_file}")
-    file(READ "${_file}" _contents)
-    string(REPLACE "/etc" "/../etc" _contents "${_contents}")
-    string(REPLACE "/var" "/../var" _contents "${_contents}")
-    file(WRITE "${_file}" "${_contents}")
+if(NOT VCPKG_BUILD_TYPE)
+    set(fontconfig_pc_debug "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontconfig.pc")
+    vcpkg_replace_string("${fontconfig_pc_debug}" "/etc" "/../etc" REGEX)
+    vcpkg_replace_string("${fontconfig_pc_debug}" "/var" "/../var" REGEX)
 endif()
 
 # Make path to cache in fonts.conf relative
@@ -81,21 +83,8 @@ endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/var"
                     "${CURRENT_PACKAGES_DIR}/debug/share"
-                    "${CURRENT_PACKAGES_DIR}/debug/etc")
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    if(VCPKG_TARGET_IS_WINDOWS)
-        set(DEFINE_FC_PUBLIC "#define FcPublic __declspec(dllimport)")
-    else()
-        set(DEFINE_FC_PUBLIC "#define FcPublic __attribute__((visibility(\"default\")))")
-    endif()
-    foreach(HEADER IN ITEMS fcfreetype.h fontconfig.h)
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER}"
-            "#define FcPublic"
-            "${DEFINE_FC_PUBLIC}"
-        )
-    endforeach()
-endif()
+                    "${CURRENT_PACKAGES_DIR}/debug/etc"
+                    "${CURRENT_PACKAGES_DIR}/var")
 
 if("tools" IN_LIST FEATURES)
     vcpkg_copy_tools(