aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Arzhannikov <iarzhannikov@artec-group.com>2021-05-05 22:31:41 +0200
committerGitHub <noreply@github.com>2021-05-05 13:31:41 -0700
commit706ab2a27978c1fb8d76455f954636d96e44a471 (patch)
treea63b6cbeaa74193f8ae49702c22b0e7cacbf2648
parent511ecd942efc067813e7814f27da7a701c8f467d (diff)
downloadvcpkg-706ab2a27978c1fb8d76455f954636d96e44a471.tar.gz
vcpkg-706ab2a27978c1fb8d76455f954636d96e44a471.zip
[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 <roschuma@microsoft.com> * bump port version * ./vcpkg x-add-version fontconfig Co-authored-by: Ilya Arzhannikov <iarzhannikov@artec3d.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
-rw-r--r--ports/fontconfig/CONTROL2
-rw-r--r--ports/fontconfig/build2.patch2
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/f-/fontconfig.json5
4 files changed, 8 insertions, 3 deletions
diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL
index f08532e13..f83c3b1ce 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 13bacf15d..2b2780abb 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 b5903374c..0308dde2c 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 93cf7d260..46a0f251a 100644
--- a/versions/f-/fontconfig.json
+++ b/versions/f-/fontconfig.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "e28c20718e723ea702e408f52f76343950b1a3f2",
+ "version-string": "2.13.1",
+ "port-version": 7
+ },
+ {
"git-tree": "1b2332fd4b819725ae740da7023098294a7da7e8",
"version-string": "2.13.1",
"port-version": 6