Your message dated Wed, 30 Jul 2025 14:03:55 +0000
with message-id <[email protected]>
and subject line unblock lomiri-calendar-app
has caused the Debian Bug report #1110128,
regarding unblock: lomiri-calendar-app/1.1.4-2
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1110128: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1110128
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: [email protected]
Control: affects -1 + src:lomiri-calendar-app
User: [email protected]
Usertags: unblock
Please unblock package lomiri-calendar-app
[ Reason ]
+ * debian/patches:
+ + Drop 2002_fix-providers-not-shown-when-adding-new-OnlineAccount.patch and
+ add 0003_Set-ApplicationID-according-to-APP_ID-env-var.patch instead.
+ Support overriding APP_ID via env var (default to CMake @PROJECT_NAME@).
-> This update replaces a quirk'n'dirty patch we wrote for Debian by the
now official upstream fix for the problem.
This fixes Google calendar sync in lomiri-calendar-app.
[ Impact ]
APP_ID overriding via env var will not be supported by
lomiri-calendar-app, so neither Google calendar sync.
[ Tests ]
Manual test on Lomiri.
[ Risks ]
Minimal. Only for users of lomiri-calendar-app.
[ 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-calendar-app/1.1.4-2
diff -Nru lomiri-calendar-app-1.1.4/debian/changelog
lomiri-calendar-app-1.1.4/debian/changelog
--- lomiri-calendar-app-1.1.4/debian/changelog 2025-05-05 12:46:56.000000000
+0200
+++ lomiri-calendar-app-1.1.4/debian/changelog 2025-07-24 23:16:37.000000000
+0200
@@ -1,3 +1,12 @@
+lomiri-calendar-app (1.1.4-2) unstable; urgency=medium
+
+ * debian/patches:
+ + Drop 2002_fix-providers-not-shown-when-adding-new-OnlineAccount.patch and
+ add 0003_Set-ApplicationID-according-to-APP_ID-env-var.patch instead.
+ Support overriding APP_ID via env var (default to CMake @PROJECT_NAME@).
+
+ -- Mike Gabriel <[email protected]> Thu, 24 Jul 2025 23:16:37 +0200
+
lomiri-calendar-app (1.1.4-1) unstable; urgency=medium
* New upstream release.
diff -Nru
lomiri-calendar-app-1.1.4/debian/patches/0003_Set-ApplicationID-according-to-APP_ID-env-var.patch
lomiri-calendar-app-1.1.4/debian/patches/0003_Set-ApplicationID-according-to-APP_ID-env-var.patch
---
lomiri-calendar-app-1.1.4/debian/patches/0003_Set-ApplicationID-according-to-APP_ID-env-var.patch
1970-01-01 01:00:00.000000000 +0100
+++
lomiri-calendar-app-1.1.4/debian/patches/0003_Set-ApplicationID-according-to-APP_ID-env-var.patch
2025-06-15 22:21:47.000000000 +0200
@@ -0,0 +1,77 @@
+From 7810f413579ddcf0f3fc5ee3dc9596cea63a7d20 Mon Sep 17 00:00:00 2001
+From: Lionel Duboeuf <[email protected]>
+Date: Wed, 12 Mar 2025 07:48:35 +0100
+Subject: [PATCH] Set ApplicationID according to APP_ID env var
+
+Signed-off-by: Mike Gabriel <[email protected]>
+---
+ src/config.hpp.in | 14 ++++++++++++++
+ src/main.cpp | 2 ++
+ src/qml/OnlineAccountsHelper.qml | 4 ++--
+ 3 files changed, 18 insertions(+), 2 deletions(-)
+
+--- a/src/config.hpp.in
++++ b/src/config.hpp.in
+@@ -20,6 +20,7 @@
+ #include <QString>
+
+ static const QString APP_DIR = qgetenv ("APP_DIR");
++static const QString APP_ID= qgetenv ("APP_ID");
+ static const QString LOCALE_DIR = QStringLiteral
("@CMAKE_INSTALL_FULL_LOCALEDIR@");
+
+ inline bool isRunningInstalled (void)
+@@ -51,3 +52,16 @@
+ return dir;
+ }
+
++inline QString applicationId (void)
++{
++ if (!APP_ID.isEmpty()) {
++ // APP_ID == $name_$application_$version (see
https://wiki.ubuntu.com/SecurityTeam/Specifications/ApplicationConfinement/Manifest#Click)
++ int lastUnderscore = APP_ID.lastIndexOf('_');
++ if (lastUnderscore != -1) {
++ return APP_ID.left(lastUnderscore);
++ }
++ return APP_ID;
++ } else {
++ return "@PROJECT_NAME@";
++ }
++}
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -16,6 +16,7 @@
+
+ #include <QGuiApplication>
+ #include <QQmlEngine>
++#include <QQmlContext>
+ #include <QCoreApplication>
+ #include <QUrl>
+ #include <QDir>
+@@ -38,6 +39,7 @@
+ bind_textdomain_codeset ("lomiri-calendar-app", "UTF-8");
+
+ QQuickView *view = new QQuickView();
++ view->rootContext()->setContextProperty("ApplicationID", applicationId());
+ view->setSource(QUrl("qrc:/calendar.qml"));
+ view->setResizeMode(QQuickView::SizeRootObjectToView);
+ view->show();
+--- a/src/qml/OnlineAccountsHelper.qml
++++ b/src/qml/OnlineAccountsHelper.qml
+@@ -50,7 +50,7 @@
+ anchors.fill: parent
+ clip: true
+ model: ProviderModel {
+- applicationId: "calendar.ubports_calendar"
++ applicationId: ApplicationID
+ }
+ delegate: ListItem {
+ ListItemLayout {
+@@ -84,7 +84,7 @@
+
+ Setup {
+ id: setup
+- applicationId: "calendar.ubports_calendar"
++ applicationId: ApplicationID
+ providerId: "google"
+ onFinished: {
+ PopupUtils.close(root.dialogInstance)
diff -Nru
lomiri-calendar-app-1.1.4/debian/patches/2002_fix-providers-not-shown-when-adding-new-OnlineAccount.patch
lomiri-calendar-app-1.1.4/debian/patches/2002_fix-providers-not-shown-when-adding-new-OnlineAccount.patch
---
lomiri-calendar-app-1.1.4/debian/patches/2002_fix-providers-not-shown-when-adding-new-OnlineAccount.patch
2025-05-05 12:42:15.000000000 +0200
+++
lomiri-calendar-app-1.1.4/debian/patches/2002_fix-providers-not-shown-when-adding-new-OnlineAccount.patch
1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-From b6277d10538d23682758ff2991d9a9db5c8eb6ce Mon Sep 17 00:00:00 2001
-From: Lionel Duboeuf <[email protected]>
-Date: Fri, 30 Aug 2024 16:56:16 +0200
-Subject: [PATCH] fix Providers not shown when adding a new Online Account. the
- applicationId must match the filename provided with the LOA ".application"
-
----
- src/qml/OnlineAccountsHelper.qml | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/qml/OnlineAccountsHelper.qml
b/src/qml/OnlineAccountsHelper.qml
-index 3a6b4b16..9f9fb69c 100644
---- a/src/qml/OnlineAccountsHelper.qml
-+++ b/src/qml/OnlineAccountsHelper.qml
-@@ -48,7 +48,7 @@ Item {
- anchors.fill: parent
- clip: true
- model: ProviderModel {
-- applicationId: "calendar.ubports_calendar"
-+ applicationId: "lomiri-calendar-app"
- }
- delegate: ListItem {
- ListItemLayout {
-@@ -82,7 +82,7 @@ Item {
-
- Setup {
- id: setup
-- applicationId: "calendar.ubports_calendar"
-+ applicationId: "lomiri-calendar-app"
- providerId: "google"
- onFinished: {
- PopupUtils.close(root.dialogInstance)
---
-GitLab
diff -Nru lomiri-calendar-app-1.1.4/debian/patches/series
lomiri-calendar-app-1.1.4/debian/patches/series
--- lomiri-calendar-app-1.1.4/debian/patches/series 2025-05-05
12:45:09.000000000 +0200
+++ lomiri-calendar-app-1.1.4/debian/patches/series 2025-06-15
22:21:47.000000000 +0200
@@ -1,6 +1,5 @@
2001_no-autopilot-tests.patch
0002_Migrate-to-new-QtContact-sqlite-backend.patch
-2002_fix-providers-not-shown-when-adding-new-OnlineAccount.patch
0011_EDS-mkCal-Initial-commit.patch
0012_fix-allDay-events-not-shown.patch
0013_Use-ButeoSync-profiles-for-sync-management.patch
@@ -15,3 +14,4 @@
0024-eds-mkcal-Allow-to-open-up-directly-an-event.patch
2003_hide-app-if-not-in-lomiri.patch
0025_fix-default-calendar-change.patch
+0003_Set-ApplicationID-according-to-APP_ID-env-var.patch
--- End Message ---
--- Begin Message ---
Unblocked lomiri-calendar-app.
--- End Message ---
