Date: Wednesday, December 13, 2017 @ 11:32:10 Author: felixonmars Revision: 274197
archrelease: copy trunk to community-x86_64 Added: deepin-daemon/repos/community-x86_64/PKGBUILD (from rev 274196, deepin-daemon/trunk/PKGBUILD) deepin-daemon/repos/community-x86_64/deepin-daemon.install (from rev 274196, deepin-daemon/trunk/deepin-daemon.install) deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers (from rev 274196, deepin-daemon/trunk/deepin-daemon.sysusers) Deleted: deepin-daemon/repos/community-x86_64/PKGBUILD deepin-daemon/repos/community-x86_64/deepin-daemon.install deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers deepin-daemon/repos/community-x86_64/nm-1.10.patch ------------------------+ PKGBUILD | 134 +++++++++++++++++++++++------------------------ deepin-daemon.install | 6 +- deepin-daemon.sysusers | 4 - nm-1.10.patch | 51 ----------------- 4 files changed, 71 insertions(+), 124 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-12-13 11:31:43 UTC (rev 274196) +++ PKGBUILD 2017-12-13 11:32:10 UTC (rev 274197) @@ -1,68 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan <felixonm...@archlinux.org> -# Contributor: Josip Ponjavic <josipponjavic at gmail dot com> -# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> - -pkgname=deepin-daemon -pkgver=3.2.7 -pkgrel=1 -pkgdesc='Daemon handling the DDE session settings' -arch=('x86_64') -url="https://github.com/linuxdeepin/dde-daemon" -license=('GPL3') -depends=('deepin-desktop-schemas' 'gvfs' 'libcanberra-pulse' 'poppler-glib' - 'rfkill' 'bluez' 'deepin-notifications' 'iso-codes' 'lsb-release' - 'mobile-broadband-provider-info' 'deepin-polkit-agent' 'udisks2' 'upower' # 'gcc-libs>=5.3.0-3' - 'libxkbfile' 'accountsservice' 'deepin-desktop-base' 'bamf' 'pulseaudio' - 'gnome-keyring' 'noto-fonts') -makedepends=('deepin-dbus-factory' 'deepin-gir-generator' 'deepin-go-lib' 'deepin-api' 'sqlite' - 'deepin-gettext-tools' 'git' 'mercurial' 'python-gobject' 'networkmanager' 'go-pie') - # 'gcc-go') -optdepends=('networkmanager: for network management support' - 'deepin-grub2-themes: theme for grub module' - 'iw: for miracast module' - 'proxychains-ng: for proxy configuration module') -conflicts=('dde-daemon') -replaces=('dde-daemon') -groups=('deepin') -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' - '29874d6b316bb678b6656827e696d65eef174a53bb8226ed4c2d3bc89e42d5edb466df3c2ac647a1f2eb05d6e2a199b8d07dcaa9302b9227a0692fde0d50bb52' - '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a' - 'd4d152a0dc86ac8acc8131b00b52e8895367119ee08931f42f1bfcadac4e1bf766070db33f97f29f99cba3a68b56c7bbe04269f431121ff7df8b6bfa517c21b4') - -prepare() { - export GOPATH="$srcdir/build:/usr/share/gocode" - - # https://github.com/niemeyer/gopkg/issues/50 - git config --global http.https://gopkg.in.followRedirects true - - go get github.com/BurntSushi/xgb github.com/BurntSushi/xgbutil github.com/linuxdeepin/go-x11-client \ - github.com/mattn/go-sqlite3 gopkg.in/alecthomas/kingpin.v2 github.com/disintegration/imaging \ - 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 - - 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() { - cd dde-daemon-$pkgver - make -C network/nm_generator gen-nm-code - make # USE_GCCGO=1 -} - -package() { - cd dde-daemon-$pkgver - make DESTDIR="$pkgdir" install # USE_GCCGO=1 - - install -Dm644 ../deepin-daemon.sysusers "$pkgdir/usr/lib/sysusers.d/deepin-daemon.conf" -} Copied: deepin-daemon/repos/community-x86_64/PKGBUILD (from rev 274196, deepin-daemon/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-12-13 11:32:10 UTC (rev 274197) @@ -0,0 +1,66 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Josip Ponjavic <josipponjavic at gmail dot com> +# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com> + +pkgname=deepin-daemon +pkgver=3.2.8 +pkgrel=1 +pkgdesc='Daemon handling the DDE session settings' +arch=('x86_64') +url="https://github.com/linuxdeepin/dde-daemon" +license=('GPL3') +depends=('deepin-desktop-schemas' 'gvfs' 'libcanberra-pulse' 'poppler-glib' + 'rfkill' 'bluez' 'deepin-notifications' 'iso-codes' 'lsb-release' + 'mobile-broadband-provider-info' 'deepin-polkit-agent' 'udisks2' 'upower' # 'gcc-libs>=5.3.0-3' + 'libxkbfile' 'accountsservice' 'deepin-desktop-base' 'bamf' 'pulseaudio' + 'gnome-keyring' 'noto-fonts') +makedepends=('deepin-dbus-factory' 'deepin-gir-generator' 'deepin-go-lib' 'deepin-api' 'sqlite' + 'deepin-gettext-tools' 'git' 'mercurial' 'python-gobject' 'networkmanager' 'go-pie') + # 'gcc-go') +optdepends=('networkmanager: for network management support' + 'deepin-grub2-themes: theme for grub module' + 'iw: for miracast module' + 'proxychains-ng: for proxy configuration module') +conflicts=('dde-daemon') +replaces=('dde-daemon') +groups=('deepin') +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') +sha512sums=('2608fb666f7b2e980157eefe60f320704c466e064244c34408e80b67f589f55348b4db7a2fc52d1b948e9dad97dbee2dade8723d804edcd7e6d42a0e3d27c597' + '29874d6b316bb678b6656827e696d65eef174a53bb8226ed4c2d3bc89e42d5edb466df3c2ac647a1f2eb05d6e2a199b8d07dcaa9302b9227a0692fde0d50bb52' + '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a') + +prepare() { + export GOPATH="$srcdir/build:/usr/share/gocode" + + # https://github.com/niemeyer/gopkg/issues/50 + git config --global http.https://gopkg.in.followRedirects true + + go get github.com/BurntSushi/xgb github.com/BurntSushi/xgbutil github.com/linuxdeepin/go-x11-client \ + github.com/mattn/go-sqlite3 gopkg.in/alecthomas/kingpin.v2 github.com/disintegration/imaging \ + 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 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 +} + +build() { + cd dde-daemon-$pkgver + make -C network/nm_generator gen-nm-code + make # USE_GCCGO=1 +} + +package() { + cd dde-daemon-$pkgver + make DESTDIR="$pkgdir" install # USE_GCCGO=1 + + install -Dm644 ../deepin-daemon.sysusers "$pkgdir/usr/lib/sysusers.d/deepin-daemon.conf" +} Deleted: deepin-daemon.install =================================================================== --- deepin-daemon.install 2017-12-13 11:31:43 UTC (rev 274196) +++ deepin-daemon.install 2017-12-13 11:32:10 UTC (rev 274197) @@ -1,3 +0,0 @@ -post_remove() { - rm -f /var/cache/deepin/mark-setup-network-services -} Copied: deepin-daemon/repos/community-x86_64/deepin-daemon.install (from rev 274196, deepin-daemon/trunk/deepin-daemon.install) =================================================================== --- deepin-daemon.install (rev 0) +++ deepin-daemon.install 2017-12-13 11:32:10 UTC (rev 274197) @@ -0,0 +1,3 @@ +post_remove() { + rm -f /var/cache/deepin/mark-setup-network-services +} Deleted: deepin-daemon.sysusers =================================================================== --- deepin-daemon.sysusers 2017-12-13 11:31:43 UTC (rev 274196) +++ deepin-daemon.sysusers 2017-12-13 11:32:10 UTC (rev 274197) @@ -1,2 +0,0 @@ -u deepin-daemon - "Deepin Daemon" -g deepin-daemon - Copied: deepin-daemon/repos/community-x86_64/deepin-daemon.sysusers (from rev 274196, deepin-daemon/trunk/deepin-daemon.sysusers) =================================================================== --- deepin-daemon.sysusers (rev 0) +++ deepin-daemon.sysusers 2017-12-13 11:32:10 UTC (rev 274197) @@ -0,0 +1,2 @@ +u deepin-daemon - "Deepin Daemon" +g deepin-daemon - Deleted: nm-1.10.patch =================================================================== --- nm-1.10.patch 2017-12-13 11:31:43 UTC (rev 274196) +++ nm-1.10.patch 2017-12-13 11:32:10 UTC (rev 274197) @@ -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 - }