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

[Felix Yan]

    Date: Wednesday, December 30, 2015 @ 14:28:36
  Author: fyan
Revision: 155036

upgpkg: deepin-daemon 3.0.2-1

Modified:
  deepin-daemon/trunk/PKGBUILD

----------+
 PKGBUILD |   24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-30 13:15:10 UTC (rev 155035)
+++ PKGBUILD	2015-12-30 13:28:36 UTC (rev 155036)
@@ -4,13 +4,12 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-daemon
-pkgver=3.0.1
+pkgver=3.0.2
 _golibver=0.4.6
 _deepinapiver=3.0.1
 _dbusfactoryver=3.0.0
 _girgeneratorver=0.9.2
-_desktopbaserev=c6c243608a93ddac5a03ce3e855a830d70793187
-pkgrel=2
+pkgrel=1
 pkgdesc='Daemon handling the DDE session settings'
 arch=('i686' 'x86_64')
 url="https://github.com/linuxdeepin/dde-daemon"
@@ -18,7 +17,7 @@
 depends=('deepin-desktop-schemas' 'gvfs' 'libcanberra-pulse' 'metacity' 'poppler-glib'
          'rfkill' 'acpid' 'bluez' 'deepin-notifications' 'iso-codes' 'lsb-release'
          'mobile-broadband-provider-info' 'polkit-gnome' 'udisks2' 'upower' 'gcc-libs>=5.3.0-3'
-         'libxkbfile' 'accountsservice')
+         'libxkbfile' 'accountsservice' 'deepin-desktop-base')
 makedepends=('deepin-dbus-generator' 'deepin-gir-generator' 'sqlite' 'git' 'mercurial' 'gcc-go')
 optdepends=('networkmanager: Network Management daemon'
             'deepin-grub2-themes: deepin theme for grub menu')
@@ -31,28 +30,20 @@
         "git+https://cr.deepin.io/dde/dde-api.git#tag=$_deepinapiver"
         "git+https://cr.deepin.io/dbus-factory.git#tag=$_dbusfactoryver"
         "git+https://cr.deepin.io/go-gir-generator.git#tag=$_girgeneratorver"
-        "git+https://cr.deepin.io/deepin-desktop-base.git#commit=$_desktopbaserev"
         'deepin-daemon.sysusers'
-        'polkit-gnome-authentication-agent-1-deepin.desktop'
-        'launcher.patch')
+        'polkit-gnome-authentication-agent-1-deepin.desktop')
 sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP'
             '4482f2c82c3652040021dd43515f131184a0417e341dc37db487117012245e25'
-            '014f4c1111530e7556c3a83ab4409ae7dd47a87550004128ed8b7d02c58357e7'
-            '99d667b9bffad84d456ac08a6441f64619b8ccf8efa06e55ddb3dc50f6ccee5e')
+            '014f4c1111530e7556c3a83ab4409ae7dd47a87550004128ed8b7d02c58357e7')
 
 prepare() {
   sed -i "s|\"\${GOLDFLAGS}\"|\"\${GOLDFLAGS} $CFLAGS $LDFLAGS\"|" dde-daemon/Makefile
   sed -i 's| generator$||' go-gir-generator/makefile
 
-  # https://github.com/fasheng/arch-deepin/issues/209
-  rm -r dde-daemon/launcher
-  (cd dde-daemon; patch -p1 -i ../launcher.patch)
-
   export GOPATH="$srcdir/build"
   mkdir -p build/src/pkg.deepin.io/{lib,dde/api}
   cp -a go-lib/* build/src/pkg.deepin.io/lib
@@ -75,9 +66,6 @@
 
   cd "$srcdir/dde-daemon"
   make USE_GCCGO=1
-
-  cd "$srcdir/deepin-desktop-base"
-  make
 }
 
 package() {
@@ -86,6 +74,4 @@
 
   install -Dm644 ../polkit-gnome-authentication-agent-1-deepin.desktop "$pkgdir/etc/xdg/autostart/polkit-gnome-authentication-agent-1-deepin.desktop"
   install -Dm644 ../deepin-daemon.sysusers "$pkgdir/usr/lib/sysusers.d/deepin-daemon.conf"
-  install -Dm644 "$srcdir"/deepin-desktop-base/files/desktop-version "$pkgdir"/etc/deepin-version
-  #install -Dm644 "$srcdir"/deepin-desktop-base/files/desktop-version "$pkgdir"/usr/lib/deepin/deepin-version
 }