Merge latest upstream main and resolve GNOME Wayland control conflicts

This commit is contained in:
Daniel committed 2026-10-26 00:01:27 +01:00
commit 6801caeb43
167 files changed
+10611 -1890

No files matched your search

@@ -56,6 +56,7 @@ modules:
- 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 -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.xml
Regular → Executable
-1
View File
@@ -125,7 +125,6 @@ if has appimage; then
fi
APPDIR="$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"