From 4e73f2016577bdf9c7ab4bdd8fe396256e42cd82 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Tue, 11 Nov 2025 13:37:35 +0200
Subject: [PATCH 1/3] fix(flatpak): system tray missing

---
 apps/desktop/electron-forge/forge.config.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/desktop/electron-forge/forge.config.ts b/apps/desktop/electron-forge/forge.config.ts
index 1dc5310ff..8d279d59b 100644
--- a/apps/desktop/electron-forge/forge.config.ts
+++ b/apps/desktop/electron-forge/forge.config.ts
@@ -108,6 +108,8 @@ const config: ForgeConfig = {
                         "--share=network",
                         // System notifications with libnotify
                         "--talk-name=org.freedesktop.Notifications",
+                        // System tray
+                        "--talk-name=org.kde.StatusNotifierWatcher"
                     ],
                     modules: [
                         {

From a45b1474624d71543a999c58bd16cdf2f96b0492 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Tue, 11 Nov 2025 13:41:18 +0200
Subject: [PATCH 2/3] fix(flatpak): global shortcuts not working (closes #7563)

---
 apps/desktop/src/main.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
index a94709107..57e0492f2 100644
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -39,11 +39,16 @@ async function main() {
         app.commandLine.appendSwitch("disable-smooth-scrolling");
     }
 
-    // Electron 36 crashes with "Using GTK 2/3 and GTK 4 in the same process is not supported" on some distributions.
-    // See https://github.com/electron/electron/issues/46538 for more info.
     if (process.platform === "linux") {
         app.setName(PRODUCT_NAME);
+
+        // Electron 36 crashes with "Using GTK 2/3 and GTK 4 in the same process is not supported" on some distributions.
+        // See https://github.com/electron/electron/issues/46538 for more info.
         app.commandLine.appendSwitch("gtk-version", "3");
+
+        // Enable global shortcuts in Flatpak
+        // the app runs in a Wayland session.
+        app.commandLine.appendSwitch("enable-features", "GlobalShortcutsPortal");
     }
 
     // Quit when all windows are closed, except on macOS. There, it's common

From e8dc19a1a63252a4e25caa78b3ad0892f9c1e205 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Tue, 11 Nov 2025 13:49:00 +0200
Subject: [PATCH 3/3] chore(forge): display logs when building for flatpak

---
 apps/desktop/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index f4bb4118f..0e171f4f5 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -16,7 +16,7 @@
     "build": "tsx scripts/build.ts",
     "start-prod": "pnpm build && cross-env TRILIUM_DATA_DIR=data TRILIUM_PORT=37841 ELECTRON_IS_DEV=0 electron dist",
     "electron-forge:make": "pnpm build && electron-forge make dist",
-    "electron-forge:make-flatpak": "pnpm build && electron-forge make dist --targets=@electron-forge/maker-flatpak",
+    "electron-forge:make-flatpak": "pnpm build && DEBUG=* electron-forge make dist --targets=@electron-forge/maker-flatpak",
     "electron-forge:package": "pnpm build && electron-forge package dist",
     "electron-forge:start": "pnpm build && electron-forge start dist",
     "e2e": "pnpm build && cross-env TRILIUM_INTEGRATION_TEST=memory-no-store TRILIUM_PORT=8082 TRILIUM_DATA_DIR=data-e2e ELECTRON_IS_DEV=0 playwright test"