search

fsvm88 / cosmic-overlay

COSMIC DE overlay for Gentoo
16 stars 4 forks source link

bump submodules #5

Closed joostruis closed 2 months ago

joostruis commented 2 months ago

I noticed that this bumped version (actually this should be alpha1 release) failed to compile. Turns out that libcosmic now requires dev-lang/rust-1.8.0 ( see here https://github.com/pop-os/libcosmic/blob/master/Cargo.toml#L5 )

Since this version at this time of writing is not in Portage tree I used the version from Miezhiko overlay

Then things seem to go as expected until I bump into this problem with cosmic-notifications:

error: could not load Cargo configuration
Caused by:
failed to merge configuration at `/var/tmp/portage/cosmic-de/cosmic-notifications-9999/work/cargo_home/config.toml`
Caused by:
failed to merge key `build` between /var/tmp/portage/cosmic-de/cosmic-notifications-9999/work/cosmic-notifications-9999/.cargo/config.toml and /var/tmp/portage/cosmic-de/cosmic-notifications-9999/work/cargo_home/config.toml
Caused by:
failed to merge key `rustflags` between /var/tmp/portage/cosmic-de/cosmic-notifications-9999/work/cosmic-notifications-9999/.cargo/config.toml and /var/tmp/portage/cosmic-de/cosmic-notifications-9999/work/cargo_home/config.toml
Caused by:
failed to merge config value from `/var/tmp/portage/cosmic-de/cosmic-notifications-9999/work/cargo_home/config.toml` into `/var/tmp/portage/cosmic-de/cosmic-notifications-9999/work/cosmic-notifications-9999/.cargo/config.toml`: expected array, but found string
* ERROR: cosmic-de/cosmic-notifications-9999::cosmic-overlay failed (compile phase):
* failed to compile

Perhaps you have any clue about this problem.

fsvm88 commented 2 months ago

I believe this PR can be closed now :) Can you please test with the latest changes I just pushed and confirm?

  1. Rust 1.80.1, included in the overlay (contains 2 important bugfixes for regressions)
  2. Bumped all submodules, resynced justfile/Makefile/debian-control/... for properly installing everything
    • this fixes missing keybindings for cosmic-comp
    • does not include gsettings-override for cosmic-session - not sure how to do this yet
    • added some missing deps
    • added new applet for cosmic-applets
  3. cosmic-notifications did not give me any issues, compiles just fine
  4. Added more EGIT_LFS where used
  5. Added cosmic-wallpapers (used by cosmic-session, we could make it optional)

I did not manage to test the latest env myself yet, may get around to it this evening.

joostruis commented 2 months ago

Great work! I will try to test this all today!