package-debian.sh

@@ -28,7 +28,7 @@ Package: v2rayN
 Version: $Version
 Architecture: $Arch2
 Maintainer: https://github.com/2dust/v2rayN
-Depends: libc6 (>= 2.34), fontconfig (>= 2.13.1), desktop-file-utils (>= 0.26), xdg-utils (>= 1.1.3), coreutils (>= 8.32), bash (>= 5.1), libfreetype6 (>= 2.11)
+Depends: libc6 (>= 2.34), fontconfig (>= 2.13.1), desktop-file-utils (>= 0.26), xdg-utils (>= 1.1.3), coreutils (>= 8.32), bash (>= 5.1)
 Description: A GUI client for Windows and Linux, support Xray core and sing-box-core and others
 EOF
 

package-rhel.sh

@@ -631,14 +631,13 @@ ExclusiveArch:  aarch64 x86_64
 Source0:        __PKGROOT__.tar.gz
 
 # Runtime dependencies (Avalonia / X11 / Fonts / GL)
-Requires:       cairo, pango, openssl, mesa-libEGL, mesa-libGL
+Requires:       freetype, cairo, pango, openssl, mesa-libEGL, mesa-libGL
 Requires:       glibc >= 2.34
 Requires:       fontconfig >= 2.13.1
 Requires:       desktop-file-utils >= 0.26
 Requires:       xdg-utils >= 1.1.3
 Requires:       coreutils >= 8.32
 Requires:       bash >= 5.1
-Requires:       freetype >= 2.10
 
 %description
 v2rayN Linux for Red Hat Enterprise Linux

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.16.3</Version>
+        <Version>7.16.2</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/v2rayN.Desktop/Common/AppBuilderExtension.cs

@@ -1,31 +1,14 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Avalonia;
-using Avalonia.Media;
-
 namespace v2rayN.Desktop.Common;
 
 public static class AppBuilderExtension
 {
     public static AppBuilder WithFontByDefault(this AppBuilder appBuilder)
     {
-        var fallbacks = new List<FontFallback>();
-        
-        var notoSansSc = new FontFamily(Path.Combine(Global.AvaAssets, "Fonts#Noto Sans SC"));
-        fallbacks.Add(new FontFallback { FontFamily = notoSansSc });
-
-        if (OperatingSystem.IsLinux())
+        var uri = Path.Combine(Global.AvaAssets, "Fonts#Noto Sans SC");
+        return appBuilder.With(new FontManagerOptions()
         {
-            fallbacks.Add(new FontFallback
-            {
-                FontFamily = new FontFamily("Noto Color Emoji")
-            });
-        }
-
-        return appBuilder.With(new FontManagerOptions
-        {
-            FontFallbacks = fallbacks.ToArray()
+            //DefaultFamilyName = uri,
+            FontFallbacks = new[] { new FontFallback { FontFamily = new FontFamily(uri) } }
         });
     }
 }