Date: Wednesday, December 13, 2017 @ 11:31:43 Author: felixonmars Revision: 274196
upgpkg: deepin-daemon 3.2.8-1 Modified: deepin-daemon/trunk/PKGBUILD Deleted: deepin-daemon/trunk/nm-1.10.patch ---------------+ PKGBUILD | 12 +++++------- nm-1.10.patch | 51 --------------------------------------------------- 2 files changed, 5 insertions(+), 58 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-12-13 09:58:46 UTC (rev 274195) +++ PKGBUILD 2017-12-13 11:31:43 UTC (rev 274196) @@ -4,7 +4,7 @@ # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> pkgname=deepin-daemon -pkgver=3.2.7 +pkgver=3.2.8 pkgrel=1 pkgdesc='Daemon handling the DDE session settings' arch=('x86_64') @@ -28,11 +28,10 @@ install="${pkgname}.install" source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-daemon/archive/$pkgver.tar.gz" https://raw.githubusercontent.com/jouyouyun/tap-gesture-patches/master/patches/dde-daemon_3.2.3.patch - 'deepin-daemon.sysusers' 'nm-1.10.patch') -sha512sums=('f408737bb420a8de57ac45940f3607b1a5bb48f7bedf2be8a7a3fa9b6fd4839d4c38b6d7ecf6ba86b394197dc757f70c7e31b7cb65b37dae7297979dcdadf2fe' + 'deepin-daemon.sysusers') +sha512sums=('2608fb666f7b2e980157eefe60f320704c466e064244c34408e80b67f589f55348b4db7a2fc52d1b948e9dad97dbee2dade8723d804edcd7e6d42a0e3d27c597' '29874d6b316bb678b6656827e696d65eef174a53bb8226ed4c2d3bc89e42d5edb466df3c2ac647a1f2eb05d6e2a199b8d07dcaa9302b9227a0692fde0d50bb52' - '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a' - 'd4d152a0dc86ac8acc8131b00b52e8895367119ee08931f42f1bfcadac4e1bf766070db33f97f29f99cba3a68b56c7bbe04269f431121ff7df8b6bfa517c21b4') + '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a') prepare() { export GOPATH="$srcdir/build:/usr/share/gocode" @@ -45,13 +44,12 @@ github.com/BurntSushi/freetype-go/freetype github.com/BurntSushi/freetype-go/freetype/truetype \ github.com/BurntSushi/graphics-go/graphics github.com/fsnotify/fsnotify golang.org/x/sys/unix \ gopkg.in/yaml.v2 github.com/axgle/mahonia github.com/msteinert/pam github.com/nfnt/resize \ - golang.org/x/text/encoding/charmap + golang.org/x/text/encoding/charmap github.com/cryptix/wav sed -i 's#/usr/share/backgrounds/default_background.jpg#/usr/share/backgrounds/deepin/desktop.jpg#' dde-daemon-$pkgver/accounts/user.go cd dde-daemon-$pkgver patch -p1 -i ../dde-daemon_3.2.3.patch - patch -p1 -i ../nm-1.10.patch } build() { Deleted: nm-1.10.patch =================================================================== --- nm-1.10.patch 2017-12-13 09:58:46 UTC (rev 274195) +++ nm-1.10.patch 2017-12-13 11:31:43 UTC (rev 274196) @@ -1,51 +0,0 @@ -diff --git a/network/nm_setting_beans_extend.go b/network/nm_setting_beans_extend.go -index f969fc8a..b8bfce3c 100644 ---- a/network/nm_setting_beans_extend.go -+++ b/network/nm_setting_beans_extend.go -@@ -140,6 +140,46 @@ func checkSettingOlpcMeshValues(data connectionData) (err sectionErrors) { - return - } - -+func getSettingOvsBridgeAvailableKeys(data connectionData) (keys []string) { -+ return -+} -+func getSettingOvsBridgeAvailableValues(data connectionData, key string) (values []kvalue) { -+ return -+} -+func checkSettingOvsBridgeValues(data connectionData) (err sectionErrors) { -+ return -+} -+ -+func getSettingOvsInterfaceAvailableKeys(data connectionData) (keys []string) { -+ return -+} -+func getSettingOvsInterfaceAvailableValues(data connectionData, key string) (values []kvalue) { -+ return -+} -+func checkSettingOvsInterfaceValues(data connectionData) (err sectionErrors) { -+ return -+} -+ -+func getSettingOvsPatchAvailableKeys(data connectionData) (keys []string) { -+ return -+} -+func getSettingOvsPatchAvailableValues(data connectionData, key string) (values []kvalue) { -+ return -+} -+func checkSettingOvsPatchValues(data connectionData) (err sectionErrors) { -+ return -+} -+ -+func getSettingOvsPortAvailableKeys(data connectionData) (keys []string) { -+ return -+} -+func getSettingOvsPortAvailableValues(data connectionData, key string) (values []kvalue) { -+ return -+} -+func checkSettingOvsPortValues(data connectionData) (err sectionErrors) { -+ return -+} -+ - func getSettingProxyAvailableKeys(data connectionData) (keys []string) { - return - }