[arch-commits] Commit in startdde/trunk (PKGBUILD deepin-notifications.patch)

[Felix Yan]

    Date: Friday, November 3, 2017 @ 08:48:27
  Author: felixonmars
Revision: 265274

upgpkg: startdde 3.1.18-1

Modified:
  startdde/trunk/PKGBUILD
Deleted:
  startdde/trunk/deepin-notifications.patch

----------------------------+
 PKGBUILD                   |   11 +++--------
 deepin-notifications.patch |   36 ------------------------------------
 2 files changed, 3 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-03 08:41:05 UTC (rev 265273)
+++ PKGBUILD	2017-11-03 08:48:27 UTC (rev 265274)
@@ -4,7 +4,7 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=startdde
-pkgver=3.1.17
+pkgver=3.1.18
 pkgrel=1
 pkgdesc="starter of deepin desktop environment"
 arch=('i686' 'x86_64')
@@ -14,17 +14,12 @@
 makedepends=('cmake' 'coffeescript' 'deepin-dbus-factory' 'deepin-gir-generator' 'deepin-go-lib'
              'deepin-api' 'go-pie' 'python2' 'git')
 groups=('deepin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/startdde/archive/$pkgver.tar.gz"
-        deepin-notifications.patch)
-sha512sums=('33b72245a93106c388b7f9f97e106fd544792d201ae656857d4f2b7fb1c5c02d6522509e489b9e900b94e2025e03f1fde4e111a657d61fa84b278506651acec9'
-            'cf684b195a9cd9e24722a211c5446f460558caf95b0f7635641c0cbab08094c6f7fb71dff17a3f705152160d82e4585212fdd280abf0005134e67ff7d9c52f9f')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/startdde/archive/$pkgver.tar.gz")
+sha512sums=('fa9a979048b3634cba1434a3fb093b19bef329b8287e0f0c07b76397c6addac491ce00a3de132bd31b75c5d0719f1b81bcc979df74546386867282b3ef7d0da0')
 
 prepare() {
   export GOPATH="$srcdir/build:/usr/share/gocode"
   go get github.com/BurntSushi/xgb github.com/BurntSushi/xgbutil github.com/howeyc/fsnotify
-
-  cd startdde-$pkgver
-  patch -p1 -i ../deepin-notifications.patch
 }
 
 build() {

Deleted: deepin-notifications.patch
===================================================================
--- deepin-notifications.patch	2017-11-03 08:41:05 UTC (rev 265273)
+++ deepin-notifications.patch	2017-11-03 08:48:27 UTC (rev 265274)
@@ -1,36 +0,0 @@
-commit 128dd32f1d495ebed75b10118424a6688f8de3f0
-Author: Felix Yan <felixonmars at archlinux.org>
-Date:   Sat Oct 21 00:51:03 2017 +0800
-
-    Launch deepin-notifications on session start
-    
-    This fixes installations with multiple notification agent
-    implementations installed.
-    
-    Change-Id: I447dcd775a96f890d93351a345faff40b786655a
-
-diff --git a/session.go b/session.go
-index e3845c6..fb78c53 100644
---- a/session.go
-+++ b/session.go
-@@ -274,7 +274,7 @@ func startSession(xu *xgbutil.XUtil) {
- 	startStartManager(xu)
- 
- 	var wg sync.WaitGroup
--	wg.Add(2)
-+	wg.Add(3)
- 
- 	go func() {
- 		manager.launch("/usr/bin/dde-desktop", true)
-@@ -292,6 +292,11 @@ func startSession(xu *xgbutil.XUtil) {
- 		wg.Done()
- 	}()
- 
-+	go func() {
-+		manager.launch("/usr/lib/deepin-notifications/deepin-notifications", false)
-+		wg.Done()
-+	}()
-+
- 	wg.Wait()
- 
- 	go func() {