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

[Felix Yan]

    Date: Monday, April 3, 2017 @ 02:49:14
  Author: felixonmars
Revision: 220339

upgpkg: deepin-daemon 3.1.6-2

Add a patch so iw become an optdepend

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

------------------------+
 PKGBUILD               |   21 +++++++++++++--------
 make-iw-optional.patch |   21 +++++++++++++++++++++
 2 files changed, 34 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-04-02 20:58:21 UTC (rev 220338)
+++ PKGBUILD	2017-04-03 02:49:14 UTC (rev 220339)
@@ -5,7 +5,7 @@
 
 pkgname=deepin-daemon
 pkgver=3.1.6
-pkgrel=1
+pkgrel=2
 pkgdesc='Daemon handling the DDE session settings'
 arch=('i686' 'x86_64')
 url="https://github.com/linuxdeepin/dde-daemon"
@@ -18,19 +18,24 @@
 makedepends=('deepin-dbus-factory' 'deepin-gir-generator' 'deepin-go-lib' 'deepin-api' 'sqlite'
              'git' 'mercurial' 'python-gobject' 'networkmanager' 'go') # 'gcc-go')
 optdepends=('networkmanager: Network Management daemon'
-            'deepin-grub2-themes: deepin theme for grub menu')
+            'deepin-grub2-themes: deepin theme for grub menu'
+            'iw: for miracast module')
 conflicts=('dde-daemon')
 replaces=('dde-daemon')
 groups=('deepin')
 install="${pkgname}.install"
-source=("git+https://cr.deepin.io/dde/dde-daemon.git#tag=$pkgver"
+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')
-sha512sums=('SKIP'
+        'polkit-gnome-authentication-agent-1-deepin.desktop'
+        make-iw-optional.patch)
+sha512sums=('998518803bd64c9bc2f84fa48da3d4d9ba8559785231f1c7541319f9c9e2b56f97537f7c9bd360f759ad7413b42bdea84c21e6a8e233bb0a428e7548acb78730'
             '808c02d4fec4cbbb01119bbb10499090199e738b7dd72c28a57dde098eef6132723f3434c151f79e21d9f788c7f7bae8046573ac93ba917afe0e803fbffa6d5a'
-            'bc0ecd42db4e86c4343f94551552b8436bfdaed6311839313eacd0ba3fcd2d4ce4b8f4c52aefcd9eba0367dbc552de3ad1742319bc4344dd1adc7337f0d80b49')
+            'bc0ecd42db4e86c4343f94551552b8436bfdaed6311839313eacd0ba3fcd2d4ce4b8f4c52aefcd9eba0367dbc552de3ad1742319bc4344dd1adc7337f0d80b49'
+            '62d7b6ffc598d322db6d7585c05df431f821788672339ab4be00819cd0799f9f65f241267e4f7d0249cff8537927b9826173ab4fd460f39bcdaa7a1517fd2999')
 
 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
@@ -44,12 +49,12 @@
 }
 
 build() {
-  cd dde-daemon
+  cd dde-daemon-$pkgver
   make # USE_GCCGO=1
 }
 
 package() {
-  cd dde-daemon
+  cd dde-daemon-$pkgver
   make DESTDIR="$pkgdir" install # USE_GCCGO=1
 
   install -Dm644 ../polkit-gnome-authentication-agent-1-deepin.desktop "$pkgdir/etc/xdg/autostart/polkit-gnome-authentication-agent-1-deepin.desktop"

Added: make-iw-optional.patch
===================================================================
--- make-iw-optional.patch	                        (rev 0)
+++ make-iw-optional.patch	2017-04-03 02:49:14 UTC (rev 220339)
@@ -0,0 +1,21 @@
+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
+ 	}