diff --git a/0002-feat-GB_SS_GB18030_Extended.patch b/0002-feat-GB_SS_GB18030_Extended.patch new file mode 100644 index 0000000000000000000000000000000000000000..9f2d8479a046eca43dc0d3ded9425f9bb3038df5 --- /dev/null +++ b/0002-feat-GB_SS_GB18030_Extended.patch @@ -0,0 +1,35 @@ +From 213d5c949bb45c1f309120231eda78dc0944bfbe Mon Sep 17 00:00:00 2001 +From: Lv Peilong +Date: Mon, 20 Mar 2023 13:53:17 +0800 +Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=B8=AD=E6=96=87?= + =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=8B=E9=BB=98=E8=AE=A4=E5=AD=97=E4=BD=93?= + =?UTF-8?q?=E4=B8=BAGB=5FSS=5FGB18030=5FExtended?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +修改中文环境下默认字体为GB_SS_GB18030_Extended + +Log: 修改中文环境下默认字体为GB_SS_GB18030_Extended +Task: https://pms.uniontech.com/task-view-251979.html +Influence: 镜像默认字体功能 +Change-Id: If736f4beb0ab0e68cd1ac8e33dc5afd4e3f664de +--- + usr.share.d/deepin-default-settings/fontconfig.json | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/usr.share.d/deepin-default-settings/fontconfig.json b/usr.share.d/deepin-default-settings/fontconfig.json +index 42748c9..141e983 100644 +--- a/usr.share.d/deepin-default-settings/fontconfig.json ++++ b/usr.share.d/deepin-default-settings/fontconfig.json +@@ -1,6 +1,6 @@ + { + "zh_CN":{ +- "Standard":"Noto Sans CJK SC", ++ "Standard":"GB_SS_GB18030_Extended", + "Mono":"Noto Mono" + }, + "zh_TW":{ +-- +2.20.1 + diff --git a/README.en.md b/README.en.md deleted file mode 100644 index 559f0e6de8f9469896771ffd4d474c07d77cfef2..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# deepin-default-settings - -#### Description -This library is designed to be exception-free and avoid Qt application developer do direct access to glib/glibmm - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index c86b4f44846d13d1ae38d10efe45d0669b755caa..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# deepin-default-settings - -#### 介绍 -This library is designed to be exception-free and avoid Qt application developer do direct access to glib/glibmm - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/deepin-default-settings-2021.11.11.tar.gz b/deepin-default-settings-2021.12.16.tar.gz similarity index 65% rename from deepin-default-settings-2021.11.11.tar.gz rename to deepin-default-settings-2021.12.16.tar.gz index dc806db7d46fce28ff6427d5a3ab1ae4f7732b3e..502fc320204a12f9d53749d217efc114ab5a2c6c 100644 Binary files a/deepin-default-settings-2021.11.11.tar.gz and b/deepin-default-settings-2021.12.16.tar.gz differ diff --git a/deepin-default-settings.spec b/deepin-default-settings.spec index 371b9222baa1699f7c272e1e61b5d38a90511333..f5b56b292abff6ef835dd4a1dcd4f9546d016213 100644 --- a/deepin-default-settings.spec +++ b/deepin-default-settings.spec @@ -1,10 +1,13 @@ Name: deepin-default-settings -Version: 2021.11.11 +Version: 2021.12.16 Release: 1 Summary: default settings for deepin destkop environment License: GPLv3 URL: https://github.com/linuxdeepin/default-settings Source0: %{name}-%{version}.tar.gz +Patch0: 0001-del-some-config.patch +Patch1: 0002-feat-GB_SS_GB18030_Extended.patch + BuildArch: noarch BuildRequires: dde-desktop @@ -20,7 +23,7 @@ Summary: default settings for deepin destkop environment This package includes files to override cups default page and fcitx icon. %prep -%autosetup +%autosetup -p1 %build @@ -59,7 +62,7 @@ fi declare -a passwd_array mapfile -t passwd_array <<<"$(getent passwd | grep -v nologin | grep -v halt | grep -v shutdown | grep -v sync)" -for i in "${passwd_array[@]}"; do +for i in "${passwd_array[@]}"; do userid=$(echo "$i" | awk -F ':' '{print $3}') groupid=$(echo "$i" | awk -F ':' '{print $4}') userhome=$(echo "$i" | awk -F ':' '{print $6}') @@ -71,6 +74,7 @@ for i in "${passwd_array[@]}"; do fi done + %post -n deepin-default-settings-tuning for i in 16 22 24 32 48 128 ;do @@ -111,6 +115,7 @@ fi %{_sysconfdir}/sudoers.d/01_always_set_sudoers_home /lib/udev/rules.d/99-deepin.rules %{_libexecdir}/dde-first-run +%{_bindir}/dde-first-run #服务器不需要桌面版调优参数 %exclude %{_sysctldir}/deepin.conf %{_datadir}/applications/deepin/dde-mimetype.list @@ -126,6 +131,9 @@ fi %{_datadir}/deepin-default-settings/fcitx/*.png %changelog +* Fri Jul 28 2023 leeffo - 2021.12.16-1 +- upgrade to version 2021.12.16 + * Thu Mar 30 2023 liweiganga - 2021.11.11-1 - update: update to 2021.11.11