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

Accepting request 971728 from X11:Deepin:Factory

Browse Source 
- Update version to 5.14.18
  * Change pkg.deepin.io to github.com
  * Fix bugs
  * Update tranlations

OBS-URL: https://build.opensuse.org/request/show/971728
OBS-URL: https://build.opensuse.org/package/show/X11:Deepin/deepin-daemon?expand=0&rev=27
This commit is contained in:
Hillwood Yang 2022-04-21 12:35:46 +00:00 committed by Git OBS Bridge
parent b8461d085b
commit 733a92f0dc
5 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:59c4d2a617432f85e09d8e68dafdd3d6ff7b616a20e930a9bbf41d8e276b981d
size 4510980

8
deepin-daemon.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Apr 3 14:10:23 UTC 2022 - Hillwood Yang <hillwoodroc@gmail.com>
- Update version to 5.14.18
* Change pkg.deepin.io to github.com
* Fix bugs
* Update tranlations
-------------------------------------------------------------------
Wed Feb 23 07:17:20 UTC 2022 - Hillwood Yang <hillwood@opensuse.org>

11
deepin-daemon.spec
View File

@ -16,10 +16,10 @@
#
%define _name dde-daemon
%define import_path pkg.deepin.io/dde/daemon
%define import_path github.com/linuxdeepin/dde-daemon
Name: deepin-daemon
Version: 5.14.11.1
Version: 5.14.18
Release: 0
Summary: Daemon handling the DDE session settings
License: GPL-3.0+
@ -38,10 +38,7 @@ Patch1: %{name}-libinput.patch
# PATCH-FIX-OPENSUSE disable-gobuild-in-makefile.patch hillwood@opensuse.org
# Use gobuild macro instead of makefile to build go binaries
Patch2: disable-gobuild-in-makefile.patch
# PATCH-Fix-UPSTREAM fix-login_defs-path.patch
# https://github.com/linuxdeepin/dde-daemon/commit/1262c03c5e5b4771f04a73ee2c01e1490f4e96af
Patch3: fix-login_defs-path.patch
Patch4: harden_deepin-accounts-daemon.service.patch
Patch3: harden_deepin-accounts-daemon.service.patch
Group: System/GUI/Other
BuildRequires: lightdm
BuildRequires: lightdm-gtk-greeter
@ -299,8 +296,6 @@ fi
# %{_prefix}/lib/modules-load.d/i2c_dev.conf
%dir %{_sysconfdir}/pulse/daemon.conf.d
%config %{_sysconfdir}/pulse/daemon.conf.d/10-deepin.conf
%dir %{_sysconfdir}/grub.d
%{_sysconfdir}/grub.d/35_deepin_gfxmode
%{_prefix}/lib/%{name}/
%dir %{_sysusersdir}
%{_sysusersdir}/%{name}.conf

18
disable-gobuild-in-makefile.patch
View File

@ -1,8 +1,8 @@
diff -Nur dde-daemon-5.14.11.1/Makefile dde-daemon-5.14.11.1-new/Makefile
--- dde-daemon-5.14.11.1/Makefile 2022-01-20 09:58:02.000000000 +0800
+++ dde-daemon-5.14.11.1-new/Makefile 2022-02-17 22:45:53.224122130 +0800
@@ -5,8 +5,8 @@
export GO111MODULE=off
diff -Nur dde-daemon-5.14.18/Makefile dde-daemon-5.14.18-new/Makefile
--- dde-daemon-5.14.18/Makefile 2022-03-03 17:27:19.000000000 +0800
+++ dde-daemon-5.14.18-new/Makefile 2022-04-03 21:42:19.575417035 +0800
@@ -6,8 +6,8 @@
export GOPATH=$(shell go env GOPATH)
BINARIES = \
- dde-session-daemon \
@ -12,7 +12,7 @@ diff -Nur dde-daemon-5.14.11.1/Makefile dde-daemon-5.14.11.1-new/Makefile
grub2 \
search \
theme-thumb-tool \
@@ -15,7 +15,7 @@
@@ -16,7 +16,7 @@
soundeffect \
dde-lockservice \
dde-authority \
@ -21,7 +21,7 @@ diff -Nur dde-daemon-5.14.11.1/Makefile dde-daemon-5.14.11.1-new/Makefile
dde-greeter-setter
LANGUAGES = $(basename $(notdir $(wildcard misc/po/*.po)))
@@ -28,7 +28,7 @@
@@ -31,7 +31,7 @@
@ln -snf ../../../.. ${GOPATH_DIR}/src/${GOPKG_PREFIX};
out/bin/%: prepare
@ -29,8 +29,8 @@ diff -Nur dde-daemon-5.14.11.1/Makefile dde-daemon-5.14.11.1-new/Makefile
+# env GOPATH="${CURDIR}/${GOPATH_DIR}:${GOPATH}" ${GOBUILD} -o $@ ${GOBUILD_OPTIONS} ${GOPKG_PREFIX}/bin/${@F}
out/bin/default-file-manager: bin/default-file-manager/main.c
gcc $^ $(shell pkg-config --cflags --libs gio-unix-2.0) -o $@
@@ -56,7 +56,7 @@
gcc $^ $(shell pkg-config --cflags --libs gio-unix-2.0) $(CFLAGS) -o $@
@@ -59,7 +59,7 @@
deepin-policy-ts-convert ts2policy misc/polkit-action/com.deepin.daemon.$$i.policy.in misc/ts/com.deepin.daemon.$$i.policy misc/polkit-action/com.deepin.daemon.$$i.policy; \
done