[arch-commits] Commit in deepin-daemon/trunk (PKGBUILD nm-1.6.patch)

Felix Yan felixonmars at archlinux.org
Fri Feb 17 13:48:06 UTC 2017


    Date: Friday, February 17, 2017 @ 13:48:05
  Author: felixonmars
Revision: 212897

upgpkg: deepin-daemon 3.1.0-1

Modified:
  deepin-daemon/trunk/PKGBUILD
Deleted:
  deepin-daemon/trunk/nm-1.6.patch

--------------+
 PKGBUILD     |   15 +++-----------
 nm-1.6.patch |   60 ---------------------------------------------------------
 2 files changed, 4 insertions(+), 71 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-17 13:47:52 UTC (rev 212896)
+++ PKGBUILD	2017-02-17 13:48:05 UTC (rev 212897)
@@ -4,8 +4,8 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-daemon
-pkgver=3.0.25.2
-pkgrel=2
+pkgver=3.1.0
+pkgrel=1
 pkgdesc='Daemon handling the DDE session settings'
 arch=('i686' 'x86_64')
 url="https://github.com/linuxdeepin/dde-daemon"
@@ -25,12 +25,10 @@
 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'
-        'nm-1.6.patch')
+        'polkit-gnome-authentication-agent-1-deepin.desktop')
 sha256sums=('SKIP'
             '4482f2c82c3652040021dd43515f131184a0417e341dc37db487117012245e25'
-            '014f4c1111530e7556c3a83ab4409ae7dd47a87550004128ed8b7d02c58357e7'
-            '6cc1ba05f1a750327313732b2d3334d3429906a6207c6c61477309089ae9e318')
+            '014f4c1111530e7556c3a83ab4409ae7dd47a87550004128ed8b7d02c58357e7')
 
 prepare() {
   export GOPATH="$srcdir/build:/usr/share/gocode"
@@ -43,15 +41,10 @@
          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
-  
-  cd dde-daemon
-  patch -p1 -i ../nm-1.6.patch
 }
 
 build() {
   cd dde-daemon
-  # We have newer networkmanager
-  make -C network/nm_generator gen-nm-code
   make # USE_GCCGO=1
 }
 

Deleted: nm-1.6.patch
===================================================================
--- nm-1.6.patch	2017-02-17 13:47:52 UTC (rev 212896)
+++ nm-1.6.patch	2017-02-17 13:48:05 UTC (rev 212897)
@@ -1,60 +0,0 @@
-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