From 218a05f6ac67f260288ff70344f0f004c7b48c7b Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Sun, 22 Mar 2026 20:18:39 +0100 Subject: Use shared buteo-common and split notifications service on main Keep main as the branch that builds against the newer shared social sync modules, while master stays self-contained. - drop the bundled buteo-common sources and stop building or packaging libmastodonbuteocommon - link the Mastodon sync plugins against buteosocialcommon and add the matching build/runtime package requirements - install a dedicated mastodon-notifications account service and wire account creation/packaging around the separate notifications profile - move the posts/events-view side over to the newer shared-helper style used with the updated socialcache stack - clean up qmake project wiring for the shared-module layout and refresh the branch README to describe the split service model - keep the notification schedule at the master value instead of carrying the temporary timing tweak --- rpm/sailfish-account-mastodon.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'rpm') diff --git a/rpm/sailfish-account-mastodon.spec b/rpm/sailfish-account-mastodon.spec index 97e790a..c321184 100644 --- a/rpm/sailfish-account-mastodon.spec +++ b/rpm/sailfish-account-mastodon.spec @@ -21,6 +21,7 @@ BuildRequires: pkgconfig(buteosyncfw5) >= 0.10.0 BuildRequires: pkgconfig(accounts-qt5) BuildRequires: pkgconfig(libsignon-qt5) BuildRequires: pkgconfig(socialcache) +BuildRequires: pkgconfig(buteosocialcommon) BuildRequires: pkgconfig(libsailfishkeyprovider) BuildRequires: pkgconfig(sailfishaccounts) BuildRequires: pkgconfig(nemotransferengine-qt5) >= 2.0.0 @@ -28,9 +29,10 @@ BuildRequires: pkgconfig(nemonotifications-qt5) Requires: jolla-settings-accounts-extensions-onlinesync Requires: qmf-oauth2-plugin >= 0.0.7 Requires: buteo-syncfw-qt5-msyncd +Requires: buteo-sync-plugins-social >= 0.4.0 Requires: systemd Requires: lipstick-jolla-home-qt5-components >= 1.2.50 -Requires: eventsview-extensions +Requires: eventsview-extensions >= 0.1.9-2 Requires: sailfishsilica-qt5 >= 1.1.108 Requires: declarative-transferengine-qt5 >= 0.3.13 Requires: nemo-transferengine-qt5 >= 2.0.0 @@ -74,8 +76,6 @@ fi %license LICENSES/LGPL-2.1-or-later.txt %{_libdir}/libmastodoncommon.so.* %exclude %{_libdir}/libmastodoncommon.so -%{_libdir}/libmastodonbuteocommon.so.* -%exclude %{_libdir}/libmastodonbuteocommon.so %{_datadir}/accounts/providers/mastodon.provider %{_datadir}/accounts/services/mastodon-microblog.service %{_datadir}/accounts/services/mastodon-notifications.service -- cgit v1.2.3