!21 [sync] PR-20: upgrade to version 2021.12.16

From: @openeuler-sync-bot Reviewed-by: @leeffo Signed-off-by: @leeffo
upgrade to version 2021.12.16
2023-08-23 03:01:12 +00:00 · 2023-08-21 09:10:12 +08:00 · 2023-04-10 03:12:10 +00:00 · 2023-04-06 10:45:29 +08:00 · 2022-07-21 06:46:30 +00:00 · 2022-07-21 14:07:13 +08:00
4 changed files with 165 additions and 33 deletions
--- a/0001-del-some-config.patch
+++ b/0001-del-some-config.patch
@ -0,0 +1,28 @@
+From b6255811dc5537396e8d35c533267d16bf505002 Mon Sep 17 00:00:00 2001
+From: root <root@localhost.localdomain>
+Date: Tue, 18 Jan 2022 18:30:11 +0800
+Subject: [PATCH] del some config
+
+---
+ udev.rules.d/99-deepin.rules | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/udev.rules.d/99-deepin.rules b/udev.rules.d/99-deepin.rules
+index 13ecd4a..8bf002b 100644
+--- a/udev.rules.d/99-deepin.rules
+++ b/udev.rules.d/99-deepin.rules
+@@ -1,11 +1,2 @@
+-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="deadline"
+-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/iosched/slice_idle}="0"
+-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/iosched/low_latency}="0"
+-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/iosched/quantum}="32"
+-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/iosched/slice_sync}="400"
+-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/nr_requests}="4096"
+-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/read_ahead_kb}="4096"
+-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/iosched/back_seek_penalty}="16"
+-ACTION=="add|change", KERNEL=="sd[a-z]", ATTR{queue/rotational}=="1", ATTR{queue/max_sectors_kb}="%s{queue/max_hw_sectors_kb}"
+ # Disable Wlan power save
+ ACTION=="add", SUBSYSTEM=="net", KERNEL=="wlan*" RUN+="/sbin/iw dev %k set power_save off"
+-- 
+2.27.0
+
--- a/0002-feat-GB_SS_GB18030_Extended.patch
+++ b/0002-feat-GB_SS_GB18030_Extended.patch
@ -0,0 +1,35 @@
+From 213d5c949bb45c1f309120231eda78dc0944bfbe Mon Sep 17 00:00:00 2001
+From: Lv Peilong <lvpeilong@uniontech.com>
+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
+
--- a/deepin-default-settings_2020.03.25.orig.tar.xz
+++ b/deepin-default-settings_2020.03.25.orig.tar.xz
--- a/deepin-default-settings.spec
+++ b/deepin-default-settings.spec
@ -1,35 +1,68 @@
-%bcond_with check
-%global _unpackaged_files_terminate_build 0 
-%global debug_package   %{nil}
-%global common_description %{expand:default settings for deepin destkop environment
- This package does tweaking and to provide better experience of deepin desktop
- environment.}
+Name:           deepin-default-settings
+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

-Name:          deepin-default-settings
-Version:       2020.03.25
-Release:       2
-Summary:       This library is designed to be exception-free and avoid Qt application developer do direct access to glib/glibmm
-License:       GPLv3
-URL:           https://uos-packages.deepin.com/uos/pool/main/d/deepin-default-settings/
-Source0:       https://uos-packages.deepin.com/uos/pool/main/d/%{name}/%{name}_%{version}.orig.tar.xz
-BuildRequires:	   dde-desktop
+
+BuildArch:      noarch
+BuildRequires:  dde-desktop
+BuildRequires:  deepin-wallpapers
+Requires:       deepin-wallpapers

 %description
-%{common_description}
+default settings for deepin destkop environment.
+
+%package        -n deepin-default-settings-tuning
+Summary:        default settings for deepin destkop environment
+%description    -n deepin-default-settings-tuning
+This package includes files to override cups default page and fcitx icon.

 %prep
-%setup
+%autosetup -p1

 %build
-make
+
+
 %install
 %make_install
-install -d %{buildroot}%{_sysconfdir}/skel/{Desktop,Documents,Downloads,Pictures,Videos}
+
+mkdir -p  %{buildroot}/usr/share/deepin-default-settings/cups-filters/
+mkdir -p  %{buildroot}/usr/share/deepin-default-settings/google-chrome/
+mkdir -p  %{buildroot}/usr/share/deepin-default-settings/fcitx/
+mkdir -p  %{buildroot}/etc/
+
+install -Dm644 tuning/cups-filters/*.pdf  %{buildroot}/usr/share/deepin-default-settings/cups-filters/
+install -Dm644 tuning/google-chrome/*.tar %{buildroot}/usr/share/deepin-default-settings/google-chrome/
+install -Dm644 tuning/fcitx/*.png  %{buildroot}/usr/share/deepin-default-settings/fcitx/
+cp -r skel %{buildroot}/etc/
+
+install -d %{buildroot}%{_sysconfdir}/skel/{Desktop,Documents,Downloads,Pictures/Wallpapers,Music,Videos,.Public,.Templates}
+install -d %{buildroot}%{_sysconfdir}/skel/.local/share/Trash
 install -Dm644 %{_datadir}/applications/dde-computer.desktop %{buildroot}%{_sysconfdir}/skel/Desktop/dde-computer.desktop
 install -Dm755 %{_datadir}/applications/dde-trash.desktop %{buildroot}%{_sysconfdir}/skel/Desktop/dde-trash.desktop
+for file in `ls /usr/share/wallpapers/deepin/`
+do
+    ln -svf /usr/share/wallpapers/deepin/$file %{buildroot}%{_sysconfdir}/skel/Pictures/Wallpapers/$file
+done

 %post
-for i in $(getent passwd | grep -v nologin | grep -v halt | grep -v shutdown | grep -v sync); do
+## when root first login, init
+if [ ! -f /root/Desktop/dde-computer.desktop ] && [ ! -f /root/Desktop/dde-trash.desktop ] ; then
+    install -Dm644 /etc/skel/.config/user-dirs.dirs /root/.config/user-dirs.dirs || true
+    install -d /root/{Desktop,Documents,Downloads,Pictures/Wallpapers,Music,Videos,.Public,.Templates} || true
+    install -Dm644 /etc/skel/.config/autostart/dde-first-run.desktop /root/.config/autostart/dde-first-run.desktop || true
+        install -m644 /etc/skel/Pictures/Wallpapers/*.jpg /root/Pictures/Wallpapers/ || true
+        install -m644 /etc/skel/Music/bensound-sunny.mp3   /root//Music/ || true
+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  
  userid=$(echo "$i" | awk -F ':' '{print $3}')
  groupid=$(echo "$i" | awk -F ':' '{print $4}')
  userhome=$(echo "$i" | awk -F ':' '{print $6}')
@ -41,18 +74,37 @@ for i in $(getent passwd | grep -v nologin | grep -v halt | grep -v shutdown | g
  fi
 done

+
+%post -n deepin-default-settings-tuning
+
+for i in 16 22 24 32 48 128 ;do
+    [ -f /usr/share/icons/hicolor/${i}x${i}/apps/fcitx.png ] && rm -f /usr/share/icons/hicolor/${i}x${i}/apps/fcitx.png
+done
+[ -f /usr/share/icons/hicolor/scalable/apps/fcitx.svg ] && rm -f /usr/share/icons/hicolor/scalable/apps/fcitx.svg
+install -Dm644 /usr/share/deepin-default-settings/fcitx/fcitx.png /usr/share/icons/hicolor/16x16/apps/fcitx.png || true
+
+[ -f /usr/share/icons/hicolor/16x16/status/fcitx-kbd.png ] && rm -f /usr/share/icons/hicolor/16x16/status/fcitx-kbd.png
+install -Dm644 /usr/share/deepin-default-settings/fcitx/fcitx.png /usr/share/icons/hicolor/16x16/status/fcitx-kbd.png || true
+
+rm -f /etc/apt/sources.list.d/google-chrome*.list
+if [ -f /etc/opt/chrome/policies/recommended/defalut-plugins-settings.json ];then
+    rm -f /etc/opt/chrome/policies/recommended/defalut-plugins-settings.json
+fi
+
 %files
-%{_sysconfdir}/apt
-%{_sysconfdir}/X11/xorg.conf.d/50-synaptics.conf
-%{_sysconfdir}/X11/xorg.conf.d/75-wacom.conf
+%license LICENSE
+## conflicts with file from package systemd
+%exclude %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh
+## conflicts with file from package shared-mime-info
+%exclude %{_datadir}/applications/mimeapps.list
+%{_sysconfdir}/X11/xorg.conf.d/*.conf
 %{_sysconfdir}/binfmt.d/wine.conf
-%{_sysconfdir}/fonts/conf.d/10-enhance-rending.conf
-%{_sysconfdir}/fonts/conf.d/55-language-deepin-zh-cn.conf
-%{_sysconfdir}/fonts/conf.d/55-language-deepin-zh-hk.conf
-%{_sysconfdir}/fonts/conf.d/55-language-deepin-zh-tw.conf
+%{_sysconfdir}/fonts/conf.d/*.conf
 %{_sysconfdir}/gimp/2.0/fonts.conf
 %{_sysconfdir}/lscolor-256color
+%{_sysconfdir}/modprobe.d/8821ce.conf
 %{_sysconfdir}/modprobe.d/iwlwifi.conf
+%{_sysconfdir}/skel/*
 %{_sysconfdir}/skel/.config/SogouPY/sogouEnv.ini
 %{_sysconfdir}/skel/.config/Trolltech.conf
 %{_sysconfdir}/skel/.config/autostart/dde-first-run.desktop
@ -60,23 +112,40 @@ done
 %{_sysconfdir}/skel/.config/user-dirs.dirs
 %{_sysconfdir}/skel/.icons/default/index.theme
 %{_sysconfdir}/skel/Music/bensound-sunny.mp3
-%{_sysconfdir}/skel/*
 %{_sysconfdir}/sudoers.d/01_always_set_sudoers_home
 /lib/udev/rules.d/99-deepin.rules
+%{_libexecdir}/dde-first-run
 %{_bindir}/dde-first-run
-/usr/lib/sysctl.d/deepin.conf
+#服务器不需要桌面版调优参数
+%exclude %{_sysctldir}/deepin.conf
 %{_datadir}/applications/deepin/dde-mimetype.list
 %{_datadir}/deepin-default-settings/fontconfig.json
-%{_datadir}/fontconfig/conf.avail/10-enhance-rending.conf
-%{_datadir}/fontconfig/conf.avail/55-language-deepin-zh-cn.conf
-%{_datadir}/fontconfig/conf.avail/55-language-deepin-zh-hk.conf
-%{_datadir}/fontconfig/conf.avail/55-language-deepin-zh-tw.conf
+%{_datadir}/fontconfig/conf.avail/*.conf
 %{_datadir}/mime/packages/deepin-workaround.xml
 %{_datadir}/mime/wine-ini.xml
 %{_datadir}/music/bensound-sunny.mp3
-%license LICENSE
+
+%files  -n deepin-default-settings-tuning
+%{_datadir}/deepin-default-settings/cups-filters/*.pdf
+%{_datadir}/deepin-default-settings/google-chrome/*.tar
+%{_datadir}/deepin-default-settings/fcitx/*.png

 %changelog
+* Fri Jul 28 2023 leeffo <liweiganga@uniontech.com> - 2021.12.16-1
+- upgrade to version 2021.12.16
+
+* Thu Mar 30 2023 liweiganga <liweiganga@uniontech.com> - 2021.11.11-1
+- update: update to 2021.11.11
+
+* Thu Jul 21 2022 wangqia <wangqia@uniontech.com> - 2020.10.26-3
+- Optimize post script
+
+* Tue Mar 08 2022 liweiganga <liweiganga@uniontech.com> - 2020.10.26-2
+- fix install warning
+
+* Mon Jul 12 2021 weidong <weidong@uniontech.com> - 2020.10.26-1
+- Update 2020.10.26
+
 * Wed Dec 16 2020 weidong <weidong@uniontech.com> - 2020.03.25-2
 - Update user desktop
Author	SHA1	Message	Date
openeuler-ci-bot	75a9f0f41d	!21 [sync] PR-20: upgrade to version 2021.12.16 From: @openeuler-sync-bot Reviewed-by: @leeffo Signed-off-by: @leeffo	2023-08-23 03:01:12 +00:00
leeffo	5efbe47931	upgrade to version 2021.12.16 (cherry picked from commit 8e091f3612066b6fc308297e7ecc825b7ded9079)	2023-08-21 09:10:12 +08:00
openeuler-ci-bot	b9c5962aa7	!18 update to 2021.11.11 From: @leeffo Reviewed-by: @HelloWorld_lvcongqing Signed-off-by: @HelloWorld_lvcongqing	2023-04-10 03:12:10 +00:00
liweiganga	25d1577935	update: update to 2021.11.11	2023-04-06 10:45:29 +08:00
openeuler-ci-bot	3082ce87e7	!13 Optimize post script From: @dedv_dwe Reviewed-by: @yeqinglong01 Signed-off-by: @yeqinglong01	2022-07-21 06:46:30 +00:00
wangqi	be2fb214c8	Optimize post script	2022-07-21 14:07:13 +08:00
openeuler-ci-bot	3b1eac7c05	!7 fix install warning From: @loong-C Reviewed-by: @weidongkl Signed-off-by: @weidongkl	2022-07-18 02:09:20 +00:00
liweigang	ae976350aa	fix install warning	2022-03-08 13:42:45 +08:00
openeuler-ci-bot	44a5086f27	!6 Update deepin-default-settings to 2020.10.26 From: @weidongkl Reviewed-by: @yeqinglong01 Signed-off-by: @yeqinglong01	2021-07-20 03:46:50 +00:00
wei dong	11f080b3a4	Update 2020.10.26	2021-07-12 11:20:21 +08:00