From 93f145a20fd7690b27ce5c53da02c3567e4b04e0 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 22 Oct 2025 17:44:19 +0300 Subject: [PATCH 1/5] fix(forge): missing flatpak permissions (closes #7454) --- apps/desktop/electron-forge/forge.config.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/apps/desktop/electron-forge/forge.config.ts b/apps/desktop/electron-forge/forge.config.ts index 0b78b3e1f..0c0531c8e 100644 --- a/apps/desktop/electron-forge/forge.config.ts +++ b/apps/desktop/electron-forge/forge.config.ts @@ -70,7 +70,6 @@ const config: ForgeConfig = { ] }, rebuildConfig: { - force: true, extraModules: [ "better-sqlite3" ] }, makers: [ @@ -91,8 +90,20 @@ const config: ForgeConfig = { baseVersion: "24.08", baseFlatpakref: "https://flathub.org/repo/flathub.flatpakrepo", finishArgs: [ + // Wayland/X11 Rendering "--socket=fallback-x11", - "--socket=wayland" + "--socket=wayland", + "--share=ipc", + // Open GL + "--device=dri", + // Audio output + "--socket=pulseaudio", + // Read/write home directory access + "--filesystem=home", + // Allow communication with network + "--share=network", + // System notifications with libnotify + "--talk-name=org.freedesktop.Notifications", ], modules: [ { From cb3f941760930625a00a8d79e5c3bc814b28858f Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 22 Oct 2025 17:45:31 +0300 Subject: [PATCH 2/5] chore(forge): add script to make flatpak --- apps/desktop/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index ce08cfaf6..581c82df4 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -16,6 +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 && cross-env electron-forge make dist", + "electron-forge:make-flatpak": "cross-env 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" From f02af893bb707834d6aecffeb4995ea08daffdbd Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 22 Oct 2025 18:03:52 +0300 Subject: [PATCH 3/5] fix(forge): wrong exec in flatpak desktop template (closes #5516) --- apps/desktop/electron-forge/forge.config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/desktop/electron-forge/forge.config.ts b/apps/desktop/electron-forge/forge.config.ts index 0c0531c8e..47a91b4ed 100644 --- a/apps/desktop/electron-forge/forge.config.ts +++ b/apps/desktop/electron-forge/forge.config.ts @@ -84,6 +84,7 @@ const config: ForgeConfig = { config: { options: { ...baseLinuxMakerConfigOptions, + desktopTemplate: undefined, id: "com.triliumnext.notes", runtimeVersion: "24.08", base: "org.electronjs.Electron2.BaseApp", From 0b808b8db32a30b269fe570fe3463fcaeb29b20d Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 22 Oct 2025 18:05:38 +0300 Subject: [PATCH 4/5] fix(forge): missing icon in flatpak build --- apps/desktop/electron-forge/forge.config.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/desktop/electron-forge/forge.config.ts b/apps/desktop/electron-forge/forge.config.ts index 47a91b4ed..1dc5310ff 100644 --- a/apps/desktop/electron-forge/forge.config.ts +++ b/apps/desktop/electron-forge/forge.config.ts @@ -84,7 +84,10 @@ const config: ForgeConfig = { config: { options: { ...baseLinuxMakerConfigOptions, - desktopTemplate: undefined, + desktopTemplate: undefined, // otherwise it would put in the wrong exec + icon: { + "128x128": path.join(APP_ICON_PATH, "png/128x128.png"), + }, id: "com.triliumnext.notes", runtimeVersion: "24.08", base: "org.electronjs.Electron2.BaseApp", From 2cb3b877d148b212e6e1d669d209b5e5edfd2199 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 22 Oct 2025 18:24:34 +0300 Subject: [PATCH 5/5] chore(forge): fixup electron-forge:make scripts --- apps/desktop/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 581c82df4..1df37f089 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -15,8 +15,8 @@ "start-no-dir": "cross-env TRILIUM_PORT=37743 tsx ../../scripts/electron-start.mts src/main.ts", "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 && cross-env electron-forge make dist", - "electron-forge:make-flatpak": "cross-env electron-forge make dist --targets=@electron-forge/maker-flatpak", + "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: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"