diff options
author | justforlxz | 2022-02-25 13:44:26 +0800 |
---|---|---|
committer | justforlxz | 2022-02-25 13:44:26 +0800 |
commit | 1dee27a3c5f85b63f29da36119c6c1ee6153e975 (patch) | |
tree | 40cc837fb3dad282b29fc937a5b2d54091c8d376 | |
parent | 9deb95ee90a2e3064751cbda6634786a5de47f00 (diff) | |
download | aur-1dee27a3c5f85b63f29da36119c6c1ee6153e975.tar.gz |
update
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | PKGBUILD | 13 | ||||
-rw-r--r-- | remove-tc.patch | 36 |
3 files changed, 50 insertions, 7 deletions
@@ -1,10 +1,10 @@ pkgbase = deepin-daemon-git pkgdesc = Daemon handling the DDE session settings - pkgver = 5.13.12.r44.g69a670c7 + pkgver = 6.0.0.r85.gf8733f93 pkgrel = 1 url = https://github.com/linuxdeepin/dde-daemon install = deepin-daemon-git.install - arch = x86_64 + arch = aarch64 groups = deepin-git license = GPL3 makedepends = golang-github-linuxdeepin-go-dbus-factory-git @@ -29,7 +29,7 @@ pkgbase = deepin-daemon-git depends = lsb-release depends = mobile-broadband-provider-info depends = deepin-polkit-agent-git - depends = deepin-polkit-agent-ext-gnomekeyring + depends = deepin-polkit-agent-ext-gnomekeyring-git depends = udisks2 depends = upower depends = libxkbfile @@ -48,9 +48,11 @@ pkgbase = deepin-daemon-git conflicts = deepin-daemon source = deepin-daemon-git::git://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 @@ -1,15 +1,15 @@ # Maintainer: justforlxz <justforlxz@gmail.com> pkgname=deepin-daemon-git -pkgver=5.13.12.r44.g69a670c7 +pkgver=6.0.0.r85.gf8733f93 pkgrel=1 pkgdesc='Daemon handling the DDE session settings' -arch=('x86_64') +arch=('aarch64') url="https://github.com/linuxdeepin/dde-daemon" license=('GPL3') depends=('deepin-desktop-schemas-git' 'ddcutil' 'deepin-api-git' 'gvfs' 'iso-codes' 'lsb-release' 'mobile-broadband-provider-info' 'deepin-polkit-agent-git' - 'deepin-polkit-agent-ext-gnomekeyring' 'udisks2' 'upower' + 'deepin-polkit-agent-ext-gnomekeyring-git' 'udisks2' 'upower' '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' @@ -25,9 +25,11 @@ groups=('deepin-git') install="$pkgname.install" source=("$pkgname::git://github.com/linuxdeepin/dde-daemon" dde-daemon.patch + remove-tc.patch 'deepin-daemon.sysusers') sha512sums=('SKIP' 'SKIP' + 'SKIP' '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a') pkgver() { @@ -37,8 +39,10 @@ pkgver() { prepare() { cd $pkgname - mkdir build + patch -p1 -i ../remove-tc.patch patch -p1 -i ../dde-daemon.patch + rm -rf system/uadp + rm -rf session/uadpagent export GOPATH="$srcdir/build:/usr/share/gocode" export GO111MODULE=off @@ -53,6 +57,7 @@ prepare() { 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 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 new file mode 100644 index 000000000000..8c0d67a57629 --- /dev/null +++ b/remove-tc.patch @@ -0,0 +1,36 @@ +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" |