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

[Felix Yan]

    Date: Thursday, November 8, 2018 @ 11:02:11
  Author: felixonmars
Revision: 403950

upgpkg: deepin-daemon 3.5.0-1

Modified:
  deepin-daemon/trunk/PKGBUILD
Deleted:
  deepin-daemon/trunk/tun.patch

-----------+
 PKGBUILD  |    9 +++------
 tun.patch |   30 ------------------------------
 2 files changed, 3 insertions(+), 36 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-08 10:56:06 UTC (rev 403949)
+++ PKGBUILD	2018-11-08 11:02:11 UTC (rev 403950)
@@ -3,8 +3,8 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-daemon
-pkgver=3.4.0
-pkgrel=2
+pkgver=3.5.0
+pkgrel=1
 pkgdesc='Daemon handling the DDE session settings'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/dde-daemon"
@@ -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
-        tun.patch
         'deepin-daemon.sysusers')
-sha512sums=('02a658b6c787847b91f6a0b607523f30b414cdf1733960bf5739fd43ddfbfaa29c1783ae329006467b6bae0e20d315e91b051a9086f765bd8b3f275b86d1ef8d'
+sha512sums=('bac4c861a85af5b20bf985630e68f9e042bb791a65ea74e1431fcae32a63ee52af87099b4c8c9d051cd8bc8e5e58df4fd6a6020934ee65ea6147bf966a7f0533'
             '29874d6b316bb678b6656827e696d65eef174a53bb8226ed4c2d3bc89e42d5edb466df3c2ac647a1f2eb05d6e2a199b8d07dcaa9302b9227a0692fde0d50bb52'
-            'ca3d2b7265fe550ef099d2881c437686565a7d0b16b4ea177a0c24d8afee29f6d67b58a22832e255cf40cd4a7a8ab0c5f9d3445334788e17a4a72035b8b8bd99'
             '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a')
 
 prepare() {
   cd dde-daemon-$pkgver
   patch -p1 -i ../dde-daemon_3.2.3.patch
-  patch -p1 -i ../tun.patch
 
   export GOPATH="$srcdir/build:/usr/share/gocode"
 

Deleted: tun.patch
===================================================================
--- tun.patch	2018-11-08 10:56:06 UTC (rev 403949)
+++ tun.patch	2018-11-08 11:02:11 UTC (rev 403950)
@@ -1,30 +0,0 @@
-diff --git a/network/nm_custom_type.go b/network/nm_custom_type.go
-index 4c49f30e..e723693f 100644
---- a/network/nm_custom_type.go
-+++ b/network/nm_custom_type.go
-@@ -27,7 +27,7 @@ import (
- 	"strings"
- )
- 
--// Custom device types, use sting instead of number, used by front-end
-+// Custom device types, use string instead of number, used by front-end
- const (
- 	deviceUnknown    = "unknown"
- 	deviceEthernet   = "wired"
-@@ -45,6 +45,7 @@ const (
- 	deviceBridge     = "bridge"
- 	deviceGeneric    = "generic"
- 	deviceTeam       = "team"
-+	deviceTun        = "tun"
- )
- 
- func getCustomDeviceType(devType uint32) (customDevType string) {
-@@ -79,6 +80,8 @@ func getCustomDeviceType(devType uint32) (customDevType string) {
- 		return deviceGeneric
- 	case nm.NM_DEVICE_TYPE_TEAM:
- 		return deviceTeam
-+	case nm.NM_DEVICE_TYPE_TUN:
-+		return deviceTun
- 	case nm.NM_DEVICE_TYPE_UNKNOWN:
- 	default:
- 		logger.Error("unknown device type", devType)