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

Felix Yan felixonmars at archlinux.org
Thu Sep 27 15:18:56 UTC 2018


    Date: Thursday, September 27, 2018 @ 15:18:56
  Author: felixonmars
Revision: 386442

upgpkg: deepin-daemon 3.2.24.5-1

Added:
  deepin-daemon/trunk/nm-1.14.patch
Modified:
  deepin-daemon/trunk/PKGBUILD

---------------+
 PKGBUILD      |   11 +++---
 nm-1.14.patch |   99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-27 15:18:28 UTC (rev 386441)
+++ PKGBUILD	2018-09-27 15:18:56 UTC (rev 386442)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-daemon
-pkgver=3.2.24.4
+pkgver=3.2.24.5
 pkgrel=1
 pkgdesc='Daemon handling the DDE session settings'
 arch=('x86_64')
@@ -27,14 +27,17 @@
 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=('065086570c3c89a3b39cd3928c28c1c4ea7c6d4f5dc4e4bab44dcbec258848fd1f6639b31049ba0d475eea7478d50903372cd45e6dc66c33b963ae5bd43b2f99'
+        'deepin-daemon.sysusers'
+        nm-1.14.patch)
+sha512sums=('e8dc5893cf2c271671a6b02df4e6ac11ff7e8a166a0052fd1366075fba9035d7f77cff4abceddc45ce0ae6b2a72fd4b564e7d6a330bcb98347456cf8a8b4bbe4'
             '29874d6b316bb678b6656827e696d65eef174a53bb8226ed4c2d3bc89e42d5edb466df3c2ac647a1f2eb05d6e2a199b8d07dcaa9302b9227a0692fde0d50bb52'
-            '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
+            '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a'
+            'b118eefb9f6cb1ecd2e8e2f0f59ab6fe3c6bf8e581b106c2d4fa86573f50a37549e6041726a3fe084dec1e8306e5498086e55fd928b64f614b4eac6c6a81920b')
 
 prepare() {
   cd dde-daemon-$pkgver
   patch -p1 -i ../dde-daemon_3.2.3.patch
+  patch -p1 -i ../nm-1.14.patch
 
   export GOPATH="$srcdir/build:/usr/share/gocode"
 

Added: nm-1.14.patch
===================================================================
--- nm-1.14.patch	                        (rev 0)
+++ nm-1.14.patch	2018-09-27 15:18:56 UTC (rev 386442)
@@ -0,0 +1,99 @@
+commit 13f13416eba2beae2f83de32352ca6dd5afa6f6d
+Author: Felix Yan <felixonmars at archlinux.org>
+Date:   Thu Sep 27 23:08:40 2018 +0800
+
+    fix: compile errors under networkmanager 1.14+
+    
+    Add new empty functions to pass the build
+    
+    Change-Id: I67e8b2ff0d797b95531efc396964cd78efb0039a
+
+diff --git a/network/nm_setting_beans_extend.go b/network/nm_setting_beans_extend.go
+index 3be4b7e3..d42b9751 100644
+--- a/network/nm_setting_beans_extend.go
++++ b/network/nm_setting_beans_extend.go
+@@ -20,6 +20,16 @@
+ package network
+ 
+ // Empty functions to make compile success
++func getSetting6LowpanAvailableKeys(data connectionData) (keys []string) {
++	return
++}
++func getSetting6LowpanAvailableValues(data connectionData, key string) (values []kvalue) {
++	return
++}
++func checkSetting6LowpanValues(data connectionData) (err sectionErrors) {
++	return
++}
++
+ func getSettingAdslAvailableKeys(data connectionData) (keys []string) {
+ 	return
+ }
+@@ -80,6 +90,16 @@ func checkSettingDcbValues(data connectionData) (err sectionErrors) {
+ 	return
+ }
+ 
++func getSettingEthtoolAvailableKeys(data connectionData) (keys []string) {
++	return
++}
++func getSettingEthtoolAvailableValues(data connectionData, key string) (values []kvalue) {
++	return
++}
++func checkSettingEthtoolValues(data connectionData) (err sectionErrors) {
++	return
++}
++
+ func getSettingGenericAvailableKeys(data connectionData) (keys []string) {
+ 	return
+ }
+@@ -130,6 +150,16 @@ func checkSettingMacvlanValues(data connectionData) (err sectionErrors) {
+ 	return
+ }
+ 
++func getSettingMatchAvailableKeys(data connectionData) (keys []string) {
++	return
++}
++func getSettingMatchAvailableValues(data connectionData, key string) (values []kvalue) {
++	return
++}
++func checkSettingMatchValues(data connectionData) (err sectionErrors) {
++	return
++}
++
+ func getSettingOlpcMeshAvailableKeys(data connectionData) (keys []string) {
+ 	return
+ }
+@@ -190,6 +220,16 @@ func checkSettingProxyValues(data connectionData) (err sectionErrors) {
+ 	return
+ }
+ 
++func getSettingSriovAvailableKeys(data connectionData) (keys []string) {
++	return
++}
++func getSettingSriovAvailableValues(data connectionData, key string) (values []kvalue) {
++	return
++}
++func checkSettingSriovValues(data connectionData) (err sectionErrors) {
++	return
++}
++
+ func getSettingTCConfigAvailableKeys(data connectionData) (keys []string) {
+ 	return
+ }
+@@ -260,6 +300,16 @@ func checkSettingWimaxValues(data connectionData) (err sectionErrors) {
+ 	return
+ }
+ 
++func getSettingWpanAvailableKeys(data connectionData) (keys []string) {
++	return
++}
++func getSettingWpanAvailableValues(data connectionData, key string) (values []kvalue) {
++	return
++}
++func checkSettingWpanValues(data connectionData) (err sectionErrors) {
++	return
++}
++
+ func setSettingWirelessAssignedMacAddressJSON(data connectionData, valueJSON string) (err error) {
+ 	return setSettingKeyJSON(data, "802-11-wireless", "assigned-mac-address", valueJSON, ktypeWrapperString)
+ }



More information about the arch-commits mailing list