From cd78253296ec0e10e9ed15553651ceea95dc6c24 Mon Sep 17 00:00:00 2001 From: zhangshaoning Date: Wed, 10 Sep 2025 16:41:42 +0800 Subject: [PATCH 1/3] modify log content --- 0004-modify-log-content.patch | 25 +++++++++++++++++++++++++ startdde.spec | 7 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0004-modify-log-content.patch diff --git a/0004-modify-log-content.patch b/0004-modify-log-content.patch new file mode 100644 index 0000000..1fdcc76 --- /dev/null +++ b/0004-modify-log-content.patch @@ -0,0 +1,25 @@ +From 66c139eaf528b7bf452f2a4c0892e2d6a4f0a46c Mon Sep 17 00:00:00 2001 +From: zhangshaoning +Date: Wed, 10 Sep 2025 16:38:05 +0800 +Subject: [PATCH] modify log content + +--- + display/xorg.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/display/xorg.go b/display/xorg.go +index 1ecdb7a..472a9bf 100644 +--- a/display/xorg.go ++++ b/display/xorg.go +@@ -533,7 +533,7 @@ func (mm *xMonitorManager) refreshMonitorsCache() { + if monitor.Connected { + stdName, err = mm.getStdMonitorName(monitor.Name, monitor.EDID) + if err != nil { +- logger.Warningf("get monitor %v std name failed: %v", monitor.Name, err) ++ logger.Warningf("get monitor %v std name: %v", monitor.Name, err) + } + } + +-- +2.18.2 + diff --git a/startdde.spec b/startdde.spec index 66e2f39..bdbda6e 100644 --- a/startdde.spec +++ b/startdde.spec @@ -1,7 +1,7 @@ %global _missing_build_ids_terminate_build 0 %global debug_package %{nil} -%define specrelease 1 +%define specrelease 2 Name: startdde Version: 5.9.61 @@ -15,6 +15,7 @@ Source1: vendor.tar.gz Patch1: 0001-uos-startdde-fix-kvm-gpu-message-pci-error.patch Patch2: 0002-uos-startdde-rm-redshift.patch Patch3: 0003-uos-startdde-rm-message-greeter-BadMatch-error.patch +Patch4: 0004-modify-log-content.patch BuildRequires: golang BuildRequires: jq @@ -53,6 +54,7 @@ patch main.go < rpm/main.go.patch %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 tar -xf %{SOURCE1} @@ -104,6 +106,9 @@ fi %{_datadir}/dsg/configs/org.deepin.startdde/ %changelog +* Wed Sep 10 2025 zhangshaoning - 5.9.61-2 +- modify log content + * Thu Aug 03 2023 leeffo - 5.9.61-1 - upgrade to version 5.9.61 -- Gitee From 376d0ca4758afe33bec54e4b9774593d535acc6b Mon Sep 17 00:00:00 2001 From: ut004527 Date: Thu, 25 Sep 2025 14:30:42 +0800 Subject: [PATCH 2/3] spec: update license (cherry picked from commit 2965f68e398399923c25d9f4469daf4cfffb8749) --- startdde.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/startdde.spec b/startdde.spec index bdbda6e..69edcd0 100644 --- a/startdde.spec +++ b/startdde.spec @@ -1,13 +1,13 @@ %global _missing_build_ids_terminate_build 0 %global debug_package %{nil} -%define specrelease 2 +%define specrelease 3 Name: startdde Version: 5.9.61 Release: %{specrelease} Summary: Starter of deepin desktop environment -License: GPLv3 +License: GPLv3+ URL: https://github.com/linuxdeepin/startdde Source0: %{name}-%{version}.tar.gz Source1: vendor.tar.gz @@ -106,6 +106,9 @@ fi %{_datadir}/dsg/configs/org.deepin.startdde/ %changelog +* Thu Sep 25 2025 wangqia - 5.9.61-3 +- spec: update license + * Wed Sep 10 2025 zhangshaoning - 5.9.61-2 - modify log content -- Gitee From 166138f32d35cf5aac0636a5988c77cf25d20a00 Mon Sep 17 00:00:00 2001 From: ut004527 Date: Thu, 25 Sep 2025 14:30:42 +0800 Subject: [PATCH 3/3] spec: update license (cherry picked from commit 2965f68e398399923c25d9f4469daf4cfffb8749) --- startdde.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/startdde.spec b/startdde.spec index 61e2bb6..cb895a6 100644 --- a/startdde.spec +++ b/startdde.spec @@ -1,13 +1,13 @@ %global _missing_build_ids_terminate_build 0 %global debug_package %{nil} -%define specrelease 2 +%define specrelease 4 Name: startdde Version: 5.9.61 Release: %{specrelease} Summary: Starter of deepin desktop environment -License: GPLv3 +License: GPLv3+ URL: https://github.com/linuxdeepin/startdde Source0: %{name}-%{version}.tar.gz Source1: vendor.tar.gz @@ -106,6 +106,12 @@ fi %{_datadir}/dsg/configs/org.deepin.startdde/ %changelog +* Thu Sep 25 2025 wangqia - 5.9.61-4 +- spec: update license + +* Wed Sep 10 2025 zhangshaoning - 5.9.61-3 +- modify log content + * Fri Sep 05 2025 kkz - 5.9.61-2 - fix some exec file path -- Gitee