Skip to content

Upgrade nemomobile dependencies#209

Open
casept wants to merge 72 commits intoAsteroidOS:masterfrom
casept:rebase-nemomobile
Open

Upgrade nemomobile dependencies#209
casept wants to merge 72 commits intoAsteroidOS:masterfrom
casept:rebase-nemomobile

Conversation

@casept
Copy link
Copy Markdown
Contributor

@casept casept commented Oct 2, 2025

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.

@casept casept force-pushed the rebase-nemomobile branch from 080f5b9 to f3a6c20 Compare October 2, 2025 17:00
@casept
Copy link
Copy Markdown
Contributor Author

casept commented Oct 2, 2025

Checklist (build):

  • buteo-syncfw
  • buteo-mtp
  • droidmedia
  • dsme
  • geoclue - Cannot be upgraded due to major API breakage
  • geoclue-provider-hybris-binder
  • geoclue-provider-hybris-hal
  • kf5bluezqt
  • libaccounts
  • libaccounts-qt5
  • libaccounts-glib
  • libconnman-qt5
  • libdbusaccess
  • libiodata
  • libiphb
  • libmlocale
  • libnci
  • libngf
  • libqtsparql
  • libresource
  • libsailfishkeyprovider
  • libshadowutils - No longer needed, drop
  • libsignon-qt5
  • lipstick
  • mapplauncherd
  • mce
  • mlite
  • nemo-keepalive
  • nemo-qml-plugins
    • alarms
    • calendar
    • configuration
    • connectivity
    • dbus
    • devicelock
    • notifications
    • policy
    • social
    • systemsettings
    • thumbnailer
    • time
  • nfcd
  • ngfd
  • profiled
  • qofonoext
  • qtdbusextended
  • qtmpris
  • sailfish-access-control
  • sensorfw
  • timed
  • usb-moded
  • voicecall - Will drop
  • mkcal
  • kcalendarcore
  • pulseaudio-modules-nemo
  • nemo-qtmultimedia-plugins
  • pulseaudio-module-droid - Needs to be replaced with https://github.com/mer-hybris/pulseaudio-modules-droid-jb2q because of dropped support for Android <= 10
  • pulseaudio-module-keepalive
  • gst-droid
  • nemo-gst-interfaces

Checklist (smoke test):
TODO

@casept casept force-pushed the rebase-nemomobile branch 2 times, most recently from bebbd2a to 15c51d7 Compare October 4, 2025 23:51
@casept casept force-pushed the rebase-nemomobile branch 4 times, most recently from a4cb740 to ac030d4 Compare October 14, 2025 23:29
@casept casept force-pushed the rebase-nemomobile branch 2 times, most recently from 2de2813 to d85503a Compare January 25, 2026 22:42
@MagneFire MagneFire force-pushed the master branch 2 times, most recently from d83c298 to dd515ab Compare February 1, 2026 00:47
@casept casept force-pushed the rebase-nemomobile branch 5 times, most recently from b61143b to ddf88b6 Compare March 5, 2026 16:35
@casept
Copy link
Copy Markdown
Contributor Author

casept commented Mar 5, 2026

Builds now and boots. Problems on beluga:

  • Pulseaudio fails
  • underclock fails (but seems like it may be unrelated to upgrade)
  • usb-moded fails (more general beluga issues?)
  • Settings app fails to launch due to removed support for DiskUsage in nemo-qml-plugin-systemsettings
  • Random alarms going off

@FlorentRevest
Copy link
Copy Markdown
Member

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 ?

@casept
Copy link
Copy Markdown
Contributor Author

casept commented Mar 12, 2026

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:


../../git/src/lipsticksettings.cpp: In member function 'void LipstickSettings::exportScreenSize()':
../../git/src/lipsticksettings.cpp:84:58: warning: 'MGConfItem::MGConfItem(const QString&, QObject*)' is deprecated: Use MDConfItem [-Wdeprecated-declarations]
   84 |     MGConfItem widthConf("/lipstick/screen/primary/width");
      |                                                          ^

In file included from ../../recipe-sysroot/usr/include/mlite5/MGConfItem:1,
                 from ../../git/src/lipsticksettings.cpp:20:
../../recipe-sysroot/usr/include/mlite5/mgconfitem.h:76:52: note: declared here
   76 |     Q_DECL_DEPRECATED_X("Use MDConfItem") explicit MGConfItem(const QString &key, QObject *parent = 0);
      |                                                    ^~~~~~~~~~

../../git/src/lipsticksettings.cpp:89:60: warning: 'MGConfItem::MGConfItem(const QString&, QObject*)' is deprecated: Use MDConfItem [-Wdeprecated-declarations]
   89 |     MGConfItem heightConf("/lipstick/screen/primary/height");
      |                                                            ^

../../recipe-sysroot/usr/include/mlite5/mgconfitem.h:76:52: note: declared here
   76 |     Q_DECL_DEPRECATED_X("Use MDConfItem") explicit MGConfItem(const QString &key, QObject *parent = 0);
      |                                                    ^~~~~~~~~~

For now, I just patched out Werror in the hopes that lipstick cleanup can be postponed.

@casept casept force-pushed the rebase-nemomobile branch 2 times, most recently from 1e88f8b to 6cf0f6c Compare March 12, 2026 15:16
@FlorentRevest
Copy link
Copy Markdown
Member

For now, I just patched out Werror in the hopes that lipstick cleanup can be postponed

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.

@casept casept force-pushed the rebase-nemomobile branch from f78e07c to 42811d8 Compare April 10, 2026 13:30
@casept
Copy link
Copy Markdown
Contributor Author

casept commented Apr 10, 2026

The alarm issue seems fixed, now I just need to drop the disk space stats properly from asteroid-settings.

@casept
Copy link
Copy Markdown
Contributor Author

casept commented Apr 10, 2026

asteroid-settings changes are in AsteroidOS/asteroid-settings#126.

@casept casept marked this pull request as ready for review April 10, 2026 15:10
casept added 14 commits April 11, 2026 17:57
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.
@casept casept force-pushed the rebase-nemomobile branch from 4da05e7 to c66a277 Compare April 11, 2026 15:57
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 \
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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 \
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is also no reasoning behind dropping these patches. Have you checked if they are no longer necessary ? cc @beroset

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.

2 participants