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

[kf5-calendarcore] Update to latest upstream 5.90. #9

Merged
merged 1 commit into from Jan 14, 2022

Conversation

dcaliste
Copy link
Contributor

@dcaliste dcaliste commented Jan 5, 2022

It relies on sailfishos/extra-cmake-modules#2

It is at the moment a simple update to latest upstream, not to lag too much behind.

It may be wise though to wait for https://invent.kde.org/frameworks/kcalendarcore/-/merge_requests/84 to settle (about the listing of cancelled events) before actually do the upgrade here.

@pvuorela
Copy link
Contributor

While waiting for the upstream discussion to proceed, guess we could also just do the upgrade out of the way.

@dcaliste dcaliste changed the title WIP: [kf5-calendarcore] Update to latest upstream 5.90. [kf5-calendarcore] Update to latest upstream 5.90. Jan 14, 2022
@dcaliste
Copy link
Contributor Author

Ok, let's do like that. I've removed the WIP mention. I noticed that I went one commit further than 5.90 in the upstream submodule. Is it an issue ? Do you prefer that I stick to the 5.90 tag ?

@pvuorela
Copy link
Contributor

I'm ok with either this or the official 5.90. Not too many times changes are reverted upstream. Seems good to me, though noticed I had tagged the extra-cmake-modules wrong earlier, without the trailing .0 and the version requirement here didn't work. Just pushed a new tag there and I'll get into this once it's in.

@pvuorela pvuorela merged commit 053c623 into sailfishos:master Jan 14, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants