From 706ab2a27978c1fb8d76455f954636d96e44a471 Mon Sep 17 00:00:00 2001 From: Ilya Arzhannikov Date: Wed, 5 May 2021 22:31:41 +0200 Subject: [PATCH] [fontconfig] Add cflags in tools build command (#17019) * add clags in tools build command * bump port version * x-add-version fontconfig * vcpkg x-add-version fontconfig --overwrite-version * bump port version * ./vcpkg x-add-version fontconfig * Update versions/f-/fontconfig.json Co-authored-by: Robert Schumacher * bump port version * ./vcpkg x-add-version fontconfig Co-authored-by: Ilya Arzhannikov Co-authored-by: Robert Schumacher --- ports/fontconfig/CONTROL | 2 +- ports/fontconfig/build2.patch | 2 +- versions/baseline.json | 2 +- versions/f-/fontconfig.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL index f08532e139..f83c3b1cec 100644 --- a/ports/fontconfig/CONTROL +++ b/ports/fontconfig/CONTROL @@ -1,6 +1,6 @@ Source: fontconfig Version: 2.13.1 -Port-Version: 6 +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 13bacf15d4..2b2780abb0 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) ++ $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS) $(LIBINTL) $(CFLAGS) $(TARG): $(TMPL) $(TSRC) $(DEPS) $(AM_V_GEN) $(MAKE) $(TOOL) && \ diff --git a/versions/baseline.json b/versions/baseline.json index b5903374c9..0308dde2c8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2038,7 +2038,7 @@ }, "fontconfig": { "baseline": "2.13.1", - "port-version": 6 + "port-version": 7 }, "foonathan-memory": { "baseline": "2019-07-21-1", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index 93cf7d2608..46a0f251a8 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e28c20718e723ea702e408f52f76343950b1a3f2", + "version-string": "2.13.1", + "port-version": 7 + }, { "git-tree": "1b2332fd4b819725ae740da7023098294a7da7e8", "version-string": "2.13.1",