diff --git a/0001-add-xauthority-env.patch b/0001-add-xauthority-env.patch new file mode 100644 index 0000000000000000000000000000000000000000..5cfd59dd7e7a5bd632d68cc75bb3d02ea3263810 --- /dev/null +++ b/0001-add-xauthority-env.patch @@ -0,0 +1,48 @@ +From 0b494778adc453ca804a412ec22fc27632ec76e3 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Fri, 29 Aug 2025 16:54:42 +0800 +Subject: [PATCH] add xauthority env + +--- + image_effect/image_effect.go | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/image_effect/image_effect.go b/image_effect/image_effect.go +index 2bb4be9..24cf433 100644 +--- a/image_effect/image_effect.go ++++ b/image_effect/image_effect.go +@@ -13,6 +13,7 @@ import ( + "strconv" + "sync" + "time" ++ "strings" + + dbus "github.com/godbus/dbus" + "github.com/linuxdeepin/go-lib/dbusutil" +@@ -119,6 +120,23 @@ func newImageEffect() *ImageEffect { + } + + func ddePixmix(userName, inputFile, outputFile string, envVars []string) error { ++ var xauthFound bool = false ++ var xauthPath string ++ ++ for _, envItem := range envVars { ++ if strings.Contains(envItem, "XAUTHORITY=") { ++ if len(envItem) > len("XAUTHORITY=") { ++ xauthFound = true ++ } else { ++ xauthFound = false ++ } ++ } ++ } ++ ++ if !xauthFound { ++ xauthPath = "/run/lightdm/"+userName+"/xauthority" ++ } ++ envVars = append(envVars, "XAUTHORITY=" + xauthPath) + + return runCmdRedirectStdOut(userName, outputFile, []string{"dde-pixmix", "-o=-", inputFile}, envVars) + } +-- +2.50.1 + diff --git a/dde-daemon.spec b/dde-daemon.spec index 1915310280abcc039ce02326425bd5b7d8296e39..f3794ff67e086937794be5b3726f124ef6b30db0 100644 --- a/dde-daemon.spec +++ b/dde-daemon.spec @@ -12,7 +12,7 @@ Name: dde-daemon Version: 5.14.122 -Release: 3 +Release: 4 Summary: Daemon handling the DDE session settings License: GPLv3 URL: https://github.com/linuxdeepin/dde-daemon @@ -23,6 +23,7 @@ Patch1: 0001-fix-fonts-gb-st-super.patch Patch2: 0002-donot-set-cpu-mode-while-initlizing.patch Patch3: 0003-dde-daemon-uos-fix-failed-to-start-accounts-service.patch Patch4: 0001-fix-build-error-ddcutil2.0.patch +Patch5: 0001-add-xauthority-env.patch BuildRequires: python3 BuildRequires: golang @@ -214,6 +215,9 @@ fi %{_datadir}/dsg/configs/org.deepin.dde.daemon/ %changelog +* Fri Aug 29 2025 kkz - 5.14.122-4 +- add xauthority to fix coredump issue + * Thu Sep 26 2024 songmingliang - 5.14.122-3 - solve I1T6U5, use accessible URL