From a99f051020771d2cfba9e895e23afa59f5cc0ba0 Mon Sep 17 00:00:00 2001
From: Peng Wu <alexepico@gmail.com>
Date: Thu, 1 Feb 2018 14:50:26 +0800
Subject: [PATCH] Change the default font for Chinese to Google Noto

---
 comps-f28.xml.in | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/comps-f28.xml.in b/comps-f28.xml.in
index 6d7ef30d..c419a358 100644
--- a/comps-f28.xml.in
+++ b/comps-f28.xml.in
@@ -1826,10 +1826,6 @@
     <packagelist>
       <packagereq type="default">aajohan-comfortaa-fonts</packagereq>
       <packagereq type="default">abattis-cantarell-fonts</packagereq>
-      <packagereq type="default">adobe-source-han-sans-cn-fonts</packagereq>
-      <packagereq type="default">adobe-source-han-sans-tw-fonts</packagereq>
-      <packagereq type="default">adobe-source-han-serif-cn-fonts</packagereq>
-      <packagereq type="default">adobe-source-han-serif-tw-fonts</packagereq>
       <packagereq type="default">dejavu-sans-fonts</packagereq>
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">dejavu-serif-fonts</packagereq>
@@ -1845,11 +1841,17 @@
       <packagereq type="default">google-noto-sans-meetei-mayek-fonts</packagereq>
       <packagereq type="default">google-noto-sans-mono-cjk-jp-fonts</packagereq>
       <packagereq type="default">google-noto-sans-mono-cjk-kr-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-mono-cjk-sc-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-mono-cjk-tc-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-sc-fonts</packagereq>
       <packagereq type="default">google-noto-sans-tagalog-fonts</packagereq>
       <packagereq type="default">google-noto-sans-tai-tham-fonts</packagereq>
       <packagereq type="default">google-noto-sans-tai-viet-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-tc-fonts</packagereq>
       <packagereq type="default">google-noto-serif-jp-fonts</packagereq>
       <packagereq type="default">google-noto-serif-kr-fonts</packagereq>
+      <packagereq type="default">google-noto-serif-sc-fonts</packagereq>
+      <packagereq type="default">google-noto-serif-tc-fonts</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
       <packagereq type="default">julietaula-montserrat-fonts</packagereq>
       <packagereq type="default">khmeros-base-fonts</packagereq>
@@ -1883,10 +1885,14 @@
       <packagereq type="optional">adf-gillius-fonts</packagereq>
       <packagereq type="optional">adf-tribun-fonts</packagereq>
       <packagereq type="optional">adobe-source-han-code-jp-fonts</packagereq>
+      <packagereq type="optional">adobe-source-han-sans-cn-fonts</packagereq>
       <packagereq type="optional">adobe-source-han-sans-jp-fonts</packagereq>
       <packagereq type="optional">adobe-source-han-sans-kr-fonts</packagereq>
+      <packagereq type="optional">adobe-source-han-sans-tw-fonts</packagereq>
+      <packagereq type="optional">adobe-source-han-serif-cn-fonts</packagereq>
       <packagereq type="optional">adobe-source-han-serif-jp-fonts</packagereq>
       <packagereq type="optional">adobe-source-han-serif-kr-fonts</packagereq>
+      <packagereq type="optional">adobe-source-han-serif-tw-fonts</packagereq>
       <packagereq type="optional">aldusleaf-crimson-text-fonts</packagereq>
       <packagereq type="optional">allgeyer-musiqwik-fonts</packagereq>
       <packagereq type="optional">allgeyer-musisync-fonts</packagereq>
@@ -5521,8 +5527,11 @@
     <langonly>zh_CN</langonly>
     <packagelist>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-libpinyin</packagereq>
-      <packagereq type="default">adobe-source-han-sans-cn-fonts</packagereq>
-      <packagereq type="default">adobe-source-han-serif-cn-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-mono-cjk-sc-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-sc-fonts</packagereq>
+      <packagereq type="default">google-noto-serif-sc-fonts</packagereq>
+      <packagereq type="optional">adobe-source-han-sans-cn-fonts</packagereq>
+      <packagereq type="optional">adobe-source-han-serif-cn-fonts</packagereq>
       <packagereq type="optional">fcitx</packagereq>
       <packagereq type="optional">ibus-table-chinese-erbi</packagereq>
       <packagereq type="optional">ibus-table-chinese-wubi-haifeng</packagereq>
@@ -6251,8 +6260,11 @@
     <packagelist>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-cangjie-engine-cangjie</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-libzhuyin</packagereq>
-      <packagereq type="default">adobe-source-han-sans-tw-fonts</packagereq>
-      <packagereq type="default">adobe-source-han-serif-tw-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-mono-cjk-tc-fonts</packagereq>
+      <packagereq type="default">google-noto-sans-tc-fonts</packagereq>
+      <packagereq type="default">google-noto-serif-tc-fonts</packagereq>
+      <packagereq type="optional">adobe-source-han-sans-tw-fonts</packagereq>
+      <packagereq type="optional">adobe-source-han-serif-tw-fonts</packagereq>
       <packagereq type="optional">cjkuni-ukai-fonts</packagereq>
       <packagereq type="optional">cjkuni-uming-fonts</packagereq>
       <packagereq type="optional">gcin</packagereq>