Skip to content

Commit 4524784

Browse files
xujiegbxujie86
andauthored
Fix & Update (2dust#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>
1 parent 5305b08 commit 4524784

4 files changed

Lines changed: 10 additions & 12 deletions

File tree

.github/workflows/build-linux.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ jobs:
185185
(github.event_name == 'workflow_dispatch' && inputs.release_tag != '') ||
186186
(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
187187
runs-on: ubuntu-24.04-riscv
188-
container: ghcr.io/xujiegb/fedora-riscv:43-latest
188+
container: rockylinux/rockylinux:10
189189
env:
190190
RELEASE_TAG: ${{ case(inputs.release_tag != '', inputs.release_tag, github.ref_name) }}
191191

@@ -196,8 +196,8 @@ jobs:
196196
set -euo pipefail
197197
dnf -y makecache
198198
dnf -y install \
199-
sudo git rpm-build rpmdevtools dnf-plugins-core rsync findutils tar gzip unzip which curl jq wget file \
200-
ca-certificates desktop-file-utils xdg-utils python3 gcc make glibc-devel kernel-headers libatomic libstdc++
199+
sudo git rpm-build rpmdevtools dnf-plugins-core \
200+
rsync findutils tar gzip unzip which jq
201201
202202
- name: Checkout repo (for scripts)
203203
shell: bash

package-rhel-riscv.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ DOTNET_RISCV_VERSION="10.0.105"
3737
DOTNET_RISCV_BASE="https://github.com/filipnavara/dotnet-riscv/releases/download"
3838
DOTNET_RISCV_FILE="dotnet-sdk-${DOTNET_RISCV_VERSION}-linux-riscv64.tar.gz"
3939
DOTNET_SDK_URL="${DOTNET_RISCV_BASE}/${DOTNET_RISCV_VERSION}/${DOTNET_RISCV_FILE}"
40-
SKIA_VER="${SKIA_VER:-3.119.1}"
40+
SKIA_VER="${SKIA_VER:-3.119.2}"
4141
HARFBUZZ_VER="${HARFBUZZ_VER:-8.3.1.1}"
4242

4343
# If the first argument starts with --, do not treat it as a version number
@@ -111,9 +111,9 @@ build_sqlite_native_riscv64() {
111111
mkdir -p "$outdir"
112112
workdir="$(mktemp -d)"
113113

114-
# SQLite 3.49.1 amalgamation
115-
sqlite_year="2025"
116-
sqlite_ver="3490100"
114+
# SQLite 3.51.3 amalgamation
115+
sqlite_year="2026"
116+
sqlite_ver="3510300"
117117
sqlite_zip="sqlite-amalgamation-${sqlite_ver}.zip"
118118

119119
echo "[+] Download SQLite amalgamation: ${sqlite_zip}"

v2rayN/ServiceLib/Resx/ResUI.fr.resx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@
13181318
<value>Adresse sortante locale (SendThrough)</value>
13191319
</data>
13201320
<data name="TbSettingsSendThroughTip" xml:space="preserve">
1321-
<value>Pour environnement multi-interfaces, veuillez saisir l’adresse IPv4 de la machine locale.</value>
1321+
<value>Pour environnements multi-interfaces, entrez l'adresse IPv4 de la machine locale.</value>
13221322
</data>
13231323
<data name="FillCorrectSendThroughIPv4" xml:space="preserve">
13241324
<value>Veuillez saisir l’adresse IPv4 correcte de SendThrough.</value>
@@ -1701,9 +1701,6 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
17011701
<data name="TbLegacyProtect" xml:space="preserve">
17021702
<value>Protection TUN héritée</value>
17031703
</data>
1704-
<data name="TbSettingsSendThroughTip" xml:space="preserve">
1705-
<value>Pour environnements multi-interfaces, entrez l’adresse IPv4 de la machine locale.</value>
1706-
</data>
17071704
<data name="TbCamouflageDomain" xml:space="preserve">
17081705
<value>Domaine de camouflage</value>
17091706
</data>

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ public OptionSettingWindow()
9999
this.Bind(ViewModel, vm => vm.SpeedPingTestUrl, v => v.cmbSpeedPingTestUrl.Text).DisposeWith(disposables);
100100
this.Bind(ViewModel, vm => vm.MixedConcurrencyCount, v => v.cmbMixedConcurrencyCount.SelectedValue).DisposeWith(disposables);
101101
this.Bind(ViewModel, vm => vm.SubConvertUrl, v => v.cmbSubConvertUrl.Text).DisposeWith(disposables);
102-
this.Bind(ViewModel, vm => vm.MainGirdOrientation, v => v.cmbMainGirdOrientation.SelectedIndex).DisposeWith(disposables);
102+
this.Bind<OptionSettingViewModel, OptionSettingWindow, int, int>(ViewModel,
103+
vm => vm.MainGirdOrientation, view => view.cmbMainGirdOrientation.SelectedIndex).DisposeWith(disposables);
103104
this.Bind(ViewModel, vm => vm.GeoFileSourceUrl, v => v.cmbGetFilesSourceUrl.SelectedValue).DisposeWith(disposables);
104105
this.Bind(ViewModel, vm => vm.SrsFileSourceUrl, v => v.cmbSrsFilesSourceUrl.SelectedValue).DisposeWith(disposables);
105106
this.Bind(ViewModel, vm => vm.RoutingRulesSourceUrl, v => v.cmbRoutingRulesSourceUrl.SelectedValue).DisposeWith(disposables);

0 commit comments

Comments
 (0)