mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 13:01:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[fontconfig] update to 2.14.0 (#23922)

Browse Source 
* [fontconfig] update to 2.14.0 (microsoft#23920)

2.14

Alan Coopersmith (1):
      Update address for reporting msgid bugs from bugzilla to gitlab

2.13.96 (2.14 RC6)

Akira TAGOH (2):
      Add a missing file 48-spacing.conf
      Merge branch 'main' of ssh://gitlab.freedesktop.org/fontconfig/fontconfig

2.13.95 (2.14 RC5)

Akira TAGOH (18):
      Do not set different score to non-string values
      Enable 11-lcdfilter-default.conf by default
      Bump the cache version to 8
      Reflect matching results to binding in FcPattern
      Fix a memory leak when trying to open a non-existing file
      Fix score estimation for postscriptname
      Resolves symlinks against <dir prefix="relative">
      Add the option to not build fontconfig cache during installation
      conf.d/60-latin.conf: Make Noto default.
      Fix some testcase fails for 14c265a1
      Fix the issue fail to obtain the style name
      Apply the change made by 23e46d1 again
      Initialize variable
      Add more description for fc-conflist.1 and FcConfigFileInfoIterInit.3
      Update CaseFolding.txt to Unicode 14
      Add an user font directory for Win32 to the default font path
      Add test/wrapper-script.sh to the archive
      Fix possible memory leaks in FcPatternObjectAddWithBinding

Alex Richardson (3):
      fcint: add casts to allow building with stricter compilers
      Add support for C11 stdatomic atomics
      FcCharSetPutLeaf(): Fix missing move of new_leaves contents

Behdad Esfahbod (1):
      If a varfont has 'opsz' axis, set FC_SIZE on default instant pattern

Ben Wagner (6):
      Add memory order constraints to C11 atomics
      Free local FcCache lock on contention
      Extend test thread args lifetime
      Fix warning about os2->achVendID cannot be NULL
      Back FcSerialize with open addressing hash table.
      Actually skip leading spaces in style name

Francesco Pretto (1):
      WIN32: Fix pGetSystemWindowsDirectory found initialized during FcConfigParseAndLoadFromMemory

Mehdi Sabwat (1):
      fcstat: add support for wasm-emscripten

Nirbheek Chauhan (1):
      meson: Remove summary() from version_compare() block

Pierre Ducroquet (5):
      Add a configuration to switch to monospace if spacing=100 is requested
      Reference the new configuration file
      Remove configuration file from POTFILES
      It seems this qual doesn't work on integers
      Always add the family name from spacing=100

Ryan Gonzalez (1):
      Ensure config.h is always included before stdlib headers

Ryan Schmidt (5):
      Avoid PCRE syntax when using grep
      Remove Bugzilla references
      Fix run-test.sh to work with BSD mktemp
      Restore fcatomic compatibility with Mac OS X 10.4.
      Fix FC_DEFAULT_FONTS on macOS and with BSD sed																								      sed

* [fontconfig] do not run fc-cache (microsoft#23920)

The fc-cache application is run on installation per default.

Font caches of the build system are useless to anyone unless
deploying fontconfig on just that build system, and even then,
the user will most likely be deploying his own fonts.conf and
correspondinly explicitly setup his users fc-cache path.

In fact, all the fc-cache run does is to generate data for
us to delete.

Instruct meson not to run fc-cache, saving us the need to
delete the cache, too.

* [fontconfig] disable tests (microsoft#23920)

* [fontconfig] remove json-c dependency (microsoft#23920)

The only code that needs json-c is in the tests ... which are
disabled from being built.

* [fontconfig] update versions registry (microsoft#23920)

* [fontconfig] do not run fc-cache on linux either (microsoft#23920)

* [fontconfig] regenerate version registries (microsoft#23920)
This commit is contained in:
Alonso Schaich 2022-04-05 17:53:08 +00:00 committed by GitHub
parent 01d6f6ff1e
commit ab76042ca5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ports/fontconfig/portfile.cmake
View File

@ -1,11 +1,11 @@
set(FONTCONFIG_VERSION 2.13.94)
set(FONTCONFIG_VERSION 2.14.0)
vcpkg_from_gitlab(
GITLAB_URL https://gitlab.freedesktop.org
OUT_SOURCE_PATH SOURCE_PATH
REPO fontconfig/fontconfig
REF ${FONTCONFIG_VERSION}
SHA512 815f999146970c7f0e6c15a21f218d4b3f75b26d4ef14d36711bc0a1de19e59cc62d6a2c53993dd38b963ae30820c4db29f103380d5001886d55b6a7df361154
SHA512 0f36fa503c0277750ff253534f9305c9b4c86fd0d88a470e3b666080951714c51f13a69eecab382d0a7883a07494fc71730213e6086194a92aa5dfc075789e85
HEAD_REF master
PATCHES
no-etc-symlinks.patch
@ -19,6 +19,8 @@ vcpkg_configure_meson(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-Ddoc=disabled
-Dcache-build=disabled
-Dtests=disabled
)
vcpkg_install_meson(ADD_BIN_TO_PATH)
@ -67,21 +69,6 @@ endif()
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
# Build the fontconfig cache
if(NOT VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_CROSSCOMPILING)
set(ENV{FONTCONFIG_PATH} "${CURRENT_PACKAGES_DIR}/etc/fonts")
set(ENV{FONTCONFIG_FILE} "${CURRENT_PACKAGES_DIR}/etc/fonts/fonts.conf")
vcpkg_execute_required_process(COMMAND "${CURRENT_PACKAGES_DIR}/bin/fc-cache${VCPKG_TARGET_EXECUTABLE_SUFFIX}" --verbose
WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin"
LOGNAME fc-cache-${TARGET_TRIPLET})
endif()
if(VCPKG_TARGET_IS_WINDOWS)
# Unnecessary make rule creating the fontconfig cache dir on windows.
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}LOCAL_APPDATA_FONTCONFIG_CACHE")
endif()
if(NOT VCPKG_TARGET_IS_LINUX)
set(VCPKG_TARGET_IS_LINUX 0) # To not leave empty AND statements in the wrapper
endif()

4
ports/fontconfig/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "fontconfig",
"version": "2.13.94",
"port-version": 6,
"version": "2.14.0",
"description": "Library for configuring and customizing font access.",
"homepage": "https://www.freedesktop.org/wiki/Software/fontconfig",
"license": "MIT",
@ -10,7 +9,6 @@
"expat",
"freetype",
"gettext",
"json-c",
"libiconv",
{
"name": "libuuid",

4
versions/baseline.json
View File

@ -2261,8 +2261,8 @@
"port-version": 0
},
"fontconfig": {
"baseline": "2.13.94",
"port-version": 6
"baseline": "2.14.0",
"port-version": 0
},
"foonathan-memory": {
"baseline": "2019-07-21",

5
versions/f-/fontconfig.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "49816baac2cb555355f7e0176c5d36b2701cfceb",
"version": "2.14.0",
"port-version": 0
},
{
"git-tree": "8f782f79dc3a2c6834a7e5de4a941b11822067dd",
"version": "2.13.94",