Date: Wednesday, October 25, 2017 @ 11:53:06
Author: felixonmars
Revision: 264237
archrelease: copy trunk to community-i686, community-x86_64
Added:
startdde/repos/community-i686/PKGBUILD
(from rev 264236, startdde/trunk/PKGBUILD)
startdde/repos/community-i686/deepin-notifications.patch
(from rev 264236, startdde/trunk/deepin-notifications.patch)
startdde/repos/community-x86_64/PKGBUILD
(from rev 264236, startdde/trunk/PKGBUILD)
startdde/repos/community-x86_64/deepin-notifications.patch
(from rev 264236, startdde/trunk/deepin-notifications.patch)
Deleted:
startdde/repos/community-i686/PKGBUILD
startdde/repos/community-x86_64/PKGBUILD
---------------------------------------------+
/PKGBUILD | 84 ++++++++++++++++++++++++++
community-i686/PKGBUILD | 37 -----------
community-i686/deepin-notifications.patch | 36 +++++++++++
community-x86_64/PKGBUILD | 37 -----------
community-x86_64/deepin-notifications.patch | 36 +++++++++++
5 files changed, 156 insertions(+), 74 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-10-25 11:52:26 UTC (rev 264236)
+++ community-i686/PKGBUILD 2017-10-25 11:53:06 UTC (rev 264237)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <[email protected]>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=startdde
-pkgver=3.1.16
-pkgrel=2
-pkgdesc="starter of deepin desktop environment"
-arch=('i686' 'x86_64')
-url="https://github.com/linuxdeepin/startdde";
-license=('GPL3')
-depends=('deepin-daemon' 'deepin-wm-switcher')
-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";)
-sha512sums=('ef0b095c7b879d783896934c37428651851320d2274a2757bbac72e066d0aacb2f5e11616b81cbe3c9c5fb938067168001890dec71785086355548e0e6a87d61')
-
-prepare() {
- export GOPATH="$srcdir/build:/usr/share/gocode"
- go get github.com/BurntSushi/xgb github.com/BurntSushi/xgbutil
github.com/howeyc/fsnotify
-}
-
-build() {
- cd startdde-$pkgver
- make
-}
-
-package() {
- cd startdde-$pkgver
- make DESTDIR="$pkgdir" install
-
- mv "$pkgdir"/lib/systemd "$pkgdir"/usr/lib/systemd
- rmdir "$pkgdir"/lib
- ln -sf ../dde-readahead.service
"$pkgdir"/usr/lib/systemd/system/multi-user.target.wants/dde-readahead.service
-}
Copied: startdde/repos/community-i686/PKGBUILD (from rev 264236,
startdde/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-10-25 11:53:06 UTC (rev 264237)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Felix Yan <[email protected]>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=startdde
+pkgver=3.1.17
+pkgrel=1
+pkgdesc="starter of deepin desktop environment"
+arch=('i686' 'x86_64')
+url="https://github.com/linuxdeepin/startdde";
+license=('GPL3')
+depends=('deepin-daemon' 'deepin-wm-switcher')
+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')
+
+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() {
+ cd startdde-$pkgver
+ make
+}
+
+package() {
+ cd startdde-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ mv "$pkgdir"/lib/systemd "$pkgdir"/usr/lib/systemd
+ rmdir "$pkgdir"/lib
+ ln -sf ../dde-readahead.service
"$pkgdir"/usr/lib/systemd/system/multi-user.target.wants/dde-readahead.service
+}
Copied: startdde/repos/community-i686/deepin-notifications.patch (from rev
264236, startdde/trunk/deepin-notifications.patch)
===================================================================
--- community-i686/deepin-notifications.patch (rev 0)
+++ community-i686/deepin-notifications.patch 2017-10-25 11:53:06 UTC (rev
264237)
@@ -0,0 +1,36 @@
+commit 128dd32f1d495ebed75b10118424a6688f8de3f0
+Author: Felix Yan <[email protected]>
+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() {
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-10-25 11:52:26 UTC (rev 264236)
+++ community-x86_64/PKGBUILD 2017-10-25 11:53:06 UTC (rev 264237)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <[email protected]>
-# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
-# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
-
-pkgname=startdde
-pkgver=3.1.16
-pkgrel=2
-pkgdesc="starter of deepin desktop environment"
-arch=('i686' 'x86_64')
-url="https://github.com/linuxdeepin/startdde";
-license=('GPL3')
-depends=('deepin-daemon' 'deepin-wm-switcher')
-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";)
-sha512sums=('ef0b095c7b879d783896934c37428651851320d2274a2757bbac72e066d0aacb2f5e11616b81cbe3c9c5fb938067168001890dec71785086355548e0e6a87d61')
-
-prepare() {
- export GOPATH="$srcdir/build:/usr/share/gocode"
- go get github.com/BurntSushi/xgb github.com/BurntSushi/xgbutil
github.com/howeyc/fsnotify
-}
-
-build() {
- cd startdde-$pkgver
- make
-}
-
-package() {
- cd startdde-$pkgver
- make DESTDIR="$pkgdir" install
-
- mv "$pkgdir"/lib/systemd "$pkgdir"/usr/lib/systemd
- rmdir "$pkgdir"/lib
- ln -sf ../dde-readahead.service
"$pkgdir"/usr/lib/systemd/system/multi-user.target.wants/dde-readahead.service
-}
Copied: startdde/repos/community-x86_64/PKGBUILD (from rev 264236,
startdde/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-10-25 11:53:06 UTC (rev 264237)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Felix Yan <[email protected]>
+# Contributor: Josip Ponjavic <josipponjavic at gmail dot com>
+# Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
+
+pkgname=startdde
+pkgver=3.1.17
+pkgrel=1
+pkgdesc="starter of deepin desktop environment"
+arch=('i686' 'x86_64')
+url="https://github.com/linuxdeepin/startdde";
+license=('GPL3')
+depends=('deepin-daemon' 'deepin-wm-switcher')
+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')
+
+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() {
+ cd startdde-$pkgver
+ make
+}
+
+package() {
+ cd startdde-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ mv "$pkgdir"/lib/systemd "$pkgdir"/usr/lib/systemd
+ rmdir "$pkgdir"/lib
+ ln -sf ../dde-readahead.service
"$pkgdir"/usr/lib/systemd/system/multi-user.target.wants/dde-readahead.service
+}
Copied: startdde/repos/community-x86_64/deepin-notifications.patch (from rev
264236, startdde/trunk/deepin-notifications.patch)
===================================================================
--- community-x86_64/deepin-notifications.patch (rev 0)
+++ community-x86_64/deepin-notifications.patch 2017-10-25 11:53:06 UTC (rev
264237)
@@ -0,0 +1,36 @@
+commit 128dd32f1d495ebed75b10118424a6688f8de3f0
+Author: Felix Yan <[email protected]>
+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() {
