diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL deleted file mode 100644 index f83c3b1cecf449..00000000000000 --- a/ports/fontconfig/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: fontconfig -Version: 2.13.1 -Port-Version: 7 -Homepage: https://www.freedesktop.org/software/fontconfig/front.html -Description: Library for configuring and customizing font access. -Build-Depends: freetype, expat, libiconv, dirent, pthread, json-c, libuuid (!windows&!osx&!mingw), gettext diff --git a/ports/fontconfig/build2.patch b/ports/fontconfig/build2.patch index 2b2780abb00cee..f01edf8b200374 100644 --- a/ports/fontconfig/build2.patch +++ b/ports/fontconfig/build2.patch @@ -7,7 +7,7 @@ index f0fa0ec50..24e5afd16 100644 $(TOOL): $(TSRC) $(ALIAS_FILES) - $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS) -+ $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS) $(LIBINTL) $(CFLAGS) ++ $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS) $(LIBINTL) $(CFLAGS_FOR_BUILD) $(TARG): $(TMPL) $(TSRC) $(DEPS) $(AM_V_GEN) $(MAKE) $(TOOL) && \ diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index 9635d185403353..a14abbe6a08f89 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -98,13 +98,18 @@ file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share if(NOT VCPKG_TARGET_IS_WINDOWS) 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}/tools/${PORT}/bin/fc-cache${VCPKG_TARGET_EXECUTABLE_SUFFIX}" --verbose + if("${TARGET_TRIPLET}" STREQUAL "${HOST_TRIPLET}") + set(FC_CACHE_BASE "${CURRENT_PACKAGES_DIR}") + else() + set(FC_CACHE_BASE "${_VCPKG_INSTALLED_DIR}/${HOST_TRIPLET}") + endif() + vcpkg_execute_required_process(COMMAND "${FC_CACHE_BASE}/tools/${PORT}/bin/fc-cache${VCPKG_TARGET_EXECUTABLE_SUFFIX}" --verbose WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin" LOGNAME fc-cache-${TARGET_TRIPLET}) endif() if(VCPKG_TARGET_IS_WINDOWS) - # Unnecessary make rule creating the fontconfig cache dir on windows. + # Unnecessary make rule creating the fontconfig cache dir on windows. file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}LOCAL_APPDATA_FONTCONFIG_CACHE") endif() diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json new file mode 100644 index 00000000000000..e1238f7f376820 --- /dev/null +++ b/ports/fontconfig/vcpkg.json @@ -0,0 +1,23 @@ +{ + "name": "fontconfig", + "version-string": "2.13.1", + "port-version": 8, + "description": "Library for configuring and customizing font access.", + "homepage": "https://www.freedesktop.org/software/fontconfig/front.html", + "dependencies": [ + "dirent", + "expat", + { + "name": "fontconfig", + "host": true + }, + "freetype", + "json-c", + "libiconv", + { + "name": "libuuid", + "platform": "!windows & !osx & !mingw" + }, + "pthread" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 94f34acba5d7a8..8df9bc698902ce 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2098,7 +2098,7 @@ }, "fontconfig": { "baseline": "2.13.1", - "port-version": 7 + "port-version": 8 }, "foonathan-memory": { "baseline": "2019-07-21-1", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index 46a0f251a87182..b876b9b55c6d79 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7b8de891f5ef8e60bb971e2d7af4b7687537d3d3", + "version-string": "2.13.1", + "port-version": 8 + }, { "git-tree": "e28c20718e723ea702e408f52f76343950b1a3f2", "version-string": "2.13.1",