From d541f4c0a2c6cf9a04ec646df84dbcfcf587608e Mon Sep 17 00:00:00 2001
From: fuleyi <fuleyi@uniontech.com>
Date: Wed, 3 Jan 2024 16:58:26 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E5=B0=86=E6=80=9D=E6=BA=90?=
 =?UTF-8?q?=E5=AD=97=E4=BD=93=E4=BD=9C=E4=B8=BA=E9=BB=98=E8=AE=A4=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将思源字体作为默认字体,并对部分支持的语言进行匹配提权。
添加了system-ui字体族：system-ui原本是从社区版拉过来的，虽有相关配置但是没有被创建。

Log:
Task: https://pms.uniontech.com/task-view-314673.html
Influence: font config
Change-Id: Ib29a7b9555ca2b057d81000fc1fdd419cab54608
---
 .../conf.avail/55-deepin-default.conf         | 80 +++++++++++++------
 .../conf.avail/55-language-deepin-ja.conf     |  6 +-
 .../conf.avail/55-language-deepin-ko.conf     |  6 +-
 .../conf.avail/55-language-deepin-zh.conf     | 37 ++++++---
 4 files changed, 87 insertions(+), 42 deletions(-)

diff --git a/usr.share.d/fontconfig/conf.avail/55-deepin-default.conf b/usr.share.d/fontconfig/conf.avail/55-deepin-default.conf
index c8e6998..aa4018c 100644
--- a/usr.share.d/fontconfig/conf.avail/55-deepin-default.conf
+++ b/usr.share.d/fontconfig/conf.avail/55-deepin-default.conf
@@ -2,34 +2,66 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
     <!-- Default serif font -->
-    <alias binding="strong">
-        <family>serif</family>
-        <prefer>
-            <family>Noto Serif</family>
-        </prefer>
-    </alias>
+    <match target="pattern">
+        <test qual="any" name="family">
+            <string>serif</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Source Han Sans SC</string>
+        </edit>
+    </match>
 
     <!-- Default sans-serif font -->
-    <alias binding="strong">
-        <family>sans-serif</family>
-        <prefer>
-            <family>Noto Sans</family>
-        </prefer>
-    </alias>
+    <match target="pattern">
+        <test qual="any" name="family">
+            <string>sans-serif</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Source Han Sans SC</string>
+        </edit>
+    </match>
 
     <!-- Default monospace font -->
-    <alias binding="strong">
-        <family>monospace</family>
-        <prefer>
-            <family>Noto Sans Mono</family>
-        </prefer>
-    </alias>
+    <match target="pattern">
+        <test qual="any" name="family">
+            <string>monospace</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Noto Sans Mono</string>
+        </edit>
+    </match>
+
+    <!--
+  If the font still has no system-ui, add system-ui for first choise
+ -->
+    <match target="pattern">
+            <test qual="all" name="family" compare="not_eq">
+                    <string>serif</string>
+            </test>
+            <test qual="all" name="family" compare="not_eq">
+                    <string>sans-serif</string>
+            </test>
+            <test qual="all" name="family" compare="not_eq">
+                    <string>monospace</string>
+            </test>
+            <test qual="all" name="family" compare="not_eq">
+                    <string>system-ui</string>
+            </test>
+            <edit name="family" mode="append_last">
+                    <string>system-ui</string>
+            </edit>
+    </match>
 
     <!-- Default system-ui font -->
-    <alias binding="strong">
-        <family>system-ui</family>
-        <prefer>
-            <family>Noto Sans</family>
-        </prefer>
-    </alias>
+    <match target="pattern">
+        <test qual="any" name="family">
+            <string>system-ui</string>
+        </test>
+        <edit name="family" mode="prepend">
+            <string>Source Han Sans SC</string>
+        </edit>
+    </match>
+    <match target="font">
+            <edit name="rgba"><const>rgb</const></edit>
+    </match>
 </fontconfig>
diff --git a/usr.share.d/fontconfig/conf.avail/55-language-deepin-ja.conf b/usr.share.d/fontconfig/conf.avail/55-language-deepin-ja.conf
index fe728aa..19c44ad 100644
--- a/usr.share.d/fontconfig/conf.avail/55-language-deepin-ja.conf
+++ b/usr.share.d/fontconfig/conf.avail/55-language-deepin-ja.conf
@@ -12,7 +12,7 @@
             <string>serif</string>
         </test>
         <edit name="family" mode="append" binding="strong">
-            <string>Noto Serif CJK JP</string>
+            <string>Source Han Sans HW SC</string>
         </edit>
     </match>
 
@@ -27,7 +27,7 @@
             <string>sans-serif</string>
         </test>
         <edit name="family" mode="append" binding="strong">
-            <string>Noto Sans CJK JP</string>
+            <string>Source Han Sans HW SC</string>
         </edit>
     </match>
 
@@ -58,7 +58,7 @@
             <string>system-ui</string>
         </test>
         <edit name="family" mode="append" binding="strong">
-            <string>Noto Sans CJK JP</string>
+            <string>Source Han Sans HW SC</string>
         </edit>
     </match>
 </fontconfig>
diff --git a/usr.share.d/fontconfig/conf.avail/55-language-deepin-ko.conf b/usr.share.d/fontconfig/conf.avail/55-language-deepin-ko.conf
index 0a7f63f..3e0ae22 100644
--- a/usr.share.d/fontconfig/conf.avail/55-language-deepin-ko.conf
+++ b/usr.share.d/fontconfig/conf.avail/55-language-deepin-ko.conf
@@ -12,7 +12,7 @@
             <string>serif</string>
         </test>
         <edit name="family" mode="append" binding="strong">
-            <string>Noto Serif CJK KR</string>
+            <string>Source Han Sans HW SC</string>
         </edit>
     </match>
 
@@ -27,7 +27,7 @@
             <string>sans-serif</string>
         </test>
         <edit name="family" mode="append" binding="strong">
-            <string>Noto Sans CJK KR</string>
+            <string>Source Han Sans HW SC</string>
         </edit>
     </match>
 
@@ -58,7 +58,7 @@
             <string>system-ui</string>
         </test>
         <edit name="family" mode="append" binding="strong">
-            <string>Noto Sans CJK KR</string>
+            <string>Source Han Sans HW SC</string>
         </edit>
     </match>
 </fontconfig>
diff --git a/usr.share.d/fontconfig/conf.avail/55-language-deepin-zh.conf b/usr.share.d/fontconfig/conf.avail/55-language-deepin-zh.conf
index 4c337b2..1102fc6 100644
--- a/usr.share.d/fontconfig/conf.avail/55-language-deepin-zh.conf
+++ b/usr.share.d/fontconfig/conf.avail/55-language-deepin-zh.conf
@@ -12,7 +12,7 @@
             <string>serif</string>
         </test>
         <edit name="family" mode="append" binding="strong">
-            <string>Noto Serif CJK SC</string>
+            <string>Source Han Sans HW SC</string>
         </edit>
     </match>
     <!-- "lang=zh-hans" or "lang=zh-hans-*" -->
@@ -49,7 +49,7 @@
             <string>serif</string>
         </test>
         <edit name="family" mode="prepend" binding="strong">
-            <string>Noto Serif CJK SC</string>
+            <string>Source Han Sans HW SC</string>
         </edit>
     </match>
     <!-- "lang=zh-tw" or "lang=zh-tw-*" -->
@@ -61,7 +61,7 @@
             <string>serif</string>
         </test>
         <edit name="family" mode="append" binding="strong">
-            <string>Noto Serif CJK TC</string>
+            <string>Source Han Sans HW SC</string>
         </edit>
     </match>
 
@@ -76,7 +76,7 @@
             <string>sans-serif</string>
         </test>
         <edit name="family" mode="prepend" binding="strong">
-            <string>Noto Sans CJK SC</string>
+            <string>Source Han Sans HW SC</string>
         </edit>
     </match>
     <!-- "lang=zh-hans" or "lang=zh-hans-*" -->
@@ -125,7 +125,7 @@
             <string>sans-serif</string>
         </test>
         <edit name="family" mode="prepend" binding="strong">
-            <string>Noto Sans CJK SC</string>
+            <string>Source Han Sans HW SC</string>
         </edit>
     </match>
     <!-- "lang=zh-tw" or "lang=zh-tw-*" -->
@@ -137,7 +137,7 @@
             <string>sans-serif</string>
         </test>
         <edit name="family" mode="prepend" binding="strong">
-            <string>Noto Sans CJK TC</string>
+            <string>Source Han Sans HW SC</string>
         </edit>
     </match>
     <!-- "lang=zh-hk" or "lang=zh-hk-*" -->
@@ -149,7 +149,7 @@
             <string>sans-serif</string>
         </test>
         <edit name="family" mode="prepend" binding="strong">
-            <string>Noto Sans CJK HK</string>
+            <string>Source Han Sans HW SC</string>
         </edit>
     </match>
 
@@ -170,6 +170,19 @@
         </edit>
     </match>
 
+    <match target="pattern">
+        <test name="lang">
+            <string>zh-hk</string>
+        </test>
+        <test qual="any" name="family">
+            <string>monospace</string>
+        </test>
+        <edit name="family" mode="prepend" binding="strong">
+            <string>Noto Mono</string>
+            <string>Noto Sans Mono</string>
+        </edit>
+    </match>
+
     <!-- System UI -->
 
     <!-- "lang=zh" or "lang=zh-*" -->
@@ -181,7 +194,7 @@
             <string>system-ui</string>
         </test>
         <edit name="family" mode="prepend" binding="strong">
-            <string>Noto Sans CJK SC</string>
+            <string>Source Han Sans HW SC</string>
         </edit>
     </match>
     <!-- "lang=zh-hans" or "lang=zh-hans-*" -->
@@ -230,7 +243,7 @@
             <string>system-ui</string>
         </test>
         <edit name="family" mode="prepend" binding="strong">
-            <string>Noto Sans CJK SC</string>
+            <string>Source Han Sans HW SC</string>
         </edit>
     </match>
     <!-- "lang=zh-tw" or "lang=zh-tw-*" -->
@@ -242,7 +255,7 @@
             <string>system-ui</string>
         </test>
         <edit name="family" mode="prepend" binding="strong">
-            <string>Noto Sans CJK TC</string>
+            <string>Source Han Sans HW SC</string>
         </edit>
     </match>
     <!-- "lang=zh-hk" or "lang=zh-hk-*" -->
@@ -254,7 +267,7 @@
             <string>system-ui</string>
         </test>
         <edit name="family" mode="prepend" binding="strong">
-            <string>Noto Sans CJK HK</string>
+            <string>Source Han Sans HW SC</string>
         </edit>
     </match>
-</fontconfig>
+</fontconfig>
\ No newline at end of file

From 03f5898a0e66bf2f7858f021b4f81a49e70b401f Mon Sep 17 00:00:00 2001
From: DingHao <dinghao@uniontech.com>
Date: Mon, 15 Apr 2024 15:01:34 +0800
Subject: [PATCH 2/3] fix: Set source-han-sanc-sc as the default font

Description: Set source-han-sanc-sc as the default font

Log: Set source-han-sanc-sc as the default font
Signed-off-by: DingHao <dinghao@uniontech.com>
Change-Id: I297d3f5390a5aac4cab7ae39f2df10e2dd2ec33f
---
 debian/changelog                              |  6 +++++
 .../conf.avail/55-language-deepin-ja.conf     |  6 ++---
 .../conf.avail/55-language-deepin-ko.conf     |  6 ++---
 .../conf.avail/55-language-deepin-zh.conf     | 22 +++++++++----------
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3fca8b5..800342e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+deepin-default-settings (2024.11.14) unstable; urgency=medium
+
+  * release 2024.11.14
+
+ -- zhangkun <zhangkun2@uniontech.com>  Thu, 14 Nov 2024 16:03:45 +0800
+
 deepin-default-settings (2024.08.13) unstable; urgency=medium
 
   * Using postinst script to process browser icons
diff --git a/usr.share.d/fontconfig/conf.avail/55-language-deepin-ja.conf b/usr.share.d/fontconfig/conf.avail/55-language-deepin-ja.conf
index 19c44ad..12fba9c 100644
--- a/usr.share.d/fontconfig/conf.avail/55-language-deepin-ja.conf
+++ b/usr.share.d/fontconfig/conf.avail/55-language-deepin-ja.conf
@@ -12,7 +12,7 @@
             <string>serif</string>
         </test>
         <edit name="family" mode="append" binding="strong">
-            <string>Source Han Sans HW SC</string>
+            <string>Source Han Sans SC</string>
         </edit>
     </match>
 
@@ -27,7 +27,7 @@
             <string>sans-serif</string>
         </test>
         <edit name="family" mode="append" binding="strong">
-            <string>Source Han Sans HW SC</string>
+            <string>Source Han Sans SC</string>
         </edit>
     </match>
 
@@ -58,7 +58,7 @@
             <string>system-ui</string>
         </test>
         <edit name="family" mode="append" binding="strong">
-            <string>Source Han Sans HW SC</string>
+            <string>Source Han Sans SC</string>
         </edit>
     </match>
 </fontconfig>
diff --git a/usr.share.d/fontconfig/conf.avail/55-language-deepin-ko.conf b/usr.share.d/fontconfig/conf.avail/55-language-deepin-ko.conf
index 3e0ae22..9cd8eb4 100644
--- a/usr.share.d/fontconfig/conf.avail/55-language-deepin-ko.conf
+++ b/usr.share.d/fontconfig/conf.avail/55-language-deepin-ko.conf
@@ -12,7 +12,7 @@
             <string>serif</string>
         </test>
         <edit name="family" mode="append" binding="strong">
-            <string>Source Han Sans HW SC</string>
+            <string>Source Han Sans SC</string>
         </edit>
     </match>
 
@@ -27,7 +27,7 @@
             <string>sans-serif</string>
         </test>
         <edit name="family" mode="append" binding="strong">
-            <string>Source Han Sans HW SC</string>
+            <string>Source Han Sans SC</string>
         </edit>
     </match>
 
@@ -58,7 +58,7 @@
             <string>system-ui</string>
         </test>
         <edit name="family" mode="append" binding="strong">
-            <string>Source Han Sans HW SC</string>
+            <string>Source Han Sans SC</string>
         </edit>
     </match>
 </fontconfig>
diff --git a/usr.share.d/fontconfig/conf.avail/55-language-deepin-zh.conf b/usr.share.d/fontconfig/conf.avail/55-language-deepin-zh.conf
index 1102fc6..3a5de78 100644
--- a/usr.share.d/fontconfig/conf.avail/55-language-deepin-zh.conf
+++ b/usr.share.d/fontconfig/conf.avail/55-language-deepin-zh.conf
@@ -12,7 +12,7 @@
             <string>serif</string>
         </test>
         <edit name="family" mode="append" binding="strong">
-            <string>Source Han Sans HW SC</string>
+            <string>Source Han Sans SC</string>
         </edit>
     </match>
     <!-- "lang=zh-hans" or "lang=zh-hans-*" -->
@@ -49,7 +49,7 @@
             <string>serif</string>
         </test>
         <edit name="family" mode="prepend" binding="strong">
-            <string>Source Han Sans HW SC</string>
+            <string>Source Han Sans SC</string>
         </edit>
     </match>
     <!-- "lang=zh-tw" or "lang=zh-tw-*" -->
@@ -61,7 +61,7 @@
             <string>serif</string>
         </test>
         <edit name="family" mode="append" binding="strong">
-            <string>Source Han Sans HW SC</string>
+            <string>Source Han Sans SC</string>
         </edit>
     </match>
 
@@ -76,7 +76,7 @@
             <string>sans-serif</string>
         </test>
         <edit name="family" mode="prepend" binding="strong">
-            <string>Source Han Sans HW SC</string>
+            <string>Source Han Sans SC</string>
         </edit>
     </match>
     <!-- "lang=zh-hans" or "lang=zh-hans-*" -->
@@ -125,7 +125,7 @@
             <string>sans-serif</string>
         </test>
         <edit name="family" mode="prepend" binding="strong">
-            <string>Source Han Sans HW SC</string>
+            <string>Source Han Sans SC</string>
         </edit>
     </match>
     <!-- "lang=zh-tw" or "lang=zh-tw-*" -->
@@ -137,7 +137,7 @@
             <string>sans-serif</string>
         </test>
         <edit name="family" mode="prepend" binding="strong">
-            <string>Source Han Sans HW SC</string>
+            <string>Source Han Sans SC</string>
         </edit>
     </match>
     <!-- "lang=zh-hk" or "lang=zh-hk-*" -->
@@ -149,7 +149,7 @@
             <string>sans-serif</string>
         </test>
         <edit name="family" mode="prepend" binding="strong">
-            <string>Source Han Sans HW SC</string>
+            <string>Source Han Sans SC</string>
         </edit>
     </match>
 
@@ -194,7 +194,7 @@
             <string>system-ui</string>
         </test>
         <edit name="family" mode="prepend" binding="strong">
-            <string>Source Han Sans HW SC</string>
+            <string>Source Han Sans SC</string>
         </edit>
     </match>
     <!-- "lang=zh-hans" or "lang=zh-hans-*" -->
@@ -243,7 +243,7 @@
             <string>system-ui</string>
         </test>
         <edit name="family" mode="prepend" binding="strong">
-            <string>Source Han Sans HW SC</string>
+            <string>Source Han Sans SC</string>
         </edit>
     </match>
     <!-- "lang=zh-tw" or "lang=zh-tw-*" -->
@@ -255,7 +255,7 @@
             <string>system-ui</string>
         </test>
         <edit name="family" mode="prepend" binding="strong">
-            <string>Source Han Sans HW SC</string>
+            <string>Source Han Sans SC</string>
         </edit>
     </match>
     <!-- "lang=zh-hk" or "lang=zh-hk-*" -->
@@ -267,7 +267,7 @@
             <string>system-ui</string>
         </test>
         <edit name="family" mode="prepend" binding="strong">
-            <string>Source Han Sans HW SC</string>
+            <string>Source Han Sans SC</string>
         </edit>
     </match>
 </fontconfig>
\ No newline at end of file

From e02f93be139e7c8184753fa6d7bce0209f048f36 Mon Sep 17 00:00:00 2001
From: zhangkun <zhangkun2@uniontech.com>
Date: Fri, 15 Nov 2024 15:01:53 +0800
Subject: [PATCH 3/3] test remove deepin-home

---
 debian/control | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/debian/control b/debian/control
index ad365c4..6b471f9 100644
--- a/debian/control
+++ b/debian/control
@@ -15,9 +15,6 @@ Depends:
  python3,
  python3-gi,
  ${misc:Depends},
-Pre-Depends: 
- deepin-home (>= 1.6.0),
- coreutils,
 Suggests:
  binfmt-support,
 Conflicts: