From a76eb002a71b6cf7bad343f5e3376dfe6bb83c5c Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Thu, 24 Mar 2022 21:03:32 +0000 Subject: [PATCH] [fontconfig] Do not create symlinks (microsoft#23735) (#23736) * [fontconfig] Do not create symlinks (microsoft#23735) * [fontconfig] Add a license identifier * Regenerate versions file --- ports/fontconfig/no-etc-symlinks.patch | 19 +++++++++++++++++++ ports/fontconfig/portfile.cmake | 2 ++ ports/fontconfig/vcpkg.json | 3 ++- versions/baseline.json | 2 +- versions/f-/fontconfig.json | 5 +++++ 5 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 ports/fontconfig/no-etc-symlinks.patch diff --git a/ports/fontconfig/no-etc-symlinks.patch b/ports/fontconfig/no-etc-symlinks.patch new file mode 100644 index 00000000000000..275797d6583fd6 --- /dev/null +++ b/ports/fontconfig/no-etc-symlinks.patch @@ -0,0 +1,19 @@ +--- a/conf.d/link_confs.py 2022-03-24 04:13:59.000982000 +0900 ++++ b/conf.d/link_confs.py 2022-03-24 04:14:46.271964000 +0900 +@@ -4,6 +4,7 @@ + import sys + import argparse + import platform ++import shutil + + if __name__=='__main__': + parser = argparse.ArgumentParser() +@@ -32,7 +33,7 @@ + except FileNotFoundError: + pass + try: +- os.symlink(src, dst) ++ shutil.copyfile(src, dst) + except NotImplementedError: + # Not supported on this version of Windows + break diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index 887846569ac269..55c0238fd80c00 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -7,6 +7,8 @@ vcpkg_from_gitlab( REF ${FONTCONFIG_VERSION} SHA512 815f999146970c7f0e6c15a21f218d4b3f75b26d4ef14d36711bc0a1de19e59cc62d6a2c53993dd38b963ae30820c4db29f103380d5001886d55b6a7df361154 HEAD_REF master + PATCHES + no-etc-symlinks.patch ) vcpkg_find_acquire_program(GPERF) diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json index 9d260f08db1052..fd4487d6f6eb19 100644 --- a/ports/fontconfig/vcpkg.json +++ b/ports/fontconfig/vcpkg.json @@ -1,9 +1,10 @@ { "name": "fontconfig", "version": "2.13.94", - "port-version": 5, + "port-version": 6, "description": "Library for configuring and customizing font access.", "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig", + "license": "MIT", "dependencies": [ "dirent", "expat", diff --git a/versions/baseline.json b/versions/baseline.json index 6cb226cef3780e..830818f52a56c4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2262,7 +2262,7 @@ }, "fontconfig": { "baseline": "2.13.94", - "port-version": 5 + "port-version": 6 }, "foonathan-memory": { "baseline": "2019-07-21", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index c5d5a8d137b37b..a5d90d2537ac87 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8f782f79dc3a2c6834a7e5de4a941b11822067dd", + "version": "2.13.94", + "port-version": 6 + }, { "git-tree": "2f32046747209c234e60dc297b48d5bdc7ee4494", "version": "2.13.94",