Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fontconfig] Add cflags in tools build command #17019

Merged
merged 13 commits into from May 5, 2021
Merged

[fontconfig] Add cflags in tools build command #17019

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0663d90
add clags in tools build command
Apr 1, 2021
72305e6
bump port version
Apr 1, 2021
d59247f
x-add-version fontconfig
Apr 1, 2021
41b74fe
Merge remote-tracking branch 'origin/master' into fontconfig_cflags_p…
Apr 13, 2021
80a4494
vcpkg x-add-version fontconfig --overwrite-version
Apr 13, 2021
310fec0
Merge remote-tracking branch 'origin/master' into fontconfig_cflags_p…
Apr 20, 2021
25c358c
bump port version
Apr 20, 2021
df02806
./vcpkg x-add-version fontconfig
Apr 20, 2021
8ebcce3
Update versions/f-/fontconfig.json
xandox Apr 23, 2021
266b085
Merge remote-tracking branch 'origin/master' into fontconfig_cflags_p…
May 3, 2021
631f36d
bump port version
May 3, 2021
61117e1
./vcpkg x-add-version fontconfig
May 3, 2021
36bf675
Merge branch 'fontconfig_cflags_pr_15605' of github.com:xandox/vcpkg …
May 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/fontconfig/CONTROL
View file
Open in desktop
@@ -1,6 +1,6 @@
Source: fontconfig
Version: 2.13.1
Port-Version: 5
Port-Version: 6
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), gettext
2 changes: 1 addition & 1 deletion ports/fontconfig/build2.patch
View file
Open in desktop
Expand Up @@ -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) && \
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Expand Up @@ -2034,7 +2034,7 @@
},
"fontconfig": {
"baseline": "2.13.1",
"port-version": 5
"port-version": 6
},
"foonathan-memory": {
"baseline": "2019-07-21-1",
Expand Down
7 changes: 6 additions & 1 deletion versions/f-/fontconfig.json
View file
Open in desktop
@@ -1,7 +1,12 @@
{
"versions": [
{
"git-tree": "de83a21d912d9b87d8ad069d94dffcca201830a3",
"git-tree": "e4934e51612999eea86c66bcc794fa88aedef173",
"version-string": "2.13.1",
"port-version": 6
},
{
"git-tree": "d9774e3ba72153356e6ba148678304283053feda",
xandox marked this conversation as resolved.
Show resolved Hide resolved
"version-string": "2.13.1",
"port-version": 5
},
Expand Down