From c168a673cbe857da1ff5d3bc3f8e0672113336bb Mon Sep 17 00:00:00 2001 From: zhuhongbo Date: Mon, 23 Mar 2026 14:37:00 +0800 Subject: [PATCH] version 5.11.29.5 --- ...artdde-fix-kvm-gpu-message-pci-error.patch | 72 ----- 0001-update-license.patch | 25 ++ 0002-uos-startdde-rm-redshift.patch | 282 ------------------ ...de-rm-message-greeter-BadMatch-error.patch | 27 +- ...e-waiting-time-for-some-fail-scenari.patch | 82 +++++ fix-display-method-of-icon-changes.patch | 13 + fix-exe-path.patch | 86 ++++++ fix-invalid-character-U-0023.patch | 12 + fix-wm-kwin-logger-null-ptr-issue.patch | 66 ++++ log-content-modify.patch | 13 + modifiy-brightness-log-msg.patch | 26 ++ modify-ulimit-Soft-1024.patch | 21 ++ startdde-5.9.61.tar.gz | Bin 242574 -> 0 bytes startdde.spec | 114 ++++--- startdde_5.11.29.5.orig.tar.xz | Bin 0 -> 190924 bytes 15 files changed, 444 insertions(+), 395 deletions(-) delete mode 100644 0001-uos-startdde-fix-kvm-gpu-message-pci-error.patch create mode 100644 0001-update-license.patch delete mode 100644 0002-uos-startdde-rm-redshift.patch create mode 100644 enhance-to-reduce-waiting-time-for-some-fail-scenari.patch create mode 100644 fix-display-method-of-icon-changes.patch create mode 100644 fix-exe-path.patch create mode 100644 fix-invalid-character-U-0023.patch create mode 100644 fix-wm-kwin-logger-null-ptr-issue.patch create mode 100644 log-content-modify.patch create mode 100644 modifiy-brightness-log-msg.patch create mode 100644 modify-ulimit-Soft-1024.patch delete mode 100644 startdde-5.9.61.tar.gz create mode 100644 startdde_5.11.29.5.orig.tar.xz diff --git a/0001-uos-startdde-fix-kvm-gpu-message-pci-error.patch b/0001-uos-startdde-fix-kvm-gpu-message-pci-error.patch deleted file mode 100644 index d499476..0000000 --- a/0001-uos-startdde-fix-kvm-gpu-message-pci-error.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -Nuar startdde-5.9.61/display/util.go startdde-5.9.61.new/display/util.go ---- startdde-5.9.61/display/util.go 2022-12-09 11:19:18.000000000 +0800 -+++ startdde-5.9.61.new/display/util.go 2023-04-12 11:21:51.145365556 +0800 -@@ -15,6 +15,7 @@ - "sort" - "strconv" - "strings" -+ "os/exec" - - "github.com/godbus/dbus" - hostname1 "github.com/linuxdeepin/go-dbus-factory/org.freedesktop.hostname1" -@@ -333,6 +334,32 @@ - return chassis, nil - } - -+func CheckKvm() string { -+ var maty string -+ out, err := exec.Command("systemd-detect-virt").Output() -+ if err != nil { -+ maty = "" -+ }else { -+ maty = string(out) -+ maty = strings.Replace(maty, "\n", "", -1) -+ } -+ return maty -+} -+ -+func CheckArch() string { -+ var KArch string -+ out, err := exec.Command("arch").Output() -+ -+ if err != nil { -+ KArch = "" -+ }else { -+ KArch = string(out) -+ KArch = strings.Replace(KArch,"\n","",-1) -+ } -+ return KArch -+} -+ -+ - func getGraphicsCardPciId() string { - var pciId string - subsystems := []string{"drm"} -@@ -362,6 +389,27 @@ - } - } - } -+//qxl not support in arm/loongarch -+//just try drm/card0 -+ if pciId == "" { -+ maty := CheckKvm() -+ KArch := CheckArch() -+ if maty == "kvm" { -+ if KArch == "aarch64" || KArch == "loongarch64" { -+ for _, dev := range devices { -+ name := dev.GetName() -+ if name == "card0" { -+ cardDevice := dev.GetParent() -+ parentDevice := cardDevice.GetParent() -+ pciId = parentDevice.GetProperty("PCI_ID") -+ cardDevice.Unref() -+ parentDevice.Unref() -+ break -+ } -+ } -+ } -+ } -+ } - - return pciId - } diff --git a/0001-update-license.patch b/0001-update-license.patch new file mode 100644 index 0000000..92cf028 --- /dev/null +++ b/0001-update-license.patch @@ -0,0 +1,25 @@ +From 2151cf15ae140064e7b6eb47e8d78fe7cc551ce7 Mon Sep 17 00:00:00 2001 +From: maqi +Date: Tue, 19 Aug 2025 14:27:28 +0800 +Subject: [PATCH] update license + +--- + rpm/startdde.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rpm/startdde.spec b/rpm/startdde.spec +index 53cae4e..02543cd 100644 +--- a/rpm/startdde.spec ++++ b/rpm/startdde.spec +@@ -10,7 +10,7 @@ Name: startdde + Version: 5.6.0.7 + Release: %{specrelease} + Summary: Starter of deepin desktop environment +-License: GPLv3 ++License: GPL-3.0-or-later + URL: https://github.com/linuxdeepin/startdde + Source0: %{name}-%{version}.tar.xz + +-- +2.39.3 + diff --git a/0002-uos-startdde-rm-redshift.patch b/0002-uos-startdde-rm-redshift.patch deleted file mode 100644 index 42eb18b..0000000 --- a/0002-uos-startdde-rm-redshift.patch +++ /dev/null @@ -1,282 +0,0 @@ -diff -Nuar startdde-5.9.61/display/display.go startdde-5.9.61.new/display/display.go ---- startdde-5.9.61/display/display.go 2022-12-09 11:19:18.000000000 +0800 -+++ startdde-5.9.61.new/display/display.go 2023-04-13 09:51:43.128038184 +0800 -@@ -119,7 +119,7 @@ - m.initTouchscreens() - - if !_greeterMode { -- controlRedshift("disable") -+ //controlRedshift("disable") - m.applyColorTempConfig(m.DisplayMode) - } - -diff -Nuar startdde-5.9.61/.history/display/display_20221209111917.go startdde-5.9.61.new/.history/display/display_20221209111917.go ---- startdde-5.9.61/.history/display/display_20221209111917.go 1970-01-01 08:00:00.000000000 +0800 -+++ startdde-5.9.61.new/.history/display/display_20221209111917.go 2023-04-13 09:51:43.124036951 +0800 -@@ -0,0 +1,131 @@ -+// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd. -+// -+// SPDX-License-Identifier: GPL-3.0-or-later -+ -+package display -+ -+import ( -+ "errors" -+ "reflect" -+ -+ "github.com/godbus/dbus" -+ sysdisplay "github.com/linuxdeepin/go-dbus-factory/com.deepin.system.display" -+ "github.com/linuxdeepin/go-lib/dbusutil" -+ "github.com/linuxdeepin/go-lib/log" -+) -+ -+var logger = log.NewLogger("daemon/display") -+ -+const ( -+ dbusServiceName = "com.deepin.daemon.Display" -+ dbusInterface = "com.deepin.daemon.Display" -+ dbusPath = "/com/deepin/daemon/Display" -+) -+ -+var _dpy *Manager -+ -+var _greeterMode bool -+ -+func SetGreeterMode(val bool) { -+ _greeterMode = val -+} -+ -+type scaleFactorsHelper struct { -+ changedCb func(factors map[string]float64) error -+} -+ -+// ScaleFactorsHelper 全局的 scale factors 相关 helper，要传给 xsettings 模块。 -+var ScaleFactorsHelper scaleFactorsHelper -+ -+// 用于在 display.Start 还没被调用时，先由 xsettings.Start 调用了 ScaleFactorsHelper.SetScaleFactors, 缓存数据。 -+var _scaleFactors map[string]float64 -+ -+func (h *scaleFactorsHelper) SetScaleFactors(factors map[string]float64) error { -+ if _dpy == nil { -+ _scaleFactors = factors -+ return nil -+ } -+ return _dpy.setScaleFactors(factors) -+} -+ -+func (h *scaleFactorsHelper) GetScaleFactors() (map[string]float64, error) { -+ sysBus, err := dbus.SystemBus() -+ if err != nil { -+ return nil, err -+ } -+ sysDisplay := sysdisplay.NewDisplay(sysBus) -+ cfgJson, err := sysDisplay.GetConfig(0) -+ if err != nil { -+ return nil, err -+ } -+ var rootCfg struct { -+ Config struct { -+ ScaleFactors map[string]float64 -+ } -+ } -+ err = jsonUnmarshal(cfgJson, &rootCfg) -+ if err != nil { -+ return nil, err -+ } -+ return rootCfg.Config.ScaleFactors, nil -+} -+ -+func (h *scaleFactorsHelper) SetChangedCb(fn func(factors map[string]float64) error) { -+ h.changedCb = fn -+} -+ -+func (m *Manager) setScaleFactors(factors map[string]float64) error { -+ logger.Debug("setScaleFactors", factors) -+ m.sysConfig.mu.Lock() -+ defer m.sysConfig.mu.Unlock() -+ -+ if reflect.DeepEqual(m.sysConfig.Config.ScaleFactors, factors) { -+ return nil -+ } -+ m.sysConfig.Config.ScaleFactors = factors -+ err := m.saveSysConfigNoLock("scale factors changed") -+ if err != nil { -+ logger.Warning(err) -+ } -+ return err -+} -+ -+func Start(service *dbusutil.Service) error { -+ m := newManager(service) -+ m.init() -+ -+ if !_greeterMode { -+ // 正常 startdde -+ err := service.Export(dbusPath, m) -+ if err != nil { -+ return err -+ } -+ -+ err = service.RequestName(dbusServiceName) -+ if err != nil { -+ return err -+ } -+ } -+ _dpy = m -+ return nil -+} -+ -+func StartPart2() error { -+ if _dpy == nil { -+ return errors.New("_dpy is nil") -+ } -+ m := _dpy -+ m.initSysDisplay() -+ m.initTouchscreens() -+ -+ if !_greeterMode { -+ controlRedshift("disable") -+ m.applyColorTempConfig(m.DisplayMode) -+ } -+ -+ return nil -+} -+ -+func SetLogLevel(level log.Priority) { -+ logger.SetLogLevel(level) -+} -diff -Nuar startdde-5.9.61/.history/display/display_20230413095143.go startdde-5.9.61.new/.history/display/display_20230413095143.go ---- startdde-5.9.61/.history/display/display_20230413095143.go 1970-01-01 08:00:00.000000000 +0800 -+++ startdde-5.9.61.new/.history/display/display_20230413095143.go 2023-04-13 09:51:43.132039419 +0800 -@@ -0,0 +1,131 @@ -+// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd. -+// -+// SPDX-License-Identifier: GPL-3.0-or-later -+ -+package display -+ -+import ( -+ "errors" -+ "reflect" -+ -+ "github.com/godbus/dbus" -+ sysdisplay "github.com/linuxdeepin/go-dbus-factory/com.deepin.system.display" -+ "github.com/linuxdeepin/go-lib/dbusutil" -+ "github.com/linuxdeepin/go-lib/log" -+) -+ -+var logger = log.NewLogger("daemon/display") -+ -+const ( -+ dbusServiceName = "com.deepin.daemon.Display" -+ dbusInterface = "com.deepin.daemon.Display" -+ dbusPath = "/com/deepin/daemon/Display" -+) -+ -+var _dpy *Manager -+ -+var _greeterMode bool -+ -+func SetGreeterMode(val bool) { -+ _greeterMode = val -+} -+ -+type scaleFactorsHelper struct { -+ changedCb func(factors map[string]float64) error -+} -+ -+// ScaleFactorsHelper 全局的 scale factors 相关 helper，要传给 xsettings 模块。 -+var ScaleFactorsHelper scaleFactorsHelper -+ -+// 用于在 display.Start 还没被调用时，先由 xsettings.Start 调用了 ScaleFactorsHelper.SetScaleFactors, 缓存数据。 -+var _scaleFactors map[string]float64 -+ -+func (h *scaleFactorsHelper) SetScaleFactors(factors map[string]float64) error { -+ if _dpy == nil { -+ _scaleFactors = factors -+ return nil -+ } -+ return _dpy.setScaleFactors(factors) -+} -+ -+func (h *scaleFactorsHelper) GetScaleFactors() (map[string]float64, error) { -+ sysBus, err := dbus.SystemBus() -+ if err != nil { -+ return nil, err -+ } -+ sysDisplay := sysdisplay.NewDisplay(sysBus) -+ cfgJson, err := sysDisplay.GetConfig(0) -+ if err != nil { -+ return nil, err -+ } -+ var rootCfg struct { -+ Config struct { -+ ScaleFactors map[string]float64 -+ } -+ } -+ err = jsonUnmarshal(cfgJson, &rootCfg) -+ if err != nil { -+ return nil, err -+ } -+ return rootCfg.Config.ScaleFactors, nil -+} -+ -+func (h *scaleFactorsHelper) SetChangedCb(fn func(factors map[string]float64) error) { -+ h.changedCb = fn -+} -+ -+func (m *Manager) setScaleFactors(factors map[string]float64) error { -+ logger.Debug("setScaleFactors", factors) -+ m.sysConfig.mu.Lock() -+ defer m.sysConfig.mu.Unlock() -+ -+ if reflect.DeepEqual(m.sysConfig.Config.ScaleFactors, factors) { -+ return nil -+ } -+ m.sysConfig.Config.ScaleFactors = factors -+ err := m.saveSysConfigNoLock("scale factors changed") -+ if err != nil { -+ logger.Warning(err) -+ } -+ return err -+} -+ -+func Start(service *dbusutil.Service) error { -+ m := newManager(service) -+ m.init() -+ -+ if !_greeterMode { -+ // 正常 startdde -+ err := service.Export(dbusPath, m) -+ if err != nil { -+ return err -+ } -+ -+ err = service.RequestName(dbusServiceName) -+ if err != nil { -+ return err -+ } -+ } -+ _dpy = m -+ return nil -+} -+ -+func StartPart2() error { -+ if _dpy == nil { -+ return errors.New("_dpy is nil") -+ } -+ m := _dpy -+ m.initSysDisplay() -+ m.initTouchscreens() -+ -+ if !_greeterMode { -+ //controlRedshift("disable") -+ m.applyColorTempConfig(m.DisplayMode) -+ } -+ -+ return nil -+} -+ -+func SetLogLevel(level log.Priority) { -+ logger.SetLogLevel(level) -+} diff --git a/0003-uos-startdde-rm-message-greeter-BadMatch-error.patch b/0003-uos-startdde-rm-message-greeter-BadMatch-error.patch index 05e5ddb..deb9226 100644 --- a/0003-uos-startdde-rm-message-greeter-BadMatch-error.patch +++ b/0003-uos-startdde-rm-message-greeter-BadMatch-error.patch @@ -1,14 +1,27 @@ -diff -Nuar startdde-5.9.61/display/greeter.go startdde-5.9.61.new/display/greeter.go ---- startdde-5.9.61/display/greeter.go 2022-12-09 11:19:18.000000000 +0800 -+++ startdde-5.9.61.new/display/greeter.go 2023-04-19 17:14:55.561867197 +0800 -@@ -27,7 +27,9 @@ +From ceeb82ed5d30267a2934fd8a0705f46f89dcebc9 Mon Sep 17 00:00:00 2001 +From: liuzhilin +Date: Fri, 18 Aug 2023 14:21:30 +0800 +Subject: [PATCH] uos-startdde-rm-message-greeter-BadMatch-error + +--- + display/greeter.go | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/display/greeter.go b/display/greeter.go +index a92eff4..c054749 100644 +--- a/display/greeter.go ++++ b/display/greeter.go +@@ -27,7 +27,9 @@ func (m *Manager) beginMoveMouse() { } err := m.doShowCursor(true) if err != nil { - logger.Warning(err) -+ //display only on greeter stage and in xorg server the err occurs when it show hide cursor -+ //just replace warning with debug to avoid print the err in /var/log/messages -+ logger.Debug(err) ++ //display only on greeter stage and in xorg server the err occurs when it show hide cursor ++ //just replace warning with debug to avoid print the err in /var/log/messages ++ logger.Debug(err) } m.cursorShowed = true } +-- +2.39.3 + diff --git a/enhance-to-reduce-waiting-time-for-some-fail-scenari.patch b/enhance-to-reduce-waiting-time-for-some-fail-scenari.patch new file mode 100644 index 0000000..21f3dde --- /dev/null +++ b/enhance-to-reduce-waiting-time-for-some-fail-scenari.patch @@ -0,0 +1,82 @@ +From 01baadf983e70a4b176bcb0cc12291e7f5fb430f Mon Sep 17 00:00:00 2001 +From: kkz +Date: Tue, 14 Jan 2025 15:57:07 +0800 +Subject: [PATCH] enhance to reduce waiting time for some fail scenario + +--- + sound_effect.go | 36 ++++++++++++++++++++++++++++++------ + 1 file changed, 30 insertions(+), 6 deletions(-) + +diff --git a/sound_effect.go b/sound_effect.go +index 21476d9..0b1d087 100644 +--- a/sound_effect.go ++++ b/sound_effect.go +@@ -13,6 +13,7 @@ import ( + "os/user" + "path/filepath" + "sync" ++ "time" + + dbus1 "github.com/godbus/dbus" + "github.com/linuxdeepin/dde-api/soundutils" +@@ -20,7 +21,7 @@ import ( + "github.com/linuxdeepin/go-lib/pulse" + ) + +-var soundThemePlayer soundthemeplayer.SoundThemePlayer ++var soundThemePlayer soundthemeplayer.SoundThemePlayer = nil + + func playLoginSound() { + markFile := filepath.Join(os.TempDir(), "startdde-login-sound-mark") +@@ -100,6 +101,10 @@ func playLogoutSound() { + } + logger.Debugf("ALSA device: %q", device) + quitPulseAudio() ++ ++ if nil == soundThemePlayer { ++ return ++ } + err = soundThemePlayer.Play(0, soundutils.GetSoundTheme(), + soundutils.EventDesktopLogout, device) + if err != nil { +@@ -107,13 +112,32 @@ func playLogoutSound() { + } + } + ++var SoundThemePlayerInitTimeout time.Duration = 5 + func initSoundThemePlayer() { +- sysBus, err := dbus1.SystemBus() +- if err != nil { +- return +- } ++ soundThemePlayer = nil ++ ++ ch := make(chan soundthemeplayer.SoundThemePlayer) ++ go func() { ++ sysBus, err := dbus1.SystemBus() ++ if err != nil { ++ logger.Warning("SoundThemePlayer.Play Init Err:", err) ++ ch <- nil ++ close(ch) ++ return ++ } + +- soundThemePlayer = soundthemeplayer.NewSoundThemePlayer(sysBus) ++ localPlayer := soundthemeplayer.NewSoundThemePlayer(sysBus) ++ ch <- localPlayer ++ close(ch) ++ } () ++ ++ select { ++ case <-ch: ++ soundThemePlayer = <-ch ++ case <-time.After(SoundThemePlayerInitTimeout): ++ logger.Warning("SoundThemePlayer.Play Init Err: timeout") ++ soundThemePlayer = nil ++ } + } + + const ( +-- +2.43.0 + diff --git a/fix-display-method-of-icon-changes.patch b/fix-display-method-of-icon-changes.patch new file mode 100644 index 0000000..08500b2 --- /dev/null +++ b/fix-display-method-of-icon-changes.patch @@ -0,0 +1,13 @@ +diff --git a/main.go b/main.go +index 7714fb6..7604917 100644 +--- a/main.go ++++ b/main.go +@@ -150,7 +150,7 @@ end: + + const ( + cmdKWin = "/usr/bin/kwin_no_scale" +- cmdDdeSessionDaemon = "/usr/lib/deepin-daemon/dde-session-daemon" ++ cmdDdeSessionDaemon = "/usr/libexec/deepin-daemon/dde-session-daemon" + cmdDdeDock = "/usr/bin/dde-dock" + cmdDdeDockWrapper = "/usr/bin/dde-dock-wrapper" + cmdDdeDesktop = "/usr/bin/dde-desktop" diff --git a/fix-exe-path.patch b/fix-exe-path.patch new file mode 100644 index 0000000..3329fa9 --- /dev/null +++ b/fix-exe-path.patch @@ -0,0 +1,86 @@ +From ee97bdbede76dd7712f86661cf51b7daa5c432cc Mon Sep 17 00:00:00 2001 +From: Super User +Date: Wed, 11 Dec 2024 10:58:07 +0800 +Subject: [PATCH] fix exe path + +--- + display/manager.go | 2 +- + session.go | 10 +++++----- + utils.go | 2 +- + 3 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/display/manager.go b/display/manager.go +index 0937b93..f9ac9f3 100644 +--- a/display/manager.go ++++ b/display/manager.go +@@ -92,7 +92,7 @@ const ( + defaultTemperature = 6500 + defaultRotateScreenTimeDelay = 500 + +- cmdTouchscreenDialogBin = "/usr/lib/deepin-daemon/dde-touchscreen-dialog" ++ cmdTouchscreenDialogBin = "/usr/libexec/deepin-daemon/dde-touchscreen-dialog" + + gsSchemaXSettings = "com.deepin.xsettings" + gsKeyScaleFactor = "scale-factor" +diff --git a/session.go b/session.go +index 5e638e2..1d355ca 100644 +--- a/session.go ++++ b/session.go +@@ -246,13 +246,13 @@ func (m *SessionManager) prepareLogout(force bool) { + } + } + +-// kill process LangSelector by cmd "pkill -ef -u $UID /usr/lib/deepin-daemon/langselector" ++// kill process LangSelector by cmd "pkill -ef -u $UID /usr/libexec/deepin-daemon/langselector" + func killLangSelector() { + u, err := user.Current() + 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 { +@@ -549,7 +549,7 @@ func (m *SessionManager) setDDEBlackScreenActive(active, useDBus bool) { + } + } + } else { +- cmd := exec.Command("/usr/lib/deepin-daemon/dde-blackwidget", "nodbus") ++ cmd := exec.Command("/usr/libexec/deepin-daemon/dde-blackwidget", "nodbus") + err := cmd.Start() + if err == nil { + go func() { +@@ -1098,14 +1098,14 @@ func (m *SessionManager) launchDDE(restart bool) { + 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) + } + } + } +diff --git a/utils.go b/utils.go +index 513d167..7f40ca8 100644 +--- a/utils.go ++++ b/utils.go +@@ -177,7 +177,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.43.0 + diff --git a/fix-invalid-character-U-0023.patch b/fix-invalid-character-U-0023.patch new file mode 100644 index 0000000..fe5314a --- /dev/null +++ b/fix-invalid-character-U-0023.patch @@ -0,0 +1,12 @@ +diff --git a/display/display.go b/display/display.go +index 3c077f8..8661a51 100644 +--- a/display/display.go ++++ b/display/display.go +@@ -154,7 +154,6 @@ func StartPart2() error { + m.initSysDisplay() + m.initTouchscreens() + if !_greeterMode { +- controlRedshift("disable") + m.applyColorTempConfig(m.DisplayMode) + } + diff --git a/fix-wm-kwin-logger-null-ptr-issue.patch b/fix-wm-kwin-logger-null-ptr-issue.patch new file mode 100644 index 0000000..c6b53dc --- /dev/null +++ b/fix-wm-kwin-logger-null-ptr-issue.patch @@ -0,0 +1,66 @@ +From 523eaa6438fd94402c3cf0494180045232758b14 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Sat, 21 Dec 2024 08:31:25 +0800 +Subject: [PATCH] fix wm kwin logger null ptr issue + +--- + main.go | 4 ++++ + wm_kwin/wm_kwin.go | 9 ++++++++- + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/main.go b/main.go +index 7604917..36718c2 100644 +--- a/main.go ++++ b/main.go +@@ -210,6 +210,10 @@ func launchCoreComponents(sm *SessionManager, restart bool) { + if !_useWayland { // x11 环境 + _useKWin = shouldUseDDEKWin() + if _useKWin { ++ err := wm_kwin.Start(logger) ++ if err != nil { ++ logger.Warning(err) ++ } + if wmChooserLaunched { + wm_kwin.SyncWmChooserChoice() + } +diff --git a/wm_kwin/wm_kwin.go b/wm_kwin/wm_kwin.go +index d3d96eb..49a6ef4 100644 +--- a/wm_kwin/wm_kwin.go ++++ b/wm_kwin/wm_kwin.go +@@ -34,13 +34,18 @@ const ( + osdSwitchWMError = "SwitchWMError" + ) + +-var logger *log.Logger ++var logger *log.Logger = nil; + + func Start(l *log.Logger) error { ++ if nil != logger { ++ return nil ++ } ++ + logger = l + + sessionBus, err := dbus.SessionBus() + if err != nil { ++ logger = nil + return err + } + +@@ -48,11 +53,13 @@ func Start(l *log.Logger) error { + s := newSwitcher(service) + err = service.Export(swDBusPath, s) + if err != nil { ++ logger = nil + return err + } + + err = service.RequestName(swDBusDest) + if err != nil { ++ logger = nil + return err + } + +-- +2.43.0 + diff --git a/log-content-modify.patch b/log-content-modify.patch new file mode 100644 index 0000000..1e6b61c --- /dev/null +++ b/log-content-modify.patch @@ -0,0 +1,13 @@ +diff --git a/display/xorg.go b/display/xorg.go +index 21d275f..cd0db83 100644 +--- a/display/xorg.go ++++ b/display/xorg.go +@@ -540,7 +540,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) + } + } + diff --git a/modifiy-brightness-log-msg.patch b/modifiy-brightness-log-msg.patch new file mode 100644 index 0000000..06dcd31 --- /dev/null +++ b/modifiy-brightness-log-msg.patch @@ -0,0 +1,26 @@ +From a80becdd1871a81380e2b5b1fe9e5a26e65aa243 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Mon, 15 Sep 2025 17:30:18 +0800 +Subject: [PATCH 1/1] modifiy log msg + +Signed-off-by: Super User +--- + display/brightness/brightness.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/display/brightness/brightness.go b/display/brightness/brightness.go +index f4b7b6f..dd4b296 100644 +--- a/display/brightness/brightness.go ++++ b/display/brightness/brightness.go +@@ -260,7 +260,7 @@ func setBestBacklightController(controllers displayBl.Controllers, value float64 + } + return err + } +- return errors.New("setBestBacklightController failed to set best backlight.") ++ return errors.New("setBestBacklightController: Unable to set best backlight.") + } + + func setBacklight(value float64, edidBase64 string, controllers displayBl.Controllers) error { +-- +2.43.0 + diff --git a/modify-ulimit-Soft-1024.patch b/modify-ulimit-Soft-1024.patch new file mode 100644 index 0000000..6f7082a --- /dev/null +++ b/modify-ulimit-Soft-1024.patch @@ -0,0 +1,21 @@ +diff --git a/main.go b/main.go +index 36718c2..6beb00a 100644 +--- a/main.go ++++ b/main.go +@@ -438,6 +438,16 @@ func permitLogind() { + + func main() { + logger.Info("in wayland mode:", _useWayland) ++ var rlim syscall.Rlimit ++ var nlim syscall.Rlimit ++ rlim.Cur = 1024 ++ syscall.Getrlimit(syscall.RLIMIT_NOFILE, &nlim) ++ rlim.Max = nlim.Max ++ err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rlim) ++ if err != nil { ++ logger.Info("syscall setrlimit:", err) ++ } ++ + flag.Parse() + if len(os.Args) > 0 && strings.HasPrefix(filepath.Base(os.Args[0]), "greeter") { + // os.Args[0] 应该一般是 greeter-display-daemon diff --git a/startdde-5.9.61.tar.gz b/startdde-5.9.61.tar.gz deleted file mode 100644 index 6d0e55d59ba4c546c54c504b5cdd205cb024eb60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242574 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