Conversation
080f5b9 to
f3a6c20
Compare
|
Checklist (build):
Checklist (smoke test): |
bebbd2a to
15c51d7
Compare
a4cb740 to
ac030d4
Compare
2de2813 to
d85503a
Compare
d83c298 to
dd515ab
Compare
b61143b to
ddf88b6
Compare
|
Builds now and boots. Problems on
|
|
Thanks a lot for all this work :) as I'm scanning old ignored pull requests I stumbled upon AsteroidOS/lipstick#22 is this something you ran into ? |
Seems so, see build log at https://gist.githubusercontent.com/casept/fbf6c3df58259c6807b2e31d2b01804d/raw/dc3bf8241aade080d530ced441081d0a6b4eaa10/gistfile1.txt Among others: For now, I just patched out Werror in the hopes that lipstick cleanup can be postponed. |
1e88f8b to
6cf0f6c
Compare
Yeah, just pick the path of least resistance to deal with lipstick for now. Just for context, lipstick has been on a jumping seat for a while already. There seems to be a lot of its code that we don't use at all and we have forked it quite heavily already so we're not getting much benefit from upstream anyway so I'd envision that in a not so distant future we'd merge all the parts of its code which we really use into asteroid-launcher and have the two projects be merged into one codebase that is more minimal for what we actually do with it. As part of this, I'm sure there's a lot of concepts that could get cleaned up and asteroid-launcher would hopefully look like a more regular user of QtWayland (or QtApplicationLauncher ?) and that dependency would eventually disappear. This is not a small refactoring but maybe that bit of context can help you take certain shortcuts. |
f78e07c to
42811d8
Compare
|
The alarm issue seems fixed, now I just need to drop the disk space stats properly from asteroid-settings. |
42811d8 to
4da05e7
Compare
|
asteroid-settings changes are in AsteroidOS/asteroid-settings#126. |
Needed by newer version of libngf-qt
Drop one of our patches that has been accepted upstream.
Requires removing Werror. We should probably eventually just properly rebase it so that all the deprecation warnings go away, but that's a bigger effort.
We don't use it for anything, and it pulls in a large number of dependencies not used by anything else. Therefore, remove it as part of the general upgrade effort.
Upstream has removed support for Android <= 10. All our ports target older Android, so replace with the legacy version of this module.
4da05e7 to
c66a277
Compare
| LIC_FILES_CHKSUM = "file://src/plugin.cpp;beginline=1;endline=31;md5=4f66b392565d1dd726d4c892676d96fd" | ||
|
|
||
| SRC_URI = "git://github.com/sailfishos/nemo-qml-plugin-calendar.git;protocol=https;branch=master \ | ||
| file://0001-CalendarEventQuery-Import-event-from-QObject.patch \ |
There was a problem hiding this comment.
You dropped this file but I don't see it removed anywhere ? Also the commit states "Start work on upgrading" while I think this is the whole update
| @@ -1,66 +0,0 @@ | |||
| From 1e170f447d7b8b02dad98912d521142a7fff8c30 Mon Sep 17 00:00:00 2001 | |||
There was a problem hiding this comment.
Just flagging this one to make sure you thought about why removing this patch makes sense
| FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" | ||
|
|
||
| SRC_URI += "file://0001-Wait-for-dbus-call-to-finish-in-NetworkTechnology.patch \ | ||
| file://0002-Register-dbus-types-in-networktechnology.patch \ |
There was a problem hiding this comment.
There is also no reasoning behind dropping these patches. Have you checked if they are no longer necessary ? cc @beroset
Needs to be done in preparation for upgrading to Qt6, as upstream has recently started adding support for it.
The plan is to go through recipes one-by-one and sync with upstream as I have time for. Help is welcome.