diff --git a/0005-correct-file-path.patch b/0005-correct-file-path.patch new file mode 100644 index 0000000000000000000000000000000000000000..a241982186894e6e77369b4b79657d3928a9f62f --- /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/startdde.spec b/startdde.spec index 69edcd0aee74a1d8717d06266074698565a870e1..f5b530a28ef2b0ff0fcad956c2e75c1a9e1def1b 100644 --- a/startdde.spec +++ b/startdde.spec @@ -1,7 +1,7 @@ %global _missing_build_ids_terminate_build 0 %global debug_package %{nil} -%define specrelease 3 +%define specrelease 4 Name: startdde Version: 5.9.61 @@ -16,6 +16,7 @@ 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 @@ -55,6 +56,7 @@ patch main.go < rpm/main.go.patch %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 tar -xf %{SOURCE1} @@ -106,12 +108,15 @@ fi %{_datadir}/dsg/configs/org.deepin.startdde/ %changelog -* Thu Sep 25 2025 wangqia - 5.9.61-3 +* Thu Sep 25 2025 wangqia - 5.9.61-4 - spec: update license -* Wed Sep 10 2025 zhangshaoning - 5.9.61-2 +* 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