update

3 files changed, 9 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 18680ff31d34..7b35e3a77dc1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = deepin-daemon-git
 	pkgdesc = Daemon handling the DDE session settings
-	pkgver = 6.0.0.r102.gbbec686c
+	pkgver = 5.15.1.r6.gac048fb3
 	pkgrel = 1
 	url = https://github.com/linuxdeepin/dde-daemon
 	install = deepin-daemon-git.install
@@ -13,7 +13,7 @@ pkgbase = deepin-daemon-git
 	makedepends = golang-deepin-lib-git
 	makedepends = deepin-api-git
 	makedepends = golang-github-nfnt-resize
-	makedepends = golang-gopkg-yaml.v2
+	makedepends = golang-gopkg-yaml.v3
 	makedepends = sqlite
 	makedepends = deepin-gettext-tools-git
 	makedepends = git
@@ -49,11 +49,9 @@ pkgbase = deepin-daemon-git
 	conflicts = deepin-daemon
 	source = deepin-daemon-git::git+https://github.com/linuxdeepin/dde-daemon
 	source = dde-daemon.patch
-	source = remove-tc.patch
 	source = deepin-daemon.sysusers
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = SKIP
 	sha512sums = 808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a
 
 pkgname = deepin-daemon-git
diff --git a/PKGBUILD b/PKGBUILD
index 80b49f0126de..c35394ec72c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: justforlxz <justforlxz@gmail.com>
 
 pkgname=deepin-daemon-git
-pkgver=6.0.0.r102.gbbec686c
+pkgver=5.15.1.r6.gac048fb3
 pkgrel=1
 pkgdesc='Daemon handling the DDE session settings'
 arch=('x86_64' 'aarch64')
@@ -13,7 +13,7 @@ depends=('deepin-desktop-schemas-git' 'ddcutil' 'deepin-api-git' 'gvfs' 'iso-cod
          'libxkbfile' 'accountsservice' 'deepin-desktop-base-git' 'bamf' 'pulseaudio'
          'org.freedesktop.secrets' 'noto-fonts' 'imwheel')
 makedepends=('golang-github-linuxdeepin-go-dbus-factory-git' 'golang-deepin-gir-git' 'golang-deepin-lib-git'
-             'deepin-api-git' 'golang-github-nfnt-resize' 'golang-gopkg-yaml.v2' 'sqlite' 'deepin-gettext-tools-git'
+             'deepin-api-git' 'golang-github-nfnt-resize' 'golang-gopkg-yaml.v3' 'sqlite' 'deepin-gettext-tools-git'
              'git' 'mercurial' 'python-gobject' 'networkmanager' 'bluez' 'go')
 optdepends=('networkmanager: for network management support'
             'bluez: for bluetooth support'
@@ -25,11 +25,9 @@ groups=('deepin-git')
 install="$pkgname.install"
 source=("$pkgname::git+https://github.com/linuxdeepin/dde-daemon"
         dde-daemon.patch
-        remove-tc.patch
         'deepin-daemon.sysusers')
 sha512sums=('SKIP'
             'SKIP'
-            'SKIP'
             '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
 
 pkgver() {
@@ -39,11 +37,9 @@ pkgver() {
 
 prepare() {
   cd $pkgname
-  if [[ ! -z ${sha} ]];then
-    git checkout -b $sha
-  fi
-
-  patch -p1 -i ../remove-tc.patch
+  sed -i '/uadp/d' bin/dde-system-daemon/main.go
+  sed -i '/uadp/d' bin/dde-session-daemon/module.go
+  sed -i '/uadp/d' bin/dde-session-daemon/daemon.go
   patch -p1 -i ../dde-daemon.patch
   rm -rf system/uadp
   rm -rf session/uadpagent
@@ -60,8 +56,9 @@ prepare() {
   go get -v github.com/godbus/dbus/introspect
   go get -v github.com/godbus/dbus/prop
   go get -v github.com/Lofanmi/pinyin-golang/pinyin
-  go get -v gopkg.in/yaml.v3
   go get -v github.com/youpy/go-wav
+  go get -v google.golang.org/protobuf/proto
+  go get -v github.com/mdlayher/netlink
   sed -i 's#/usr/share/backgrounds/default_background.jpg#/usr/share/backgrounds/deepin/desktop.jpg#' accounts/user.go
 }
 
diff --git a/remove-tc.patch b/remove-tc.patch
deleted file mode 100644
index 8c0d67a57629..000000000000
--- a/remove-tc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/bin/dde-session-daemon/daemon.go b/bin/dde-session-daemon/daemon.go
-index 4f2c8978..40aa7c3d 100644
---- a/bin/dde-session-daemon/daemon.go
-+++ b/bin/dde-session-daemon/daemon.go
-@@ -130,7 +130,6 @@ func (s *SessionDaemon) initModules() {
- 		"screensaver",
- 		"sessionwatcher",
- 		"power", // need screensaver and sessionwatcher
--		"uadpagent",
- 		"service-trigger",
- 		"clipboard",
- 		"keybinding",
-diff --git a/bin/dde-session-daemon/module.go b/bin/dde-session-daemon/module.go
-index a0deb9e4..7b3e048d 100644
---- a/bin/dde-session-daemon/module.go
-+++ b/bin/dde-session-daemon/module.go
-@@ -53,7 +53,6 @@ import (
- 	_ "github.com/linuxdeepin/dde-daemon/screensaver"
- 	_ "github.com/linuxdeepin/dde-daemon/service_trigger"
- 	_ "github.com/linuxdeepin/dde-daemon/session/power"
--	_ "github.com/linuxdeepin/dde-daemon/session/uadpagent"
- 	_ "github.com/linuxdeepin/dde-daemon/sessionwatcher"
- 	_ "github.com/linuxdeepin/dde-daemon/systeminfo"
- 	_ "github.com/linuxdeepin/dde-daemon/timedate"
-diff --git a/bin/dde-system-daemon/main.go b/bin/dde-system-daemon/main.go
-index 2329b2fe..6288c268 100644
---- a/bin/dde-system-daemon/main.go
-+++ b/bin/dde-system-daemon/main.go
-@@ -41,7 +41,6 @@ import (
- 	_ "github.com/linuxdeepin/dde-daemon/system/swapsched"
- 	_ "github.com/linuxdeepin/dde-daemon/system/systeminfo"
- 	_ "github.com/linuxdeepin/dde-daemon/system/timedated"
--	_ "github.com/linuxdeepin/dde-daemon/system/uadp"
- 
- 	login1 "github.com/linuxdeepin/go-dbus-factory/org.freedesktop.login1"
- 	glib "github.com/linuxdeepin/go-gir/glib-2.0"