Bug#1107765: unblock: lomiri/0.5.0-2
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: lomiri@packages.debian.org
Control: affects -1 + src:lomiri
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package lomiri
[ Reason ]
+ * debian/patches:
+ + Add 1005_cursor-always-follow-cursor-position-from-mir.patch. Keep cursor
+ in sync with Mir if running in a VM.
-> Unfortunately this description in d/changelog is not accurate: The
patch already existed, but we now only use the patched-in code path if
running in a VM (such as qemu). This fixes multi-monitor support in
Lomiri (partially).
+ + Update/extend 1005_cursor-always-follow-cursor-position-from-mir.patch.
+ Set LOMIRI_RUNNING_IN_VM=1 in lomiri-greeter-wrapper script.
-> For the Lomiri user session, LOMIRI_RUNNING_IN_VM is set since 0.3-11
of lomiri-session. However, for lomiri-greeter, the same variable needs to
set in lomiri-greeter-wrapper (shipped in lomiri src:pkg).
+ + Add 0030_lomiri-upstream-home-logo.patch. Use upstream Lomiri home
+ logo by default. Drop upstream's code that tries to too wisely to show
+ the distributor's logo. This we will handle in our debian-lomiri-default-
+ settings package.
-> Cherry-picked patch from upstream amending the home logo "chaos".
Upstream initially wanted to enforce distributor logo usage in home
button. However, upstream then switched back to showing the Lomiri logo
by default, now they leave vendoring / theming to the distributor again.
(In debian-lomiri-default-settings bin:pkg of lomiri-session src:pkg we
have provided proper theming for this starting with 0.3-11).
+ * debian/control:
+ + Bump versioned D: on lomiri-schemas; lomiri 0.5.0 requires lomiri-schemas
+ 0.1.8.
-> The home logo gsettings code needs newer lomiri-schemas, so reflect
this in d/control.
+ * debian/:
+ + Add 91-lomiri-enable-user-list.conf to /etc/lightdm/lightdm.conf.d/.
+ Enable user list, disable free-hand login prompt.
-> As Lomiri targets tablets, let's avoid typing things as best as we
can. In the Lomiri Greeter we now present a user list of available user
accounts. So only the password needs to be typed in.
[ Impact ]
* Multi-monitor support stays broken
* home logo in Lomiri's launcher looks non-themed
* user list not enabled by default
[ Tests ]
Manual tests in VMs and on physical devices (X1 and X1 Yoga).
[ Risks ]
Only for Lomiri users.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
Relevant for Lomiri in Debian.
unblock lomiri/0.5.0-2
diff -Nru lomiri-0.5.0/debian/91-lomiri-enable-user-list.conf lomiri-0.5.0/debian/91-lomiri-enable-user-list.conf
--- lomiri-0.5.0/debian/91-lomiri-enable-user-list.conf 1970-01-01 01:00:00.000000000 +0100
+++ lomiri-0.5.0/debian/91-lomiri-enable-user-list.conf 2025-06-07 00:44:19.000000000 +0200
@@ -0,0 +1,7 @@
+[Seat:*]
+
+# show local user names at Lomiri Greeter login prompt
+greeter-hide-users=false
+
+# don't neither show a username / password login prompt for local login
+greeter-show-manual-login=false
diff -Nru lomiri-0.5.0/debian/changelog lomiri-0.5.0/debian/changelog
--- lomiri-0.5.0/debian/changelog 2025-05-05 23:42:11.000000000 +0200
+++ lomiri-0.5.0/debian/changelog 2025-06-14 00:42:03.000000000 +0200
@@ -1,3 +1,23 @@
+lomiri (0.5.0-2) unstable; urgency=medium
+
+ * debian/patches:
+ + Add 1005_cursor-always-follow-cursor-position-from-mir.patch. Keep cursor
+ in sync with Mir if running in a VM.
+ + Update/extend 1005_cursor-always-follow-cursor-position-from-mir.patch.
+ Set LOMIRI_RUNNING_IN_VM=1 in lomiri-greeter-wrapper script.
+ + Add 0030_lomiri-upstream-home-logo.patch. Use upstream Lomiri home
+ logo by default. Drop upstream's code that tries to too wisely to show
+ the distributor's logo. This we will handle in our debian-lomiri-default-
+ settings package.
+ * debian/control:
+ + Bump versioned D: on lomiri-schemas; lomiri 0.5.0 requires lomiri-schemas
+ 0.1.8.
+ * debian/:
+ + Add 91-lomiri-enable-user-list.conf to /etc/lightdm/lightdm.conf.d/.
+ Enable user list, disable free-hand login prompt.
+
+ -- Mike Gabriel <sunweaver@debian.org> Sat, 14 Jun 2025 00:42:03 +0200
+
lomiri (0.5.0-1) unstable; urgency=medium
* New upstream release.
diff -Nru lomiri-0.5.0/debian/control lomiri-0.5.0/debian/control
--- lomiri-0.5.0/debian/control 2025-05-05 17:52:42.000000000 +0200
+++ lomiri-0.5.0/debian/control 2025-05-10 10:44:26.000000000 +0200
@@ -13,7 +13,7 @@
dh-apparmor,
doxyqml,
graphviz,
- lomiri-schemas (>= 0.1.5-1~),
+ lomiri-schemas (>= 0.1.8-1~),
lomiri-wallpapers <!nocheck>,
libdeviceinfo-dev,
libevdev-dev,
@@ -200,7 +200,7 @@
qttranslations5-l10n,
lomiri-application-impl-27,
lomiri-notifications-impl-3,
- lomiri-schemas (>= 0.1.5-1~),
+ lomiri-schemas (>= 0.1.8-1~),
lomiri-tests <!nocheck> | lomiri-application-impl,
${misc:Depends},
Description: Shell of the Lomiri Operating Environment (common files)
@@ -249,7 +249,7 @@
Architecture: any
Multi-Arch: same
Depends:
- lomiri-schemas (>= 0.1.5-1~),
+ lomiri-schemas (>= 0.1.8-1~),
qml-module-gsettings1.0,
qml-module-qtmultimedia,
${misc:Depends},
diff -Nru lomiri-0.5.0/debian/lomiri-greeter.install lomiri-0.5.0/debian/lomiri-greeter.install
--- lomiri-0.5.0/debian/lomiri-greeter.install 2025-05-05 17:52:42.000000000 +0200
+++ lomiri-0.5.0/debian/lomiri-greeter.install 2025-06-07 00:49:09.000000000 +0200
@@ -3,3 +3,4 @@
usr/share/lightdm/greeters/lomiri-greeter.desktop
usr/share/lightdm/lightdm.conf.d/51-lomiri-greeter.conf
debian/90-default-session-lomiri.conf etc/lightdm/lightdm.conf.d/
+debian/91-lomiri-enable-user-list.conf etc/lightdm/lightdm.conf.d/
diff -Nru lomiri-0.5.0/debian/patches/0030_lomiri-upstream-home-logo.patch lomiri-0.5.0/debian/patches/0030_lomiri-upstream-home-logo.patch
--- lomiri-0.5.0/debian/patches/0030_lomiri-upstream-home-logo.patch 1970-01-01 01:00:00.000000000 +0100
+++ lomiri-0.5.0/debian/patches/0030_lomiri-upstream-home-logo.patch 2025-06-06 21:31:05.000000000 +0200
@@ -0,0 +1,39 @@
+From ad134f78cfa89aa6c83584e69c4c290d6c1bce55 Mon Sep 17 00:00:00 2001
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date: Sat, 10 May 2025 11:12:54 +0200
+Subject: [PATCH] qml/Launcher/LauncherPanel.qml: Use Lomiri upstream home logo
+ and home background color.
+
+It is not our (Lomiri upstream) business to make sure that distributors
+set up their artwork / logo for the home button. We should simply provide
+our (Lomiri) logo and its best bgcolor match.
+
+Relates to: https://gitlab.com/ubports/ubuntu-touch/-/issues/2223
+---
+ qml/Launcher/LauncherPanel.qml | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/qml/Launcher/LauncherPanel.qml b/qml/Launcher/LauncherPanel.qml
+index bf8b119d7..b7da6805f 100644
+--- a/qml/Launcher/LauncherPanel.qml
++++ b/qml/Launcher/LauncherPanel.qml
+@@ -97,8 +97,7 @@ Rectangle {
+ if (launcherSettings.homeButtonBackgroundColor != '')
+ console.warn(`Invalid color name '${launcherSettings.homeButtonBackgroundColor}'`);
+
+- // Inverse of panel's color.
+- return lightMode ? "#111111" : "#FEFEFE";
++ return LomiriColors.orange;
+ }
+ }
+ readonly property bool highlighted: root.highlightIndex == -1;
+@@ -125,7 +124,6 @@ Rectangle {
+
+ candidates: [
+ launcherSettings.logoPictureUri,
+- "image://theme/start-here",
+ defaultLogo
+ ]
+ }
+--
+GitLab
diff -Nru lomiri-0.5.0/debian/patches/1005_cursor-always-follow-cursor-position-from-mir.patch lomiri-0.5.0/debian/patches/1005_cursor-always-follow-cursor-position-from-mir.patch
--- lomiri-0.5.0/debian/patches/1005_cursor-always-follow-cursor-position-from-mir.patch 2025-05-05 23:42:11.000000000 +0200
+++ lomiri-0.5.0/debian/patches/1005_cursor-always-follow-cursor-position-from-mir.patch 2025-06-13 23:52:55.000000000 +0200
@@ -9,23 +9,42 @@
This was done for multiscreen, but this has to be fixed another way then
tracking pointer ourself. The plan is to follow mir's screen position
anyway so we don't need this. (the current multiscreen impl is horrable)
+
+update 2025-05-15 (Mike Gabriel <mike.gabriel@das-netzwerkteam.de):
+ - Let VM workaround only take effect if running in a virtual machine.
+ - Set LOMIRI_RUNNING_IN_VM=1 in lomiri-greeter-wrapper script so that
+ the mouse pointer positioning hack for VMs also takes effect in
+ Lomiri Greeter.
---
plugins/Cursor/InputDispatcherFilter.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
-diff --git a/plugins/Cursor/InputDispatcherFilter.cpp b/plugins/Cursor/InputDispatcherFilter.cpp
-index 4ef0199d9a..5dcc1a4217 100644
--- a/plugins/Cursor/InputDispatcherFilter.cpp
+++ b/plugins/Cursor/InputDispatcherFilter.cpp
-@@ -72,7 +72,8 @@ bool InputDispatcherFilter::eventFilter(QObject *o, QEvent *e)
+@@ -71,8 +71,15 @@
+ // Local position gives relative change of mouse pointer.
QPointF movement = me->localPos();
++ QPointF oldPos;
// Adjust the position
- QPointF oldPos = pointer->window()->geometry().topLeft() + pointer->position();
-+ // Get the pos from mir
-+ QPointF oldPos = me->screenPos();
++ if (qEnvironmentVariableIsSet("LOMIRI_RUNNING_IN_VM")) {
++ // Get the position directly from Mir
++ oldPos = me->screenPos();
++ }
++ else {
++ oldPos = pointer->window()->geometry().topLeft() + pointer->position();
++ }
QPointF newPos = adjustedPositionForMovement(oldPos, movement);
QScreen* currentScreen = screenAt(newPos);
---
-GitLab
+--- a/data/lomiri-greeter-wrapper
++++ b/data/lomiri-greeter-wrapper
+@@ -51,6 +51,7 @@
+ if ([ -x "$(command -v hostnamectl)" ] && [ "$(hostnamectl status | grep 'Chassis: vm')" ]) \
+ || grep -wq hypervisor /proc/cpuinfo; then
+ set_greeter_var MIR_MESA_KMS_DISABLE_MODESET_PROBE 1
++ set_greeter_var LOMIRI_RUNNING_IN_VM 1
+ fi
+
+ set_greeter_var QT_IM_MODULE maliit
diff -Nru lomiri-0.5.0/debian/patches/series lomiri-0.5.0/debian/patches/series
--- lomiri-0.5.0/debian/patches/series 2025-05-05 23:42:11.000000000 +0200
+++ lomiri-0.5.0/debian/patches/series 2025-06-06 19:47:45.000000000 +0200
@@ -22,3 +22,4 @@
2014_lomiri-greeter-wrapper-on-wayland.patch
2015_lomiri-greeter-use-wayland.patch
1005_cursor-always-follow-cursor-position-from-mir.patch
+0030_lomiri-upstream-home-logo.patch
Reply to: