From 452478434cc01fe4fbf2293abdfab0febfe3f989 Mon Sep 17 00:00:00 2001 From: JieXu Date: Fri, 17 Apr 2026 15:29:51 +0800 Subject: [PATCH] Fix & Update (#9126) * Update build-linux.yml * Update build-all.yml * Update build-linux.yml * Update build-linux.yml * Update build-linux.yml * Update OptionSettingWindow.axaml.cs * Update ResUI.fr.resx * Update package-rhel-riscv.sh * Update build-linux.yml * Update build-linux.yml * Update build-all.yml --------- Co-authored-by: xujie86 <167618598+xujie86@users.noreply.github.com> --- .github/workflows/build-linux.yml | 6 +++--- package-rhel-riscv.sh | 8 ++++---- v2rayN/ServiceLib/Resx/ResUI.fr.resx | 5 +---- v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs | 3 ++- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index b28cd8ee..fe3af4a9 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -185,7 +185,7 @@ jobs: (github.event_name == 'workflow_dispatch' && inputs.release_tag != '') || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) runs-on: ubuntu-24.04-riscv - container: ghcr.io/xujiegb/fedora-riscv:43-latest + container: rockylinux/rockylinux:10 env: RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }} @@ -196,8 +196,8 @@ jobs: set -euo pipefail dnf -y makecache dnf -y install \ - sudo git rpm-build rpmdevtools dnf-plugins-core rsync findutils tar gzip unzip which curl jq wget file \ - ca-certificates desktop-file-utils xdg-utils python3 gcc make glibc-devel kernel-headers libatomic libstdc++ + sudo git rpm-build rpmdevtools dnf-plugins-core \ + rsync findutils tar gzip unzip which jq - name: Checkout repo (for scripts) shell: bash diff --git a/package-rhel-riscv.sh b/package-rhel-riscv.sh index e06556e2..ef22934c 100644 --- a/package-rhel-riscv.sh +++ b/package-rhel-riscv.sh @@ -37,7 +37,7 @@ DOTNET_RISCV_VERSION="10.0.105" DOTNET_RISCV_BASE="https://github.com/filipnavara/dotnet-riscv/releases/download" DOTNET_RISCV_FILE="dotnet-sdk-${DOTNET_RISCV_VERSION}-linux-riscv64.tar.gz" DOTNET_SDK_URL="${DOTNET_RISCV_BASE}/${DOTNET_RISCV_VERSION}/${DOTNET_RISCV_FILE}" -SKIA_VER="${SKIA_VER:-3.119.1}" +SKIA_VER="${SKIA_VER:-3.119.2}" HARFBUZZ_VER="${HARFBUZZ_VER:-8.3.1.1}" # If the first argument starts with --, do not treat it as a version number @@ -111,9 +111,9 @@ build_sqlite_native_riscv64() { mkdir -p "$outdir" workdir="$(mktemp -d)" - # SQLite 3.49.1 amalgamation - sqlite_year="2025" - sqlite_ver="3490100" + # SQLite 3.51.3 amalgamation + sqlite_year="2026" + sqlite_ver="3510300" sqlite_zip="sqlite-amalgamation-${sqlite_ver}.zip" echo "[+] Download SQLite amalgamation: ${sqlite_zip}" diff --git a/v2rayN/ServiceLib/Resx/ResUI.fr.resx b/v2rayN/ServiceLib/Resx/ResUI.fr.resx index 907eb02c..8540727f 100644 --- a/v2rayN/ServiceLib/Resx/ResUI.fr.resx +++ b/v2rayN/ServiceLib/Resx/ResUI.fr.resx @@ -1318,7 +1318,7 @@ Adresse sortante locale (SendThrough) - Pour environnement multi-interfaces, veuillez saisir l’adresse IPv4 de la machine locale. + Pour environnements multi-interfaces, entrez l'adresse IPv4 de la machine locale. Veuillez saisir l’adresse IPv4 correcte de SendThrough. @@ -1701,9 +1701,6 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if Protection TUN héritée - - Pour environnements multi-interfaces, entrez l’adresse IPv4 de la machine locale. - Domaine de camouflage diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs index 26e55646..6501468d 100644 --- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs +++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs @@ -99,7 +99,8 @@ public partial class OptionSettingWindow : WindowBase this.Bind(ViewModel, vm => vm.SpeedPingTestUrl, v => v.cmbSpeedPingTestUrl.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.MixedConcurrencyCount, v => v.cmbMixedConcurrencyCount.SelectedValue).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.SubConvertUrl, v => v.cmbSubConvertUrl.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.MainGirdOrientation, v => v.cmbMainGirdOrientation.SelectedIndex).DisposeWith(disposables); + this.Bind(ViewModel, + vm => vm.MainGirdOrientation, view => view.cmbMainGirdOrientation.SelectedIndex).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.GeoFileSourceUrl, v => v.cmbGetFilesSourceUrl.SelectedValue).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.SrsFileSourceUrl, v => v.cmbSrsFilesSourceUrl.SelectedValue).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.RoutingRulesSourceUrl, v => v.cmbRoutingRulesSourceUrl.SelectedValue).DisposeWith(disposables);