pool/deepin-daemon
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 910691 from X11:Deepin:Factory

Browse Source 
- Update version to 5.13.36
  * Change go-dbus-factory struct as interface
  * Update test modules
  * Add SetInputIgnore ifc
  * Fix bug
- Drop xvfb-run.patch, merged by upstream

OBS-URL: https://build.opensuse.org/request/show/910691
OBS-URL: https://build.opensuse.org/package/show/X11:Deepin/deepin-daemon?expand=0&rev=15
This commit is contained in:
Hillwood Yang 2021-08-09 12:18:41 +00:00 committed by Git OBS Bridge
parent 539f88b362
commit 6db6db76f5
5 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dde-daemon-5.13.10.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4e78c911628090c7bf5370355d5eaee7867996adea70602fd1ca57e00b3a9a3a
size 3278693

3
dde-daemon-5.13.36.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:31bc08a384fe1662fbd415d98a9a5bc7b34105eac2d61d47456a4b1de80287b4
size 3299601

10
deepin-daemon.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sat Jul 24 07:59:10 UTC 2021 - Hillwood Yang <hillwood@opensuse.org>
- Update version to 5.13.36
* Change go-dbus-factory struct as interface
* Update test modules
* Add SetInputIgnore ifc
* Fix bug
- Drop xvfb-run.patch, merged by upstream
------------------------------------------------------------------- -------------------------------------------------------------------
Sat May 22 11:53:04 UTC 2021 - Hillwood Yang <hillwood@opensuse.org> Sat May 22 11:53:04 UTC 2021 - Hillwood Yang <hillwood@opensuse.org>

3
deepin-daemon.spec
View File

@ -19,7 +19,7 @@
%define import_path pkg.deepin.io/dde/daemon %define import_path pkg.deepin.io/dde/daemon
Name: deepin-daemon Name: deepin-daemon
Version: 5.13.10 Version: 5.13.36
Release: 0 Release: 0
Summary: Daemon handling the DDE session settings Summary: Daemon handling the DDE session settings
License: GPL-3.0+ License: GPL-3.0+
@ -38,7 +38,6 @@ Patch1: %{name}-libinput.patch
# PATCH-FIX-OPENSUSE disable-gobuild-in-makefile.patch hillwood@opensuse.org # PATCH-FIX-OPENSUSE disable-gobuild-in-makefile.patch hillwood@opensuse.org
# Use gobuild macro instead of makefile to build go binaries # Use gobuild macro instead of makefile to build go binaries
Patch2: disable-gobuild-in-makefile.patch Patch2: disable-gobuild-in-makefile.patch
Patch3: xvfb-run.patch
Group: System/GUI/Other Group: System/GUI/Other
%if 0%{?suse_version} > 1500 %if 0%{?suse_version} > 1500
BuildRequires: golang(API) = 1.15 BuildRequires: golang(API) = 1.15

22
xvfb-run.patch
View File

@ -1,22 +0,0 @@
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)