From e57454e1a22c0236982cf4e236c979f70afdf8a0 Mon Sep 17 00:00:00 2001 From: songmingliang Date: Sat, 11 Oct 2025 16:25:09 +0800 Subject: [PATCH] sync from master to update --- 0004-modify-log-content.patch | 25 ++++++++++++++ 0005-correct-file-path.patch | 63 +++++++++++++++++++++++++++++++++++ README.en.md | 36 ++++++++++++++++++++ README.md | 37 ++++++++++++++++++++ startdde.spec | 26 ++++++++++++--- 5 files changed, 182 insertions(+), 5 deletions(-) create mode 100644 0004-modify-log-content.patch create mode 100644 0005-correct-file-path.patch create mode 100644 README.en.md create mode 100644 README.md 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/0005-correct-file-path.patch b/0005-correct-file-path.patch new file mode 100644 index 0000000..a241982 --- /dev/null +++ b/0005-correct-file-path.patch @@ -0,0 +1,63 @@ +From 7ffa84cf682238616861cc2dd89306ea070b5f3e Mon Sep 17 00:00:00 2001 +From: Super User +Date: Fri, 5 Sep 2025 17:14:06 +0800 +Subject: [PATCH] correct file path + +--- + session.go | 8 ++++---- + utils.go | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/session.go b/session.go +index 26f89ef..7111679 100644 +--- a/session.go ++++ b/session.go +@@ -186,7 +186,7 @@ func killLangSelector() { + if err != nil { + logger.Debug("failed to get current user:", err) + } +- out, err := exec.Command("pkill", "-ef", "-u", u.Uid, "/usr/lib/deepin-daemon/langselector").Output() ++ out, err := exec.Command("pkill", "-ef", "-u", u.Uid, "/usr/libexec/deepin-daemon/langselector").Output() + if err != nil { + logger.Debug("failed to kill langselector:", err) + } else { +@@ -708,14 +708,14 @@ func (m *SessionManager) launchDDE() { + if osdRunning { + if globalXSManager.NeedRestartOSD() { + logger.Info("Restart dde-osd") +- m.launch("/usr/lib/deepin-daemon/dde-osd", false) ++ m.launch("/usr/libexec/deepin-daemon/dde-osd", false) + } + } else { + notificationsOwned, err := isNotificationsOwned() + if err != nil { + logger.Warning("failed to get org.freedesktop.Notifications status:", err) + } else if !notificationsOwned { +- m.launch("/usr/lib/deepin-daemon/dde-osd", false) ++ m.launch("/usr/libexec/deepin-daemon/dde-osd", false) + } + } + } +@@ -1389,4 +1389,4 @@ func initXEventMonitor() { + setDPMSMode(true) + } + }) +-} +\ No newline at end of file ++} +diff --git a/utils.go b/utils.go +index 53eae55..4ea08de 100644 +--- a/utils.go ++++ b/utils.go +@@ -148,7 +148,7 @@ func showDDEWelcome() error { + if canRestore { + return nil + } +- cmd := exec.Command("/usr/lib/deepin-daemon/dde-welcome") ++ cmd := exec.Command("/usr/libexec/deepin-daemon/dde-welcome") + err = cmd.Start() + if err != nil { + return err +-- +2.50.1 + diff --git a/README.en.md b/README.en.md new file mode 100644 index 0000000..a6c62e3 --- /dev/null +++ b/README.en.md @@ -0,0 +1,36 @@ +# startdde + +#### Description +startdde + +#### 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 new file mode 100644 index 0000000..7388a2d --- /dev/null +++ b/README.md @@ -0,0 +1,37 @@ +# startdde + +#### 介绍 +startdde + +#### 软件架构 +软件架构说明 + + +#### 安装教程 + +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/startdde.spec b/startdde.spec index 66e2f39..8c08497 100644 --- a/startdde.spec +++ b/startdde.spec @@ -1,13 +1,13 @@ %global _missing_build_ids_terminate_build 0 %global debug_package %{nil} -%define specrelease 1 +%define specrelease 5 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 @@ -15,6 +15,8 @@ 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 +Patch5: 0005-correct-file-path.patch BuildRequires: golang BuildRequires: jq @@ -45,7 +47,7 @@ Recommends: dde-qt5integration %prep %setup -n %{name}-%{version} -sed -i 's|/usr/lib/deepin-daemon|/usr/libexec/deepin-daemon|g' \ +%{__sed} -i 's|/usr/lib/deepin-daemon|/usr/libexec/deepin-daemon|g' \ misc/auto_launch/chinese.json misc/auto_launch/default.json patch main.go < rpm/main.go.patch @@ -53,8 +55,10 @@ patch main.go < rpm/main.go.patch %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 -tar -xf %{SOURCE1} +%{__tar} -xf %{SOURCE1} %build %ifarch loongarch64 @@ -64,7 +68,7 @@ export CGO_ENABLE=1 export GOPATH=%{_datadir}/gocode:%{_builddir}/%{name}-%{version}/vendor:$GOPATH ## Scripts in /etc/X11/Xsession.d are not executed after xorg start -sed -i 's|X11/Xsession.d|X11/xinit/xinitrc.d|g' Makefile +%{__sed} -i 's|X11/Xsession.d|X11/xinit/xinitrc.d|g' Makefile %make_build GO_BUILD_FLAGS='-trimpath -ldflags "-s" -buildmode=pie' @@ -104,6 +108,18 @@ fi %{_datadir}/dsg/configs/org.deepin.startdde/ %changelog +* Sat Oct 11 2025 songmingliang - 5.9.61-5 +- spec: use marcor replace command and dir + +* 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 + * Thu Aug 03 2023 leeffo - 5.9.61-1 - upgrade to version 5.9.61 -- Gitee