From dcecfa9d74c6b8c99615b09b4ce345bf7b71e6ce Mon Sep 17 00:00:00 2001 From: Amumug Date: Tue, 30 Dec 2025 15:13:37 +0100 Subject: [PATCH 1/5] lockbook flatpak builder package --- flatpak/lockbook.appdata.xml | 1 + flatpak/org.lockbook.Lockbook.json | 52 +++++++++++++++++++ flatpak/org.lockbook.Lockbook.template.json | 55 +++++++++++++++++++++ 3 files changed, 108 insertions(+) create mode 100644 flatpak/lockbook.appdata.xml create mode 100644 flatpak/org.lockbook.Lockbook.json create mode 100644 flatpak/org.lockbook.Lockbook.template.json diff --git a/flatpak/lockbook.appdata.xml b/flatpak/lockbook.appdata.xml new file mode 100644 index 0000000..12bbf74 --- /dev/null +++ b/flatpak/lockbook.appdata.xml @@ -0,0 +1 @@ + diff --git a/flatpak/org.lockbook.Lockbook.json b/flatpak/org.lockbook.Lockbook.json new file mode 100644 index 0000000..6cc4fbe --- /dev/null +++ b/flatpak/org.lockbook.Lockbook.json @@ -0,0 +1,52 @@ +{ + "app-id": "org.lockbook.Lockbook", + "runtime": "org.freedesktop.Platform", + "runtime-version": "23.08", + "sdk": "org.freedesktop.Sdk", + "sdk-extensions": [ + "org.freedesktop.Sdk.Extension.rust-stable" + ], + "command": "lockbook-linux", + "finish-args": [ + "--share=ipc", + "--filesystem=home:ro", + "--filesystem=xdg-config/wezterm", + "--socket=fallback-x11", + "--socket=wayland", + "--device=dri", + "--talk-name=org.freedesktop.Flatpak", + "--talk-name=org.freedesktop.Notifications", + "--share=network" + ], + "modules": [ + { + "name": "lockbook", + "buildsystem": "simple", + "build-options": { + "append-path": "/usr/lib/sdk/rust-stable/bin", + "env": { + "CARGO_HOME": "/run/build/lockbook/cargo" + } + }, + "build-commands": [ + "cargo --offline fetch --manifest-path Cargo.toml --verbose", + "cargo --offline build --release --verbose", + "mkdir -p /app/share/icons/hicolor/128x128/apps/", + "cp ./clients/linux/lockbook.png /app/share/icons/hicolor/128/apps/org.lockbook.Lockbook.png", + "mkdir -p /app/share/metainfo/", + "cp ./utils/dev/flatpak/lockbook.appdata.xml /app/share/metainfo/org.lockbook.Lockbook.appdata.xml", + "mkdir -p /app/share/applications/", + "cp ./utils/dev/snap-packages/lockbook-desktop/snap/gui/lockbook-desktop.desktop /app/shareapplications/org.lockbook.Lockbook.desktop", + ], + "sources": [ + { + "type": "dir", + "path": "../.." + }, + "generated-sources.json" + ] + } + ] +} + + diff --git a/flatpak/org.lockbook.Lockbook.template.json b/flatpak/org.lockbook.Lockbook.template.json new file mode 100644 index 0000000..b96570d --- /dev/null +++ b/flatpak/org.lockbook.Lockbook.template.json @@ -0,0 +1,55 @@ +{ + "app-id": "org.lockbook.Lockbook", + "runtime": "org.freedesktop.Platform", + "runtime-version": "23.08", + "sdk": "org.freedesktop.Sdk", + "sdk-extensions": [ + "org.freedesktop.Sdk.Extension.rust-stable" + ], + "command": "lockbook-linux", + "finish-args": [ + "--share=ipc", + "--filesystem=home:ro", + "--filesystem=xdg-config/wezterm", + "--socket=fallback-x11", + "--socket=wayland", + "--device=dri", + "--talk-name=org.freedesktop.Flatpak", + "--talk-name=org.freedesktop.Notifications", + "--share=network" + ], + "modules": [ + { + "name": "lockbook", + "buildsystem": "simple", + "build-options": { + "append-path": "/usr/lib/sdk/rust-stable/bin", + "env": { + "CARGO_HOME": "/run/build/lockbook/cargo" + } + }, + "build-commands": [ + "cargo --offline fetch --manifest-path Cargo.toml --verbose", + "cargo --offline build --release --verbose", + "install -Dm644 ./clients/linux/lockbook.png /app/share/icons/hicolor/128/apps/org.lockbook.Lockbook.png", + "install -Dm644 ./utils/dev/flatpak/lockbook.appdata.xml /app/share/metainfo/org.lockbook.Lockbook.appdata.xml", + "install -Dm644 ./utils/dev/snap-packages/lockbook-desktop/snap/gui/lockbook-desktop.desktop /app/shareapplications/org.lockbook.Lockbook.desktop", + ], + "sources": [ + { + "type": "archive", + "archive-type": "tar-gzip", + "url": "@URL@", + "sha256": "@SHA256@" + }, + { + "type": "file", + "path": "org.lockbook.Lockbook.appdata.xml" + }, + "generated-sources.json" + ] + } + ] +} + + From 7e2de1528c4a5aa34d2814d9975f028add96d2cd Mon Sep 17 00:00:00 2001 From: Amumug Date: Tue, 30 Dec 2025 17:56:43 +0100 Subject: [PATCH 2/5] remove a comma --- flatpak/org.lockbook.Lockbook.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flatpak/org.lockbook.Lockbook.json b/flatpak/org.lockbook.Lockbook.json index 6cc4fbe..dd12840 100644 --- a/flatpak/org.lockbook.Lockbook.json +++ b/flatpak/org.lockbook.Lockbook.json @@ -36,7 +36,7 @@ "mkdir -p /app/share/metainfo/", "cp ./utils/dev/flatpak/lockbook.appdata.xml /app/share/metainfo/org.lockbook.Lockbook.appdata.xml", "mkdir -p /app/share/applications/", - "cp ./utils/dev/snap-packages/lockbook-desktop/snap/gui/lockbook-desktop.desktop /app/shareapplications/org.lockbook.Lockbook.desktop", + "cp ./utils/dev/snap-packages/lockbook-desktop/snap/gui/lockbook-desktop.desktop /app/shareapplications/org.lockbook.Lockbook.desktop" ], "sources": [ { From 7aab09195237a89c2d94f44bc0b21358702b4175 Mon Sep 17 00:00:00 2001 From: Amumug Date: Wed, 31 Dec 2025 00:35:55 +0100 Subject: [PATCH 3/5] update --- rust-flatpak/Cargo.toml | 9 +++++++++ rust-flatpak/src/lockbook-appdata.xml | 1 + rust-flatpak/src/lockbook-desktop.desktop | 8 ++++++++ rust-flatpak/src/logo.svg | 8 ++++++++ rust-flatpak/src/main.rs | 3 +++ rust-flatpak/src/net.lockbook.Lockbook.json | 15 +++++++++++++++ 6 files changed, 44 insertions(+) create mode 100644 rust-flatpak/Cargo.toml create mode 100644 rust-flatpak/src/lockbook-appdata.xml create mode 100644 rust-flatpak/src/lockbook-desktop.desktop create mode 100644 rust-flatpak/src/logo.svg create mode 100644 rust-flatpak/src/main.rs create mode 100644 rust-flatpak/src/net.lockbook.Lockbook.json diff --git a/rust-flatpak/Cargo.toml b/rust-flatpak/Cargo.toml new file mode 100644 index 0000000..02d896b --- /dev/null +++ b/rust-flatpak/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "rust-flatpak" +version = "0.1.0" +authors = ["Amumug "] +edition = "2018" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] diff --git a/rust-flatpak/src/lockbook-appdata.xml b/rust-flatpak/src/lockbook-appdata.xml new file mode 100644 index 0000000..cf873b4 --- /dev/null +++ b/rust-flatpak/src/lockbook-appdata.xml @@ -0,0 +1 @@ + diff --git a/rust-flatpak/src/lockbook-desktop.desktop b/rust-flatpak/src/lockbook-desktop.desktop new file mode 100644 index 0000000..6fe6989 --- /dev/null +++ b/rust-flatpak/src/lockbook-desktop.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Comment=The private, polished note-taking platform. +Terminal=false +Exec=/home/amumu/.cargo/bin/lockbook-linux +Name=Lockbook +Icon=/home/amumu/Documents/lockbook/utils/dev/snap-packages/lockbook-desktop/snap/gui/logo.svg diff --git a/rust-flatpak/src/logo.svg b/rust-flatpak/src/logo.svg new file mode 100644 index 0000000..6de874b --- /dev/null +++ b/rust-flatpak/src/logo.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/rust-flatpak/src/main.rs b/rust-flatpak/src/main.rs new file mode 100644 index 0000000..e7a11a9 --- /dev/null +++ b/rust-flatpak/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("Hello, world!"); +} diff --git a/rust-flatpak/src/net.lockbook.Lockbook.json b/rust-flatpak/src/net.lockbook.Lockbook.json new file mode 100644 index 0000000..b61ddc5 --- /dev/null +++ b/rust-flatpak/src/net.lockbook.Lockbook.json @@ -0,0 +1,15 @@ +{ + "app-id": "net.lockbook.Lockbook", + "runtime": "org.freedesktop.Platform", + "runtime-version": "25.08", + "sdk": "org.freedesktop.Sdk", + "sdk-extensions" : [ + "org.freedesktop.Sdk.Extension.rust-stable" + ], + "command": "lockbook", + "finish-args": [ + "--socket=x11", + "--device=dri", + "--share=network" + ] +} From 4b6758a9fec8f4284bbdac37f87bc4927ea9d85f Mon Sep 17 00:00:00 2001 From: Amumug Date: Wed, 31 Dec 2025 15:31:36 +0100 Subject: [PATCH 4/5] manifest file --- rust-flatpak/src/net.lockbook.Lockbook.json | 33 ++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/rust-flatpak/src/net.lockbook.Lockbook.json b/rust-flatpak/src/net.lockbook.Lockbook.json index b61ddc5..2f9d87a 100644 --- a/rust-flatpak/src/net.lockbook.Lockbook.json +++ b/rust-flatpak/src/net.lockbook.Lockbook.json @@ -3,13 +3,44 @@ "runtime": "org.freedesktop.Platform", "runtime-version": "25.08", "sdk": "org.freedesktop.Sdk", - "sdk-extensions" : [ + "sdk-extensions": [ "org.freedesktop.Sdk.Extension.rust-stable" ], + "build-options": { + "append-path": "usr/lib/sdk/rust-stable/bin" + }, "command": "lockbook", "finish-args": [ "--socket=x11", "--device=dri", "--share=network" + ], + "modules": [ + { + "name": "lockbook", + "buildsystem": "cmake", + "build-commands": [ + "mkdir -p /app/share/icons/hicolor/128x128/apps/", + "cp /logo.svg /app/share/icons/hicolor/128x128/apps/net.lockbook.Lockbook.svg", + "mkdir -p /app/share/metainfo/", + "cp /lockbook-appdata.xml /app/share/metainfo/net.lockbook.Lockbook.appdata.xml", + "mkdir -p /app/share/applications", + "cp /lockbook-desktop.desktop /app/share/applications/net.lockbook.Lockbook.desktop" + ], + "sources": [ + "cargo-sources.json", + { + "type": "dir", + "path": "." + }, + { + "type": "shell", + "commands": [ + "mkdir -p .cargo", + "cp -vf cargo/config .cargo/config.toml" + ] + } + ] + } ] } From d7dff64238e1648504e38a26441693320ac956dc Mon Sep 17 00:00:00 2001 From: Amumug Date: Fri, 2 Jan 2026 02:31:41 +0100 Subject: [PATCH 5/5] manifest file --- rust-flatpak/src/net.lockbook.Lockbook.json | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/rust-flatpak/src/net.lockbook.Lockbook.json b/rust-flatpak/src/net.lockbook.Lockbook.json index 2f9d87a..bc4f3f4 100644 --- a/rust-flatpak/src/net.lockbook.Lockbook.json +++ b/rust-flatpak/src/net.lockbook.Lockbook.json @@ -20,6 +20,9 @@ "name": "lockbook", "buildsystem": "cmake", "build-commands": [ + "cargo --offline fetch --manifest-path Cargo.toml --verbose", + "cargo --offline build --release --verbose", + "cargo install --locked --path .", "mkdir -p /app/share/icons/hicolor/128x128/apps/", "cp /logo.svg /app/share/icons/hicolor/128x128/apps/net.lockbook.Lockbook.svg", "mkdir -p /app/share/metainfo/", @@ -28,17 +31,11 @@ "cp /lockbook-desktop.desktop /app/share/applications/net.lockbook.Lockbook.desktop" ], "sources": [ - "cargo-sources.json", { - "type": "dir", - "path": "." - }, - { - "type": "shell", - "commands": [ - "mkdir -p .cargo", - "cp -vf cargo/config .cargo/config.toml" - ] + "type": "git", + "url": "https://github.com/lockbook/lockbook/releases/download/25.12.15/lockbook-linux", + "tag": "0.9.3", + "commit": "010423e09dd64c250f8d63a2906aca80e2a0de5f" } ] }