diff --git a/package.json b/package.json index 25f7ed5da1..65a676d2a5 100644 --- a/package.json +++ b/package.json @@ -165,7 +165,7 @@ }, "devDependencies": { "@noble/hashes": "^2.0.1", - "@tauri-apps/cli": "2.11.4", + "@tauri-apps/cli": "2.12.6", "@vitejs/plugin-react": "^4.6.0", "copyfiles": "^2.4.1", "cross-env": "^10.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3299362c27..dd0794ec99 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -36,8 +36,8 @@ importers: specifier: ^2.0.1 version: 2.0.1 '@tauri-apps/cli': - specifier: 2.11.4 - version: 2.11.4 + specifier: 2.12.6 + version: 2.12.6 '@vitejs/plugin-react': specifier: ^4.6.0 version: 4.7.0(vite@7.3.1(@types/node@22.19.7)(jiti@2.6.1)(sass@1.97.3)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)) @@ -2006,71 +2006,142 @@ packages: cpu: [arm64] os: [darwin] + '@tauri-apps/cli-darwin-arm64@2.12.6': + resolution: {integrity: sha512-Uokwk1hFfJoG54+kD8iU0St33jAIkNvojnjEfBZ6UbL5rnM10AiFwUS/2DHTJ9R4/Kba4U44v7djfMuWFTQgeg==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + '@tauri-apps/cli-darwin-x64@2.11.4': resolution: {integrity: sha512-uFsGQAAfuyz1k/yGLmkWfkBlgKAqZfxqlHmLWx81QU27RJWfmbNHCIq8T8w1e+VClleIuZUjpHWfoE4E3DLo3A==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] + '@tauri-apps/cli-darwin-x64@2.12.6': + resolution: {integrity: sha512-WhahqzcyHCpCzh4Taf0ZbBm6nGkvuOSh5ffrgOO7EdYaYe+RBQK8LOlFu+bbjul5v9cdLDi3kco+0+7IlZtTVA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + '@tauri-apps/cli-linux-arm-gnueabihf@2.11.4': resolution: {integrity: sha512-IaHZn5CdBL21oUmjiVOS1ctw6Ip1O0pjp70FwOWmYz1myWe0SY96ZIj2FYf7pT0m8bI2h/hrs5ZbEXXh44/MkQ==} engines: {node: '>= 10'} cpu: [arm] os: [linux] + '@tauri-apps/cli-linux-arm-gnueabihf@2.12.6': + resolution: {integrity: sha512-GB6weN+iFHxiFZ9SOKW6fINis7gnxohoOldR7sryBe7uaavkFGaMCa0yQs5njeXPWvzlE9WTQ13z8oDjmqK+Ww==} + engines: {node: '>= 10'} + cpu: [arm] + os: [linux] + '@tauri-apps/cli-linux-arm64-gnu@2.11.4': resolution: {integrity: sha512-N41/ukTRVe6XSuUTESuFdGeOW2i7k62tK+6gHK5Kd5/q5RPvvi19GaWAVPPb9u95HSGmTChSolBfzynUsssFaA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] + '@tauri-apps/cli-linux-arm64-gnu@2.12.6': + resolution: {integrity: sha512-mdHoUFYKfztUtPKE0C2hhGkEo7j6swXjg+5yRRKSD7A2gLkRPQFIXWD/DAYhiJdeAkyA8MCP6nvvKvg/4YryWQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + '@tauri-apps/cli-linux-arm64-musl@2.11.4': resolution: {integrity: sha512-v277UnT/fB64xAfSroL5N3Km3tLmvATWqJJw/wRI+g6o+HkeD0slyE7gOhNs1MbjE41R7bQOTxMVoL3aomUJmw==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] + '@tauri-apps/cli-linux-arm64-musl@2.12.6': + resolution: {integrity: sha512-2BxB+9a3JRN0eJ0t0qGe8IKJfgBLOZDE8a499OXH+yg4J9bMpSK1oHXBxnHuSHFWhby4QnQ/t+sBf7tRC0UZeA==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + '@tauri-apps/cli-linux-riscv64-gnu@2.11.4': resolution: {integrity: sha512-qqgNkQ2u1yZHxjhxsZaxUtRDW8dIqIYm33rx/mzwQv0SfY9x1B+iraj8vWeFiXjjSVVhEMepXSOts1TqPzvXNQ==} engines: {node: '>= 10'} cpu: [riscv64] os: [linux] + '@tauri-apps/cli-linux-riscv64-gnu@2.12.6': + resolution: {integrity: sha512-sb58RsNHex9QVqHdN1cf9MMlamUWAtk1NzuxTZalUnBUHfblIbe71hfmdI6whDZ84MufgOdeg/bzvhrbZS1r0w==} + engines: {node: '>= 10'} + cpu: [riscv64] + os: [linux] + '@tauri-apps/cli-linux-x64-gnu@2.11.4': resolution: {integrity: sha512-2VRNWl84FOH0m2giiDkO2h0QXlcMJeX+zJDpI5kDIQAx6s+geF3v48F4DXfJez4GS/FdoDGnPnw1C2iYGbQ7bQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + '@tauri-apps/cli-linux-x64-gnu@2.12.6': + resolution: {integrity: sha512-ZAb4/CHRma3ErjL2RGfHjITTUBIs4zySf0hIli9BddOtEdSx0ze0hEgxl+HfBVc5OEW/QmbiZ2E2+CkkHc8Pcg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + '@tauri-apps/cli-linux-x64-musl@2.11.4': resolution: {integrity: sha512-o9GyhYor/nc7xarmwDE3ka2szuW3uuZzXjHWh64Q8YX5AtSgxdQkFWzrY4O8KiGtVNvFBI14H3Q49Qj5TOIP/A==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + '@tauri-apps/cli-linux-x64-musl@2.12.6': + resolution: {integrity: sha512-ueSzM2Du6r4i1d/lby9kEvrhPnXw5zM/VYvcW1ldEWSpkUyVohsBXkmD+U7vMskEW5tXeCUenki7nYVxyGBGpQ==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + '@tauri-apps/cli-win32-arm64-msvc@2.11.4': resolution: {integrity: sha512-ld5Ehb598m0VkYyylRPNeCFsBe/km0jxis6KgMpl3IGY6I/i1RwQXO05I1AsXUXO2WC6AvB/Lw4qTf/asiuEiQ==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] + '@tauri-apps/cli-win32-arm64-msvc@2.12.6': + resolution: {integrity: sha512-6bmOt2BQSe0Bba+5CJcTKSML7VOYDxyiAKyBrjo86VxMdC1usIQmklu3Xc83s3QoK1rOMwwbANlPF6i5R2mvIg==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [win32] + '@tauri-apps/cli-win32-ia32-msvc@2.11.4': resolution: {integrity: sha512-12Hxi0XX/H5VFxO/bGgHkFWhml9VMgEOu9CidjeCeTNQ1l6fpUlbiGgSP7CLI3PFtW9/FfbeHieZ+kyWK5H7CA==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] + '@tauri-apps/cli-win32-ia32-msvc@2.12.6': + resolution: {integrity: sha512-9q9ZFNuFreBczwyJuhhlrEOBzGClwWUYirQ2GBl66Y6EaNl17IdLH8TRqoY9wYB1LnctNBi+Fa/WMGtFA4BtFQ==} + engines: {node: '>= 10'} + cpu: [ia32] + os: [win32] + '@tauri-apps/cli-win32-x64-msvc@2.11.4': resolution: {integrity: sha512-+vDiqBIU5dMISg/wNvX3sF+ZHfgJGJ5T0AcO+EHNXV9GGAG+P5fzodlDXD3QdKCRgZxMoCm5PPvj3BqLNjBthw==} engines: {node: '>= 10'} cpu: [x64] os: [win32] + '@tauri-apps/cli-win32-x64-msvc@2.12.6': + resolution: {integrity: sha512-ion7Chbj21ROxMRpjQ7G8rz5sIOaI7IoBQum1oq5sl1V5zGWyc/oYnCrQhVqO2TxK/lBDWxt648BzLi02SY3Xg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] + '@tauri-apps/cli@2.11.4': resolution: {integrity: sha512-R8xGtMpwyetawSqm9kYOuMmEqkhUbvcUy8n0aNXIxollKBLESUu5f4Fx+64hgASYm1H+jSWq6jCW6zqTnH6hqQ==} engines: {node: '>= 10'} hasBin: true + '@tauri-apps/cli@2.12.6': + resolution: {integrity: sha512-/cOeQgqq8PBDPODOjjT0YHs4qxKCHcQMWMiBm4rLM3JNr9mZE+PHNKOK4zAkhIUtYMNL/0fweW48VNvzD1AbqA==} + engines: {node: '>= 10'} + hasBin: true + '@tauri-apps/plugin-autostart@2.5.1': resolution: {integrity: sha512-zS/xx7yzveCcotkA+8TqkI2lysmG2wvQXv2HGAVExITmnFfHAdj1arGsbbfs3o6EktRHf6l34pJxc3YGG2mg7w==} @@ -7404,36 +7475,69 @@ snapshots: '@tauri-apps/cli-darwin-arm64@2.11.4': optional: true + '@tauri-apps/cli-darwin-arm64@2.12.6': + optional: true + '@tauri-apps/cli-darwin-x64@2.11.4': optional: true + '@tauri-apps/cli-darwin-x64@2.12.6': + optional: true + '@tauri-apps/cli-linux-arm-gnueabihf@2.11.4': optional: true + '@tauri-apps/cli-linux-arm-gnueabihf@2.12.6': + optional: true + '@tauri-apps/cli-linux-arm64-gnu@2.11.4': optional: true + '@tauri-apps/cli-linux-arm64-gnu@2.12.6': + optional: true + '@tauri-apps/cli-linux-arm64-musl@2.11.4': optional: true + '@tauri-apps/cli-linux-arm64-musl@2.12.6': + optional: true + '@tauri-apps/cli-linux-riscv64-gnu@2.11.4': optional: true + '@tauri-apps/cli-linux-riscv64-gnu@2.12.6': + optional: true + '@tauri-apps/cli-linux-x64-gnu@2.11.4': optional: true + '@tauri-apps/cli-linux-x64-gnu@2.12.6': + optional: true + '@tauri-apps/cli-linux-x64-musl@2.11.4': optional: true + '@tauri-apps/cli-linux-x64-musl@2.12.6': + optional: true + '@tauri-apps/cli-win32-arm64-msvc@2.11.4': optional: true + '@tauri-apps/cli-win32-arm64-msvc@2.12.6': + optional: true + '@tauri-apps/cli-win32-ia32-msvc@2.11.4': optional: true + '@tauri-apps/cli-win32-ia32-msvc@2.12.6': + optional: true + '@tauri-apps/cli-win32-x64-msvc@2.11.4': optional: true + '@tauri-apps/cli-win32-x64-msvc@2.12.6': + optional: true + '@tauri-apps/cli@2.11.4': optionalDependencies: '@tauri-apps/cli-darwin-arm64': 2.11.4 @@ -7448,6 +7552,20 @@ snapshots: '@tauri-apps/cli-win32-ia32-msvc': 2.11.4 '@tauri-apps/cli-win32-x64-msvc': 2.11.4 + '@tauri-apps/cli@2.12.6': + optionalDependencies: + '@tauri-apps/cli-darwin-arm64': 2.12.6 + '@tauri-apps/cli-darwin-x64': 2.12.6 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.12.6 + '@tauri-apps/cli-linux-arm64-gnu': 2.12.6 + '@tauri-apps/cli-linux-arm64-musl': 2.12.6 + '@tauri-apps/cli-linux-riscv64-gnu': 2.12.6 + '@tauri-apps/cli-linux-x64-gnu': 2.12.6 + '@tauri-apps/cli-linux-x64-musl': 2.12.6 + '@tauri-apps/cli-win32-arm64-msvc': 2.12.6 + '@tauri-apps/cli-win32-ia32-msvc': 2.12.6 + '@tauri-apps/cli-win32-x64-msvc': 2.12.6 + '@tauri-apps/plugin-autostart@2.5.1': dependencies: '@tauri-apps/api': 2.11.1 diff --git a/scripts/ci/verify-linux-desktop-package.sh b/scripts/ci/verify-linux-desktop-package.sh index 9480b4332e..7114de0635 100755 --- a/scripts/ci/verify-linux-desktop-package.sh +++ b/scripts/ci/verify-linux-desktop-package.sh @@ -36,6 +36,13 @@ fi "$appimage" --appimage-extract >/dev/null test -f squashfs-root/usr/bin/openbitfun-desktop + # The host Mesa EGL driver can require symbols absent from the build host's Wayland library. + bundled_wayland="$(find squashfs-root -name 'libwayland-client.so*' -print -quit)" + if [[ -n "$bundled_wayland" ]]; then + echo "AppImage must use the host Wayland client library: found $bundled_wayland" >&2 + exit 1 + fi + tray_sonames="$(jq -er '.[]' "$script_dir/linux-appimage-tray-libraries.json")" bundle_lib="$PWD/squashfs-root/usr/lib" while IFS= read -r soname; do