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.

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

[intl/gettext/fontconfig] update to native build system #11776

Merged
merged 141 commits into from Nov 17, 2020

Conversation

Neumann-A
Copy link
Contributor

@Neumann-A Neumann-A commented Jun 4, 2020

With this PR cmake built on ubuntu 20.04 with vcpkg can be correctly started (no font rendering problems; Only tested with setting FONTCONFIG_FILE to font.conf installed by VCPKG)

Depends on other PRs which need to be merged first

closes #12330
closes #11165
closes #14548
closes #13566 (? If it fixes the issue it is more a coincidental fix since uuid will be linked elsewhere. The root cause for the issue is probably in qt5 buildsystem)

@JackBoosY JackBoosY added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Jun 10, 2020
@PhoebeHui
Copy link
Contributor

@Neumann-A, could you resolve the conficts?

@Neumann-A
Copy link
Contributor Author

waiting for merge of #11550 before i touch this again. Furthermore this PR is still in draft.

@PhoebeHui PhoebeHui added the depends:different-pr This PR or Issue depends on a PR which has been filed label Jul 10, 2020
@Neumann-A
Copy link
Contributor Author

@BillyONeal: this PR also requires VM update: 565220e

I wonder if I should just add all of:

list(APPEND MSYS_REQUIRE_PACKAGES diffutils
pkg-config
binutils
libtool
gettext
gettext-devel
make)
if (_csc_AUTOCONFIG)
list(APPEND MSYS_REQUIRE_PACKAGES autoconf
autoconf-archive
automake
m4
)

for symmetry (for some reason autopoint is missing there.)

@BillyONeal BillyONeal added the depends:vm-update PR contains changes to the VM provisioning scripts label Jul 13, 2020
@BillyONeal
Copy link
Member

@Neumann-A Thanks!

@JackBoosY JackBoosY marked this pull request as ready for review August 7, 2020 01:58
@JackBoosY JackBoosY marked this pull request as draft August 7, 2020 01:59
@Neumann-A Neumann-A marked this pull request as ready for review August 8, 2020 06:44
@Neumann-A Neumann-A marked this pull request as draft August 8, 2020 06:44
@Neumann-A
Copy link
Contributor Author

@JackBoosY: I'll reset this PR after #11836 is merged so don't rerun CI for this PR.

@BillyONeal
Copy link
Member

It looks like this is depends:vm-update for Ubuntu 20.04 but changes to do that aren't here; that's probably worth being its own thing though

@Neumann-A
Copy link
Contributor Author

@BillyONeal the vm update should have been autopoint not ubuntu 20.04. Compiling on a lower linux version should be ok. Just starting an executable using fontconfig requires extra setup. (although newer version in binary and older on system could probably be fine)

@Neumann-A
Copy link
Contributor Author

@BillyONeal here is the comment to the vm update request: #11776 (comment)

@strega-nil
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@JackBoosY
Copy link
Contributor

Seems okay, ready for review now?

@Neumann-A Neumann-A marked this pull request as ready for review November 13, 2020 07:15
@Neumann-A
Copy link
Contributor Author

@JackBoosY Yes

ports/gettext/portfile.cmake Show resolved Hide resolved
ports/gettext/portfile.cmake Show resolved Hide resolved
ports/libiconv/portfile.cmake Show resolved Hide resolved
ports/libxmlpp/CONTROL Outdated Show resolved Hide resolved
@JackBoosY
Copy link
Contributor

I think this PR also fix #13566.

@Neumann-A
Copy link
Contributor Author

I think this PR also fix #13566.

Could be. The question is why uuid is linked in there? Hmm I left a comment in #13566. Even though it might fix it by pure coincidence the error is actually in qt5-base build system not linking against uuid.

Copy link
Contributor

@strega-nil strega-nil left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some minor things I noticed :) This is amazing tho!

ports/fontconfig/portfile.cmake Outdated Show resolved Hide resolved
ports/gettext/portfile.cmake Show resolved Hide resolved
ports/io2d/cmake.dep.patch Show resolved Hide resolved
ports/libtorrent/portfile.cmake Outdated Show resolved Hide resolved
@strega-nil
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@strega-nil strega-nil merged commit 3a26eb3 into microsoft:master Nov 17, 2020
@strega-nil
Copy link
Contributor

Alright! Awesome! Thanks so much @Neumann-A 😄 😄 😄

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist
Projects
None yet
6 participants