6452f6aecf
- Add deepin-daemon-dbus-installer and deepin-daemon-polkit-installer - Update version to 5.13.6 * Fix bugs * Update translations - Add xvfb-run.patch, run `dde-pixmix` under xvfb-run - File polkit and dbus service profiles, workaround rpmlintrc errors - Update version to 5.12.52 * Fix bugs * feat: Initial packit setup * Update translations * feat(accounts): trim quotation of LOCALE` OBS-URL: https://build.opensuse.org/request/show/884411 OBS-URL: https://build.opensuse.org/package/show/X11:Deepin/deepin-daemon?expand=0&rev=8
23 lines
1.1 KiB
Diff
23 lines
1.1 KiB
Diff
diff --git a/image_effect/image_effect.go b/image_effect/image_effect.go
|
|
index 9a888f6a..dfa6ae67 100644
|
|
--- a/image_effect/image_effect.go
|
|
+++ b/image_effect/image_effect.go
|
|
@@ -135,7 +135,7 @@ func newImageEffect() *ImageEffect {
|
|
}
|
|
|
|
func ddePixmix(uid int, inputFile, outputFile string, envVars []string) error {
|
|
- return runCmdRedirectStdOut(uid, outputFile, []string{"dde-pixmix", "-o=-", inputFile}, envVars)
|
|
+ return runCmdRedirectStdOut(uid, outputFile, []string{"xvfb-run", "dde-pixmix", "-o=-", inputFile}, envVars)
|
|
}
|
|
|
|
func (ie *ImageEffect) Get(sender dbus.Sender, effect, filename string) (outputFile string, busErr *dbus.Error) {
|
|
@@ -173,7 +173,7 @@ func (ie *ImageEffect) Get(sender dbus.Sender, effect, filename string) (outputF
|
|
err = xerrors.Errorf("failed to get process %d environ: %w", pid, err)
|
|
return
|
|
}
|
|
- var envVarNames = []string{"DISPLAY", "XDG_RUNTIME_DIR"}
|
|
+ var envVarNames = []string{"XDG_RUNTIME_DIR"}
|
|
var envVars = make([]string, len(envVarNames))
|
|
for idx, envVarName := range envVarNames {
|
|
envVarVal := processEnv.Get(envVarName)
|