EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust
fix(linux): enable font-free Wayland window controls
Daniel0605406c50da
diff --git a/Cargo.lock b/Cargo.lockindex 412fb6672..0c26f0a07 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -1495,7 +1495,7 @@ dependencies = ["effectcraft-raster","kurbo","linesweeper",- "tiny-skia",+ "tiny-skia 0.12.0",][[package]]@@ -4581,6 +4581,17 @@ version = "1.2.0"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"+[[package]]+name = "sctk-adwaita"+version = "0.10.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "b6277f0217056f77f1d8f49f2950ac6c278c0d607c45f5ee99328d792ede24ec"+dependencies = [+ "log",+ "smithay-client-toolkit 0.19.2",+ "tiny-skia 0.11.4",+]+[[package]]name = "self_cell"version = "1.3.0"@@ -5217,6 +5228,20 @@ dependencies = ["time-core",]+[[package]]+name = "tiny-skia"+version = "0.11.4"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab"+dependencies = [+ "arrayref",+ "arrayvec",+ "bytemuck",+ "cfg-if",+ "log",+ "tiny-skia-path 0.11.4",+]+[[package]]name = "tiny-skia"version = "0.12.0"@@ -5228,7 +5253,18 @@ dependencies = ["bytemuck","cfg-if","log",- "tiny-skia-path",+ "tiny-skia-path 0.12.0",+]++[[package]]+name = "tiny-skia-path"+version = "0.11.4"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93"+dependencies = [+ "arrayref",+ "bytemuck",+ "strict-num",][[package]]@@ -6505,6 +6541,7 @@ dependencies = ["raw-window-handle","redox_syscall 0.4.1","rustix 0.38.44",+ "sctk-adwaita","smithay-client-toolkit 0.19.2","smol_str","tracing",diff --git a/NOTICE b/NOTICEindex 43bd2e2a9..718d12cef 100644--- a/NOTICE+++ b/NOTICE@@ -20,3 +20,45 @@ The optional PDF document reader uses craft-pdf and Hayro-syntax 0.7.2, MIT OR AThe shared patched syntax source is centralized in storytold/craft-libs, transferred fromPdfCraft revision 9ed3abe4907a127d36b12fbfeee71d7e26248da1. This parser-only use embeds noHayro fonts, CMaps or image codecs; EffectCraft keeps its existing fonts and drawing filters.++Linux Wayland window decorations+-------------------------------+sctk-adwaita 0.10.1 (https://github.com/PolyMeilex/sctk-adwaita,+commit d5f343c45c04d4a026db57f76760819b7325db00) is used by winit on Linux+for vector window controls. Its title-font features are disabled: no Cantarell+font is embedded by this dependency and no font file is added to this repo.++sctk-adwaita's MIT licence:++MIT License++Copyright (c) 2022 Bartłomiej Maryńczak++Permission is hereby granted, free of charge, to any person obtaining a copy+of this software and associated documentation files (the "Software"), to deal+in the Software without restriction, including without limitation the rights+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell+copies of the Software, and to permit persons to whom the Software is+furnished to do so, subject to the following conditions:++The above copyright notice and this permission notice shall be included in all+copies or substantial portions of the Software.++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE+SOFTWARE.++Bundled application fonts+-------------------------+Inter (assets/fonts/Inter-*.ttf) — SIL Open Font License 1.1. See assets/fonts/OFL-Inter.txt.+Noto Serif (assets/fonts/NotoSerif-Regular.ttf) — SIL Open Font License 1.1. See assets/fonts/OFL-NotoSerif.txt.+JetBrains Mono (assets/fonts/JetBrainsMono-Regular.ttf) — SIL Open Font License 1.1. See assets/fonts/OFL-JetBrainsMono.txt.++The optional PDF document reader uses craft-pdf and Hayro-syntax 0.7.2, MIT OR Apache-2.0.+The shared patched syntax source is centralized in storytold/craft-libs, transferred from+PdfCraft revision 9ed3abe4907a127d36b12fbfeee71d7e26248da1. This parser-only use embeds no+Hayro fonts, CMaps or image codecs; EffectCraft keeps its existing fonts and drawing filters.diff --git a/apps/effectcraft/Cargo.toml b/apps/effectcraft/Cargo.tomlindex 5ad6c80d1..52ed374ae 100644--- a/apps/effectcraft/Cargo.toml+++ b/apps/effectcraft/Cargo.toml@@ -27,6 +27,9 @@ cpal = { workspace = true }log = { workspace = true }[target.'cfg(target_os = "linux")'.dependencies]+# Native GNOME/Wayland controls without a bundled title font.+winit = { version = "0.30", default-features = false, features = ["wayland-csd-adwaita-notitle"] }+# Settings ▸ Appearance ▸ Sync with System: the XDG desktop portal's colour scheme. Already in# Cargo.lock (accesskit, through eframe), so it adds no new crates.zbus = "5.19"diff --git a/packaging/env.sh b/packaging/env.shindex 6a1bfa286..f1943f777 100644--- a/packaging/env.sh+++ b/packaging/env.sh@@ -47,7 +47,7 @@ warn() {# Copy licence and readme files that exist into a package directory.copy_docs() {local dest="$1" f- for f in README.md LICENSE LICENSE-MIT LICENSE-APACHE COPYRIGHT; do+ for f in README.md LICENSE LICENSE-MIT LICENSE-APACHE COPYRIGHT NOTICE; doif [ -f "$ROOT/$f" ]; then cp "$ROOT/$f" "$dest/"; fidone}diff --git a/packaging/linux/flatpak/ai.storyteller.effectcraft.yml b/packaging/linux/flatpak/ai.storyteller.effectcraft.ymlindex be9f898ed..7dd7a8d68 100644--- a/packaging/linux/flatpak/ai.storyteller.effectcraft.yml+++ b/packaging/linux/flatpak/ai.storyteller.effectcraft.yml@@ -55,6 +55,7 @@ modules:build-commands:- cargo --offline build --release --locked -p effectcraft -p effectcraft-cli- install -Dm755 target/release/effectcraft /app/bin/effectcraft+ - install -Dm644 NOTICE /app/share/doc/effectcraft/NOTICE- install -Dm755 target/release/effectcraft-cli /app/bin/effectcraft-cli- install -Dm644 packaging/linux/ai.storyteller.effectcraft.desktop /app/share/applications/ai.storyteller.effectcraft.desktop- install -Dm644 packaging/linux/ai.storyteller.effectcraft.mime.xml /app/share/mime/packages/ai.storyteller.effectcraft.xmldiff --git a/packaging/linux/package.sh b/packaging/linux/package.shindex f149e663d..504d2c5b8 100755--- a/packaging/linux/package.sh+++ b/packaging/linux/package.sh@@ -106,6 +106,8 @@ if has appimage; thenAPPDIR="$WORK/EffectCraft.AppDir"cp -R "$STAGE" "$APPDIR"mv "$APPDIR/usr/share/doc" "$WORK/doc-unused"+ # Keep sctk-adwaita's MIT notice in the AppImage.+ install -Dm644 "$ROOT/NOTICE" "$APPDIR/usr/share/doc/effectcraft/NOTICE"ln -s usr/bin/effectcraft "$APPDIR/AppRun"cp "$HERE/$APP_ID.desktop" "$APPDIR/$APP_ID.desktop"cp "$ROOT/assets/app-icon/hicolor/256x256/apps/$APP_ID.png" "$APPDIR/$APP_ID.png"