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

[Felix Yan]

    Date: Thursday, April 6, 2017 @ 13:36:56
  Author: felixonmars
Revision: 221000

upgpkg: deepin-daemon 3.1.7-1

Modified:
  deepin-daemon/trunk/PKGBUILD
Deleted:
  deepin-daemon/trunk/make-iw-optional.patch

------------------------+
 PKGBUILD               |   14 +++++---------
 make-iw-optional.patch |   21 ---------------------
 2 files changed, 5 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-06 13:34:22 UTC (rev 220999)
+++ PKGBUILD	2017-04-06 13:36:56 UTC (rev 221000)
@@ -4,8 +4,8 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-daemon
-pkgver=3.1.6
-pkgrel=2
+pkgver=3.1.7
+pkgrel=1
 pkgdesc='Daemon handling the DDE session settings'
 arch=('i686' 'x86_64')
 url="https://github.com/linuxdeepin/dde-daemon"
@@ -26,16 +26,12 @@
 install="${pkgname}.install"
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/dde-daemon/archive/$pkgver.tar.gz"
         'deepin-daemon.sysusers'
-        'polkit-gnome-authentication-agent-1-deepin.desktop'
-        make-iw-optional.patch)
-sha512sums=('998518803bd64c9bc2f84fa48da3d4d9ba8559785231f1c7541319f9c9e2b56f97537f7c9bd360f759ad7413b42bdea84c21e6a8e233bb0a428e7548acb78730'
+        'polkit-gnome-authentication-agent-1-deepin.desktop')
+sha512sums=('b9ae2715361a7ee7ec03242a5f86c6187f828584b94b1e505baa1e3d138df931adbd77d181380ec381c665e3e8062721560bec75ba1c859841d7d17ff3f9f478'
             '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a'
-            'bc0ecd42db4e86c4343f94551552b8436bfdaed6311839313eacd0ba3fcd2d4ce4b8f4c52aefcd9eba0367dbc552de3ad1742319bc4344dd1adc7337f0d80b49'
-            '62d7b6ffc598d322db6d7585c05df431f821788672339ab4be00819cd0799f9f65f241267e4f7d0249cff8537927b9826173ab4fd460f39bcdaa7a1517fd2999')
+            'bc0ecd42db4e86c4343f94551552b8436bfdaed6311839313eacd0ba3fcd2d4ce4b8f4c52aefcd9eba0367dbc552de3ad1742319bc4344dd1adc7337f0d80b49')
 
 prepare() {
-  (cd dde-daemon-$pkgver; patch -p1 -i ../make-iw-optional.patch)
-
   export GOPATH="$srcdir/build:/usr/share/gocode"
 
   # https://github.com/niemeyer/gopkg/issues/50

Deleted: make-iw-optional.patch
===================================================================
--- make-iw-optional.patch	2017-04-06 13:34:22 UTC (rev 220999)
+++ make-iw-optional.patch	2017-04-06 13:36:56 UTC (rev 221000)
@@ -1,21 +0,0 @@
-commit ed0795b43e3c58275408e11f77c66998dde3f32c
-Author: Felix Yan <felixonmars at archlinux.org>
-Date:   Mon Apr 3 10:36:04 2017 +0800
-
-    Don't fail the whole daemon when iw is not present
-    
-    Change-Id: Ie2178af6292edd27151e0f36dbc3412f93f360c4
-
-diff --git a/miracast/iw.go b/miracast/iw.go
-index 0617b916..dbe60c11 100644
---- a/miracast/iw.go
-+++ b/miracast/iw.go
-@@ -23,7 +23,7 @@ func ListWirelessInfo() (WirelessInfos, error) {
- 	os.Setenv("PATH", "/sbin:"+envPath)
- 	defer os.Setenv("PATH", envPath)
- 	outputs, err := exec.Command("/bin/sh", "-c",
--		"exec iw list").CombinedOutput()
-+		"if hash iw 2>/dev/null; then exec iw list; fi").CombinedOutput()
- 	if err != nil {
- 		return nil, err
- 	}