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

[Felix Yan]

    Date: Thursday, November 1, 2018 @ 11:06:44
  Author: felixonmars
Revision: 401065

upgpkg: deepin-daemon 3.4.0-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-01 11:03:16 UTC (rev 401064)
+++ PKGBUILD	2018-11-01 11:06:44 UTC (rev 401065)
@@ -3,7 +3,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-daemon
-pkgver=3.3.0
+pkgver=3.4.0
 pkgrel=1
 pkgdesc='Daemon handling the DDE session settings'
 arch=('x86_64')
@@ -27,17 +27,14 @@
 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.14.patch)
-sha512sums=('7d6d638a3afd400cb6144bc30e0a6662665933f79422a1c001e92b03bd355c600610a980525a3a81d98b9e6e6fdc6d31dd5b91898d3f1510d7c878964119031c'
+        'deepin-daemon.sysusers')
+sha512sums=('02a658b6c787847b91f6a0b607523f30b414cdf1733960bf5739fd43ddfbfaa29c1783ae329006467b6bae0e20d315e91b051a9086f765bd8b3f275b86d1ef8d'
             '29874d6b316bb678b6656827e696d65eef174a53bb8226ed4c2d3bc89e42d5edb466df3c2ac647a1f2eb05d6e2a199b8d07dcaa9302b9227a0692fde0d50bb52'
-            '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a'
-            'b118eefb9f6cb1ecd2e8e2f0f59ab6fe3c6bf8e581b106c2d4fa86573f50a37549e6041726a3fe084dec1e8306e5498086e55fd928b64f614b4eac6c6a81920b')
+            '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
 
 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"
 

Deleted: nm-1.14.patch
===================================================================
--- nm-1.14.patch	2018-11-01 11:03:16 UTC (rev 401064)
+++ nm-1.14.patch	2018-11-01 11:06:44 UTC (rev 401065)
@@ -1,99 +0,0 @@
-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)
- }