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

[libmount] New port #21491

Merged
merged 13 commits into from
Nov 24, 2021
Merged

[libmount] New port #21491

merged 13 commits into from
Nov 24, 2021

Conversation

wrobelda
Copy link
Contributor

@wrobelda wrobelda commented Nov 17, 2021

Describe the pull request
- Adds new port
- Updates other ports (kf5kio, kf5solid, glib) to take advantage of it
- removes now redundant libmount-dev package from the linux VM

@wrobelda wrobelda marked this pull request as ready for review November 17, 2021 12:45
@wrobelda
Copy link
Contributor Author

wrobelda commented Nov 17, 2021

All features have been tested with and without and behave as expected:

  • kf5solid[libmount]
  • glib[libmount]

@wrobelda
Copy link
Contributor Author

FYI, Windows CI/CD cascades kf5 ports. See microsoft/vcpkg-tool#184 (comment)

@dg0yt
Copy link
Contributor

dg0yt commented Nov 17, 2021

In dependencies, you should use platform, not supports.

@dg0yt
Copy link
Contributor

dg0yt commented Nov 17, 2021

Sorry, I see it is meant to work in features, not dependencies.

ports/kf5kio/vcpkg.json Outdated Show resolved Hide resolved
@wrobelda
Copy link
Contributor Author

FYI, Windows CI/CD cascades kf5 ports. See microsoft/vcpkg-tool#184 (comment)

This is now solved.

@JonLiu1993 JonLiu1993 self-assigned this Nov 18, 2021
@JackBoosY JackBoosY self-assigned this Nov 18, 2021
@JackBoosY JackBoosY added the category:new-port The issue is requesting a new library to be added; consider making a PR! label Nov 18, 2021
@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Nov 18, 2021
Copy link
Member

@vicroms vicroms left a comment

Choose a reason for hiding this comment

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

LGTM

Comment on lines -57 to -59
# Additionally required by kf5kio
APT_PACKAGES="$APT_PACKAGES libmount-dev"

Copy link
Member

@vicroms vicroms Nov 19, 2021

Choose a reason for hiding this comment

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

Pinging @BillyONeal to ok this

Copy link
Contributor Author

Choose a reason for hiding this comment

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

FYI this was added by myself only recently as part of preparation for #20938 (still unmerged).

Copy link
Contributor Author

@wrobelda wrobelda Nov 22, 2021

Choose a reason for hiding this comment

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

Also, since reviewing this I made libmount a default feature on Linux for kf5solid, as well as updated the FindLibMount.cmake after upstream had some suggestions.

@JonLiu1993 JonLiu1993 removed the info:reviewed Pull Request changes follow basic guidelines label Nov 19, 2021
@wrobelda wrobelda force-pushed the libmount branch 2 times, most recently from 99bcb11 to 5293339 Compare November 22, 2021 16:32
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!

After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 653912591af709c162fba2d4000a6b3362c8d3c9 -- versions
./vcpkg x-add-version --all
Diff
diff --git a/versions/e-/ecm.json b/versions/e-/ecm.json
index 0376164..ccfbb4d 100644
--- a/versions/e-/ecm.json
+++ b/versions/e-/ecm.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "b9ea21e7dd8a4191cedd825fee0a22045f2d587d",
+      "git-tree": "0bd4113f8c0da00ac67473e5e52644036f1147ba",
       "version": "5.84.0",
       "port-version": 3
     },

@JackBoosY
Copy link
Contributor

LGTM, @BillyONeal can you please review again?

Thanks.

@BillyONeal BillyONeal merged commit a2fcb03 into microsoft:master Nov 24, 2021
@BillyONeal
Copy link
Member

Thanks for the port :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:new-port The issue is requesting a new library to be added; consider making a PR!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants