Skip to content

Merge repos #35

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

Merged
merged 270 commits into from
Nov 5, 2020
Merged

Merge repos #35

merged 270 commits into from
Nov 5, 2020

Conversation

bilelmoussaoui
Copy link
Member

@bilelmoussaoui bilelmoussaoui commented Nov 4, 2020

To be done:

  • Add the geneartor from gtk-rs
  • Add a readme
  • Fix the CI

@bilelmoussaoui
Copy link
Member Author

The build fails currently locally with

error: failed to select a version for `gio-sys`.
    ... required by package `gdk4-sys v0.1.0 (/home/bilelmoussaoui/Projects/gtk4/gdk4/sys)`
    ... which is depended on by `gdk4 v0.1.0 (/home/bilelmoussaoui/Projects/gtk4/gdk4)`
versions that meet the requirements `*` are: 0.13.0

the package `gio-sys` links to the native library `gio-2.0`, but it conflicts with a previous package which links to `gio-2.0` as well:
package `gio-sys v0.10.0 (https://github.com/gtk-rs/sys#5f35e26c)`
    ... which is depended on by `gdk4 v0.1.0 (/home/bilelmoussaoui/Projects/gtk4/gdk4)`

I guess the link is a bit problematic :/

@sdroege
Copy link
Member

sdroege commented Nov 4, 2020

I guess the link is a bit problematic :/

You need to update all the dependencies to be inside the new repo (by path instead of via git!), and also point to the combined gtk-rs repo for the other deps.

@bilelmoussaoui
Copy link
Member Author

I guess the link is a bit problematic :/

You need to update all the dependencies to be inside the new repo (by path instead of via git!), and also point to the combined gtk-rs repo for the other deps.

My bad, that worked just fine

the generator was copied from gtk-rs/gtk-rs
mostly based on the one used in gtk-rs
@bilelmoussaoui
Copy link
Member Author

This doesn't contain the examples4 repository as it's currently broken and will just break the CI.

@sdroege
Copy link
Member

sdroege commented Nov 5, 2020

Looks good to me otherwise!

@bilelmoussaoui
Copy link
Member Author

Thanks for the review as always! 👍

@bilelmoussaoui bilelmoussaoui merged commit 327a60f into master Nov 5, 2020
@bilelmoussaoui bilelmoussaoui deleted the bilelmoussaoui/migrate branch November 5, 2020 09:10
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.

8 participants