diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index 55c0238fd8..1ad11bfb27 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -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() diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json index fd4487d6f6..0ab7edc10e 100644 --- a/ports/fontconfig/vcpkg.json +++ b/ports/fontconfig/vcpkg.json @@ -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", diff --git a/versions/baseline.json b/versions/baseline.json index 9b5c1056e7..421186d9ac 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -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", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index a5d90d2537..70a3570d97 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49816baac2cb555355f7e0176c5d36b2701cfceb", + "version": "2.14.0", + "port-version": 0 + }, { "git-tree": "8f782f79dc3a2c6834a7e5de4a941b11822067dd", "version": "2.13.94",