From 64e90a02d26248c15d6e29a6308b29f32b2ffc09 Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Tue, 7 Dec 2021 09:27:39 +0100 Subject: [PATCH] main/postmarketos-ui-plasma-mobile: switch to modemmanager (MR 2730) Upstream has switched from ofono to modemmanager since Plasma 5.23 and Plasma Mobile Gear 21.12. Since the latter has just been released it's now time to switch our images too. The modemmanager service will be enabled to start on default and for existing installations the .post-upgrade script will disable and stop the existing ofono service and enable and start modemmanager instead. --- main/postmarketos-ui-plasma-mobile/APKBUILD | 5 +++-- .../postmarketos-ui-plasma-mobile.post-install | 13 +++++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/main/postmarketos-ui-plasma-mobile/APKBUILD b/main/postmarketos-ui-plasma-mobile/APKBUILD index 9687319a4..c6728a2b5 100644 --- a/main/postmarketos-ui-plasma-mobile/APKBUILD +++ b/main/postmarketos-ui-plasma-mobile/APKBUILD @@ -1,8 +1,8 @@ # Reference: https://postmarketos.org/uipkg # Maintainer: Bart Ribbers pkgname=postmarketos-ui-plasma-mobile -pkgver=3.3 -pkgrel=7 +pkgver=3.4 +pkgrel=0 pkgdesc="(Wayland) Mobile variant of KDE Plasma (does not run without hardware acceleration, allows only numeric passwords!)" url="https://wiki.postmarketos.org/wiki/Plasma_Mobile" arch="noarch !armhf !x86" # armhf: pmaports#75, x86: aports#11807 @@ -18,6 +18,7 @@ depends=" kscreen kwallet-pam kwayland-integration + modemmanager plasma-phone-components polkit-kde-agent-1 postmarketos-base-ui diff --git a/main/postmarketos-ui-plasma-mobile/postmarketos-ui-plasma-mobile.post-install b/main/postmarketos-ui-plasma-mobile/postmarketos-ui-plasma-mobile.post-install index 1972f801f..df9238f21 100644 --- a/main/postmarketos-ui-plasma-mobile/postmarketos-ui-plasma-mobile.post-install +++ b/main/postmarketos-ui-plasma-mobile/postmarketos-ui-plasma-mobile.post-install @@ -2,13 +2,22 @@ rc-update add tinydm default rc-update add urfkill default -rc-update add ofono default -rc-update add ofono-auto-enable default rc-update add iio-sensor-proxy default rc-update add bluetooth default rc-update add hfd-service default rc-update add networkmanager default +rc-update add modemmanager default + +# Migrate from the old ofono setup +if rc-update del ofono default; then + rc-update del ofono-auto-enable default + rc-service stop ofono + rc-service stop ofono-auto-enable + + rc-service start modemmanager +fi + tinydm-set-session -s /usr/share/wayland-sessions/plasma-mobile.desktop glib-compile-schemas /usr/share/glib-2.0/schemas