Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions app/linux/flutter/generated_plugin_registrant.cc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <clipboard_watcher/clipboard_watcher_plugin.h>
#include <desktop_webview_window/desktop_webview_window_plugin.h>
#include <file_saver/file_saver_plugin.h>
#include <flutter_onnxruntime/flutter_onnxruntime_plugin.h>
#include <flutter_secure_storage_linux/flutter_secure_storage_linux_plugin.h>
#include <gtk/gtk_plugin.h>
#include <hotkey_manager_linux/hotkey_manager_linux_plugin.h>
Expand All @@ -33,9 +32,6 @@ void fl_register_plugins(FlPluginRegistry* registry) {
g_autoptr(FlPluginRegistrar) file_saver_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "FileSaverPlugin");
file_saver_plugin_register_with_registrar(file_saver_registrar);
g_autoptr(FlPluginRegistrar) flutter_onnxruntime_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterOnnxruntimePlugin");
flutter_onnxruntime_plugin_register_with_registrar(flutter_onnxruntime_registrar);
g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar =
fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin");
flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar);
Expand Down
1 change: 0 additions & 1 deletion app/linux/flutter/generated_plugins.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ list(APPEND FLUTTER_PLUGIN_LIST
clipboard_watcher
desktop_webview_window
file_saver
flutter_onnxruntime
flutter_secure_storage_linux
gtk
hotkey_manager_linux
Expand Down
19 changes: 11 additions & 8 deletions app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix.
version: 1.0.64+82
version: 1.0.65+83
environment:
sdk: ^3.12.2

Expand Down Expand Up @@ -85,13 +85,16 @@ dependencies:
# Wi-Fi gate for the 330 MB model download (data/wifi_watch.dart).
connectivity_plus: ^7.3.2
# flutter_onnxruntime is served from app/vendor: the pub.dev copy, minus its
# macOS platform. Only mobile.dart uses it (the phone's query encoder); the
# desktop embeds through relic-sift. Its macOS Swift package requires macOS
# 14, and Relic's Mac floor is 11, so the macOS build fails with the pub
# copy. The vendored copy is byte-identical for the other platforms. To
# upgrade: copy the new pub version over app/vendor/flutter_onnxruntime,
# drop its macos/ folder and the macos: entry under flutter.plugin.platforms,
# and bump the constraint above.
# macOS and Linux platforms. Only mobile.dart uses it (the phone's query
# encoder); the desktop embeds through relic-sift. Its macOS Swift package
# requires macOS 14, and Relic's Mac floor is 11, so the macOS build fails
# with the pub copy. On Linux the plugin linked relic_app against
# libonnxruntime.so.1, which the bundle shipped only as a dangling symlink,
# so 1.0.60 to 1.0.64 would not start on a machine without ONNX Runtime 1.22
# installed. The vendored copy is byte-identical for the other platforms. To
# upgrade: copy the new pub version over app/vendor/flutter_onnxruntime, drop
# its macos/ and linux/ folders and those entries under
# flutter.plugin.platforms, and bump the constraint above.
dependency_overrides:
flutter_onnxruntime:
path: vendor/flutter_onnxruntime
Expand Down
14 changes: 14 additions & 0 deletions app/scripts/build_release_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,20 @@ Uninstall: delete this folder, then
Your vault lives in ~/.local/share/relic — delete that too if you mean it.
EOF

# Refuse to pack a bundle that cannot start. 1.0.60 to 1.0.64 shipped
# lib/libonnxruntime.so pointing at a file that was not there, and relic_app
# needed it, so the app died at launch on any machine without that library.
# The build machine's own libraries hide this, so check the bundle itself:
# no dangling symlinks, and every library the app and its plugins need either
# in the bundle or a normal system package.
echo "==> checking the bundle's libraries"
dangling=$(find "$STAGE" -xtype l)
[[ -z "$dangling" ]] || { echo "dangling symlinks in the bundle:" >&2; echo "$dangling" >&2; exit 1; }
missing=$(for f in "$STAGE/relic_app" "$STAGE"/lib/*.so; do
LD_LIBRARY_PATH="$STAGE/lib" ldd "$f" 2>/dev/null | grep 'not found' | grep -v 'libjvm.so' | sed "s|^|$(basename "$f"): |" || true
done)
[[ -z "$missing" ]] || { echo "libraries the bundle needs but does not have:" >&2; echo "$missing" >&2; exit 1; }

mkdir -p "$DIST"
TARBALL="$DIST/relic-$VER-linux-x64.tar.gz"
rm -f "$TARBALL"
Expand Down
308 changes: 0 additions & 308 deletions app/vendor/flutter_onnxruntime/linux/CMakeLists.txt

This file was deleted.

Loading
Loading