From ba1e073cbb51608d1f17fd7f9d434b79745cf58e Mon Sep 17 00:00:00 2001
From: zhaoshuang <zhaoshuang@uniontech.com>
Date: Wed, 3 Sep 2025 14:06:39 +0800
Subject: [PATCH] sync and add xauthority env

---
 0001-add-xauthority-env.patch | 48 +++++++++++++++++++++++++++++++++++
 dde-daemon.spec               | 13 +++++++---
 2 files changed, 58 insertions(+), 3 deletions(-)
 create mode 100644 0001-add-xauthority-env.patch

diff --git a/0001-add-xauthority-env.patch b/0001-add-xauthority-env.patch
new file mode 100644
index 0000000..5cfd59d
--- /dev/null
+++ b/0001-add-xauthority-env.patch
@@ -0,0 +1,48 @@
+From 0b494778adc453ca804a412ec22fc27632ec76e3 Mon Sep 17 00:00:00 2001
+From: Super User <root@localhost.localdomain>
+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 17e4034..f3794ff 100644
--- a/dde-daemon.spec
+++ b/dde-daemon.spec
@@ -12,17 +12,18 @@
 
 Name:           dde-daemon
 Version:        5.14.122
-Release:        2
+Release:        4
 Summary:        Daemon handling the DDE session settings
 License:        GPLv3
-URL:            http://shuttle.corp.deepin.com/cache/tasks/18802/unstable-amd64/
-Source0:        %{name}-%{version}.tar.gz
+URL:            https://github.com/linuxdeepin/dde-daemon
+Source0:        https://github.com/linuxdeepin/dde-daemon/archive/refs/tags/%{name}-%{version}.tar.gz
 Source1:        vendor.tar.gz
 Source2:        %{sname}.sysusers
 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,12 @@ fi
 %{_datadir}/dsg/configs/org.deepin.dde.daemon/
 
 %changelog
+* Fri Aug 29 2025 kkz <zhaoshuang@uniontech.com> - 5.14.122-4
+- add xauthority to fix coredump issue
+
+* Thu Sep 26 2024 songmingliang <songmingliang@uniontech.com> - 5.14.122-3
+- solve I1T6U5, use accessible URL
+
 * Tue Apr 09 2024 liuzhilin <liuzhilin@uniontech.com> - 5.14.122-2
 - fix build error for dccutils-2.0
 
-- 
Gitee