[arch-commits] Commit in deepin-daemon/trunk (3 files)
Felix Yan
felixonmars at archlinux.org
Tue Feb 7 07:43:15 UTC 2017
Date: Tuesday, February 7, 2017 @ 07:43:14
Author: felixonmars
Revision: 210700
upgpkg: deepin-daemon 3.0.25.2-2
Added:
deepin-daemon/trunk/nm-1.6.patch
Modified:
deepin-daemon/trunk/PKGBUILD
deepin-daemon/trunk/deepin-daemon.install
-----------------------+
PKGBUILD | 24 ++++++++++++++-----
deepin-daemon.install | 8 ------
nm-1.6.patch | 60 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 78 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-02-07 07:43:03 UTC (rev 210699)
+++ PKGBUILD 2017-02-07 07:43:14 UTC (rev 210700)
@@ -5,7 +5,7 @@
pkgname=deepin-daemon
pkgver=3.0.25.2
-pkgrel=1
+pkgrel=2
pkgdesc='Daemon handling the DDE session settings'
arch=('i686' 'x86_64')
url="https://github.com/linuxdeepin/dde-daemon"
@@ -15,7 +15,8 @@
'mobile-broadband-provider-info' 'polkit-gnome' 'udisks2' 'upower' # 'gcc-libs>=5.3.0-3'
'libxkbfile' 'accountsservice' 'deepin-desktop-base' 'bamf' 'pulseaudio'
'gnome-keyring')
-makedepends=('deepin-dbus-factory' 'deepin-gir-generator' 'deepin-go-lib' 'deepin-api' 'sqlite' 'git' 'mercurial' 'go') # 'gcc-go')
+makedepends=('deepin-dbus-factory' 'deepin-gir-generator' 'deepin-go-lib' 'deepin-api' 'sqlite'
+ 'git' 'mercurial' 'python-gobject' 'networkmanager' 'go') # 'gcc-go')
optdepends=('networkmanager: Network Management daemon'
'deepin-grub2-themes: deepin theme for grub menu')
conflicts=('dde-daemon')
@@ -24,22 +25,33 @@
install="${pkgname}.install"
source=("git+https://cr.deepin.io/dde/dde-daemon.git#tag=$pkgver"
'deepin-daemon.sysusers'
- 'polkit-gnome-authentication-agent-1-deepin.desktop')
+ 'polkit-gnome-authentication-agent-1-deepin.desktop'
+ 'nm-1.6.patch')
sha256sums=('SKIP'
'4482f2c82c3652040021dd43515f131184a0417e341dc37db487117012245e25'
- '014f4c1111530e7556c3a83ab4409ae7dd47a87550004128ed8b7d02c58357e7')
+ '014f4c1111530e7556c3a83ab4409ae7dd47a87550004128ed8b7d02c58357e7'
+ '6cc1ba05f1a750327313732b2d3334d3429906a6207c6c61477309089ae9e318')
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/howeyc/fsnotify \
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
+ github.com/BurntSushi/graphics-go/graphics github.com/fsnotify/fsnotify golang.org/x/sys/unix \
+ gopkg.in/yaml.v2
+
+ cd dde-daemon
+ patch -p1 -i ../nm-1.6.patch
}
build() {
- cd "$srcdir/dde-daemon"
+ cd dde-daemon
+ # We have newer networkmanager
+ make -C network/nm_generator gen-nm-code
make # USE_GCCGO=1
}
Modified: deepin-daemon.install
===================================================================
--- deepin-daemon.install 2017-02-07 07:43:03 UTC (rev 210699)
+++ deepin-daemon.install 2017-02-07 07:43:14 UTC (rev 210700)
@@ -1,11 +1,3 @@
-post_install() {
- systemd-sysusers deepin-daemon.conf
-}
-
-post_upgrade() {
- (( $(vercmp $2 '2.93.1-1') < 0 )) && systemd-sysusers deepin-daemon.conf || true
-}
-
post_remove() {
rm -f /var/cache/deepin/mark-setup-network-services
}
Added: nm-1.6.patch
===================================================================
--- nm-1.6.patch (rev 0)
+++ nm-1.6.patch 2017-02-07 07:43:14 UTC (rev 210700)
@@ -0,0 +1,60 @@
+commit a5ccf1fc09eb89ea5cce250198f24857d63ec19f
+Author: jouyouyun <jouyouwen717 at gmail.com>
+Date: Tue Feb 7 14:40:15 2017 +0800
+
+ nm_generator: Add quote on string constants
+
+ Some constants, such as 'pkcs11:' can cause YAML unmarshal failed, so add quote on all string constants.
+
+ Change-Id: I9a900ac1101591e3ba439a02a91cc6b44ce3a46f
+
+diff --git a/network/nm_generator/gen_nm_consts.py b/network/nm_generator/gen_nm_consts.py
+index 98ba6fad..88b0e3d0 100755
+--- a/network/nm_generator/gen_nm_consts.py
++++ b/network/nm_generator/gen_nm_consts.py
+@@ -201,6 +201,6 @@ for const in girxml.findall('./gi:namespace/gi:constant', ns_map):
+ cvalue = const.attrib['value']
+ if cname not in constants and const.find('./gi:type[@c:type="gchar*"]', ns_map) is not None:
+ constants[cname]=cvalue
+- outfile.write(" - Name: %s\n Value: %s\n" % (cname, cvalue))
++ outfile.write(" - Name: %s\n Value: \"%s\"\n" % (cname, cvalue))
+
+ outfile.close()
+diff --git a/network/nm_setting_beans_extend.go b/network/nm_setting_beans_extend.go
+index addc3b13..ea5637b4 100644
+--- a/network/nm_setting_beans_extend.go
++++ b/network/nm_setting_beans_extend.go
+@@ -91,6 +91,16 @@ func checkSettingIPTunnelValues(data connectionData) (err sectionErrors) {
+ return
+ }
+
++func getSettingMacsecAvailableKeys(data connectionData) (keys []string) {
++ return
++}
++func getSettingMacsecAvailableValues(data connectionData, key string) (values []kvalue) {
++ return
++}
++func checkSettingMacsecValues(data connectionData) (err sectionErrors) {
++ return
++}
++
+ func getSettingMacvlanAvailableKeys(data connectionData) (keys []string) {
+ return
+ }
+@@ -111,6 +121,16 @@ func checkSettingOlpcMeshValues(data connectionData) (err sectionErrors) {
+ return
+ }
+
++func getSettingProxyAvailableKeys(data connectionData) (keys []string) {
++ return
++}
++func getSettingProxyAvailableValues(data connectionData, key string) (values []kvalue) {
++ return
++}
++func checkSettingProxyValues(data connectionData) (err sectionErrors) {
++ return
++}
++
+ func getSettingTeamAvailableKeys(data connectionData) (keys []string) {
+ return
+ }
More information about the arch-commits
mailing list