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

Upgrade usvg from 0.9 -> 0.20 #493

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

kognise
Copy link
Contributor

@kognise kognise commented Feb 5, 2022

Upgrades usvg to 0.20. Had to make some minor code changes, the main differences are:

  • Tree constructors now take an OptionsRef instead of an Options, so we need a bunch of .to_ref() calls
  • Tree::from_file was removed, I replaced it with Tree::from_data and std::fs::read

@kognise
Copy link
Contributor Author

kognise commented Feb 6, 2022

Just realized #487 does mostly the same thing, I didn't notice since it has a different name. I believe my changes fixed a couple more things than it, but I'm not 100% sure.

@floppyhammer
Copy link
Contributor

@kognise The focus of #487 is to fix the Android demo. So, I don't mind rebasing that on your commit if yours does more fixes. In addition, I've got a little question. Is it necessary to commit Cargo.lock?

@kognise
Copy link
Contributor Author

kognise commented Feb 8, 2022

A rebase might be a good idea, up to you. As for Cargo.lock, everything breaks if we don't commit it so I think it's fine. Has the potential to cause merge conflicts though, so I'm not 100% sure.

@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #491) made this pull request unmergeable. Please resolve the merge conflicts.

@floppyhammer
Copy link
Contributor

@kognise Do you have any time to work on this?

@kognise
Copy link
Contributor Author

kognise commented Apr 7, 2022

Sorry, I'll try to handle it by Monday at the latest.

@kognise
Copy link
Contributor Author

kognise commented Apr 14, 2022

Trying to get these PRs working... I'm stuck on an M1 MacBook right now, which is normally a blessing!

I'm having trouble with the winit versions depended on— neither 0.21 nor 0.19 will build on aarch64 as the objc crate introduced some breaking arch-specific type changes (an i8 to a bool, but only on M1). This has been fixed on the latest version of winit (0.24.0) but I'm struggling to navigate the dependency nightmare.

Even after upgrading Winit in all of Pathfinder, Surfman still depends on the older version. What's the best way to handle this? Should I make a PR to Surfman and wait for that to merge, then come back here?

Thanks!

@floppyhammer
Copy link
Contributor

floppyhammer commented Apr 14, 2022

@kognise It seems the mismatched types issue already exists on the current master. It might need another PR. See #483.

@floppyhammer
Copy link
Contributor

I'd like to combine changes from this PR into #487 if you don't mind. As as result, this one will be superseded.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants