Merge tested main for Flatpak update patch release

chore: bump version to 0.20.1 for the Flatpak update fix (#3084 )
Release 0.20.1: repair Flatpak update checks and self-updates (#3078 )
2026-11-11 16:32:22 -06:00 · 2026-11-11 15:25:57 -05:00 · 2026-11-11 14:55:43 -05:00 · 2026-11-11 14:27:14 -05:00 · 2026-11-11 14:24:01 -05:00 · 2026-11-11 16:38:54 +01:00
5 changed files with 48 additions and 17 deletions
@@ -614,7 +614,7 @@ checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"

 [[package]]
 name = "cadcraft"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
 "cadcraft-engine",
 "cadcraft-io",
@@ -645,7 +645,7 @@ dependencies = [

 [[package]]
 name = "cadcraft-cli"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
 "cadcraft-engine",
 "cadcraft-io",
@@ -661,14 +661,14 @@ dependencies = [

 [[package]]
 name = "cadcraft-color"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
 "serde",
 ]

 [[package]]
 name = "cadcraft-constraints"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
 "cadcraft-doc",
 "cadcraft-geom",
@@ -678,7 +678,7 @@ dependencies = [

 [[package]]
 name = "cadcraft-doc"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
 "cadcraft-color",
 "cadcraft-geom",
@@ -689,7 +689,7 @@ dependencies = [

 [[package]]
 name = "cadcraft-dwg"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
 "acadrust",
 "log",
@@ -697,7 +697,7 @@ dependencies = [

 [[package]]
 name = "cadcraft-dxf"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
 "encoding_rs",
 "log",
@@ -706,7 +706,7 @@ dependencies = [

 [[package]]
 name = "cadcraft-engine"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
 "cadcraft-color",
 "cadcraft-constraints",
@@ -727,7 +727,7 @@ dependencies = [

 [[package]]
 name = "cadcraft-fonts"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
 "cadcraft-dxf",
 "cadcraft-geom",
@@ -740,14 +740,14 @@ dependencies = [

 [[package]]
 name = "cadcraft-geom"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
 "serde",
 ]

 [[package]]
 name = "cadcraft-io"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
 "acadrust",
 "cadcraft-color",
@@ -769,7 +769,7 @@ dependencies = [

 [[package]]
 name = "cadcraft-mcp"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
 "cadcraft-engine",
 "cadcraft-io",
@@ -784,7 +784,7 @@ dependencies = [

 [[package]]
 name = "cadcraft-render"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
 "cadcraft-color",
 "cadcraft-doc",
@@ -798,7 +798,7 @@ dependencies = [

 [[package]]
 name = "cadcraft-ui-egui"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
 "cadcraft-color",
 "cadcraft-doc",
@@ -825,7 +825,7 @@ dependencies = [

 [[package]]
 name = "cadcraft-web"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
 "cadcraft-engine",
 "cadcraft-fonts",
@@ -5994,7 +5994,7 @@ checksum = "9440ea3e5aeabb0ac63af70daf835274065238cdd0cec83418f417eae38bacee"

 [[package]]
 name = "xtask"
-version = "0.20.0"
+version = "0.20.1"
 dependencies = [
 "chrono",
 "serde_json",
@@ -4,7 +4,7 @@ members = ["crates/*", "apps/*", "xtask"]
 # default-members

 [workspace.package]
-version = "0.20.0"
+version = "0.20.1"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 rust-version = "1.95"
@@ -0,0 +1,27 @@
+//! Release and source Flatpaks must allow release checks and host update helpers.
+fn finish_args(manifest: &str) -> Vec<&str> {
+    manifest
+        .split("finish-args:")
+        .nth(1)
+        .unwrap_or_default()
+        .lines()
+        .take_while(|line| line.is_empty() || line.starts_with(' ') || line.starts_with('#'))
+        .filter_map(|line| line.trim().strip_prefix("- "))
+        .map(|arg| arg.trim_matches(['\'', '"']))
+        .collect()
+}
+
+#[test]
+fn flatpak_update_permissions() {
+    let manifests = [
+        include_str!("../../../packaging/linux/flatpak/ai.storyteller.cadcraft.bundle.yml"),
+        include_str!("../../../packaging/linux/flatpak/ai.storyteller.cadcraft.yml"),
+    ];
+    let args = manifests.map(finish_args);
+    assert_eq!(args[0], args[1], "source and release permissions must agree");
+    for permissions in args {
+        for required in ["--share=network", "--talk-name=org.freedesktop.Flatpak"] {
+            assert!(permissions.contains(&required), "missing update permission: {required}");
+        }
+    }
+}
@@ -17,6 +17,8 @@ runtime-version: '26.08'
 sdk: org.freedesktop.Sdk
 command: cadcraft
 finish-args:
+  # The shared updater inspects and updates this installation via flatpak-spawn --host.
+  - --talk-name=org.freedesktop.Flatpak
  - --filesystem=xdg-data/ArtCraft/versions:ro
  # Display: Wayland first; X11 only when no Wayland compositor is running.
  - --socket=wayland
@@ -18,6 +18,8 @@ sdk-extensions:
  - org.freedesktop.Sdk.Extension.rust-stable
 command: cadcraft
 finish-args:
+  # The shared updater inspects and updates this installation via flatpak-spawn --host.
+  - --talk-name=org.freedesktop.Flatpak
  - --filesystem=xdg-data/ArtCraft/versions:ro
  # Display: Wayland first; X11 only when no Wayland compositor is running.
  - --socket=wayland
Author	SHA1	Message	Date
Dylan M. Taylor	7526dc62c1	Merge tested main for Flatpak update patch release	2026-11-11 15:25:57 -05:00
Dylan M. Taylor	e1d379ad9f	chore: bump version to 0.20.1 for the Flatpak update fix (#3084 )	2026-11-11 14:55:43 -05:00
Dylan M. Taylor	161af2a8da	Release 0.20.1: repair Flatpak update checks and self-updates (#3078 ) * Release 0.20.1: fix Flatpak update permissions * test: avoid unchecked option parsing in Flatpak regression	2026-11-11 14:27:14 -05:00
Dylan M. Taylor	dc7f382cec	Fix Flatpak permissions for update checks and self-updates (#3075 ) * fix(flatpak): allow release checks and self-update helpers * test: keep Flatpak permission parsing within strict Clippy rules	2026-11-11 14:24:01 -05:00
FredApps	28241abb8f	Merge main into release for CADCraft v0.20.0	2026-11-11 16:38:54 +01:00
FredAppsand.CooCoo	51f5bbcc21	Fonts: the MTEXT strip test expects a short \U+ escape to keep its digits (#2954 ) (#3024 ) strips_formatting expected `\U+12` to strip to nothing. plain_mtext dropped every unknown code up to the next `;` when that assertion was written. #1036 limits this to the codes in takes_arg, and `\U` is not one of them, so plain_mtext returns `+12`. The layout and paragraph paths give the same text, and unicode_escapes_are_decoded_in_every_parser already expects it. The test has failed on main since both changes merged, and the failure stops the gate at its test step. The test module now also checks the short escape in both layout paths. (cherry picked from commit `6f0f1fefa8`) Co-authored-by: .CooCoo <RobertLeeLW@gmail.com>	2026-11-10 19:49:24 +01:00
Dylan M. Taylor	227e3c385b	Release 0.19.0	2026-11-09 06:29:44 -05:00