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

[Felix Yan]

    Date: Thursday, December 17, 2015 @ 07:17:06
  Author: fyan
Revision: 153506

upgpkg: deepin-daemon 2.93.4.20151217-1

Modified:
  deepin-daemon/trunk/PKGBUILD

----------+
 PKGBUILD |   23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-17 05:36:02 UTC (rev 153505)
+++ PKGBUILD	2015-12-17 06:17:06 UTC (rev 153506)
@@ -4,14 +4,15 @@
 # Contributor: Xu Fasheng <fasheng.xu[AT]gmail.com>
 
 pkgname=deepin-daemon
-pkgver=2.93.4.20151214
-_commit=3fa5785eeaea2937347c1bcc9c9a6d2d76a6f4f4
+pkgver=2.93.4.20151217
+_commit=944dbe01ea3aff953f9b78e7f3aa7c45ca5f8b23
 #_golibver=0.4.3
-_golibrev=9ad64e8fa5f92ede669f94a3a770a64f7ca88e60
+_golibrev=198ee129310023cc693ff79dfb5a0f2deb54f134
 #_deepinapiver=2.92.3
-_deepinapirev=67c7eb27e302655c4046ceec121b7e75e287e591
+_deepinapirev=e67977faf52aaf6c88b9faa71be9a88d574e4a45
 #_dbusfactoryver=2.92.2
 _dbusfactoryrev=2141b28feabadb94c20721f8f7ee2a2d5d373227
+_girgeneratorrev=55cc72169a21e1e9a284926b9d4c0423c5a0afb1
 _desktopbaserev=af086a257aafc81a854dfe7accd9e5600b849960
 pkgrel=1
 pkgdesc='Daemon handling the DDE session settings'
@@ -20,9 +21,9 @@
 license=('GPL3')
 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-go'
+         'mobile-broadband-provider-info' 'polkit-gnome' 'udisks2' 'upower' 'gcc-libs>=5.3.0-3'
          'libxkbfile' 'accountsservice')
-makedepends=('deepin-dbus-generator' 'sqlite' 'git' 'mercurial')
+makedepends=('deepin-dbus-generator' 'deepin-gir-generator' 'sqlite' 'git' 'mercurial')
 optdepends=('networkmanager: Network Management daemon'
             'deepin-grub2-themes: deepin theme for grub menu')
 conflicts=('dde-daemon')
@@ -37,6 +38,7 @@
         "git+https://github.com/linuxdeepin/dde-api.git#commit=$_deepinapirev"
         #"git+https://github.com/linuxdeepin/dbus-factory.git#tag=$_dbusfactoryver"
         "git+https://github.com/linuxdeepin/dbus-factory.git#commit=$_dbusfactoryrev"
+        "git+https://github.com/linuxdeepin/go-gir-generator.git#commit=$_girgeneratorrev"
         "git+https://github.com/linuxdeepin/deepin-desktop-base.git#commit=$_desktopbaserev"
         'deepin-daemon.sysusers'
         'polkit-gnome-authentication-agent-1-deepin.desktop')
@@ -45,10 +47,14 @@
             'SKIP'
             'SKIP'
             'SKIP'
+            'SKIP'
             '4482f2c82c3652040021dd43515f131184a0417e341dc37db487117012245e25'
             '014f4c1111530e7556c3a83ab4409ae7dd47a87550004128ed8b7d02c58357e7')
 
 prepare() {
+  sed -i "s|\"\${GOLDFLAGS}\"|\"\${GOLDFLAGS} $CFLAGS $LDFLAGS\"|" dde-daemon/Makefile
+  sed -i 's| generator$||' go-gir-generator/makefile
+
   export GOPATH="$srcdir/build"
   mkdir -p build/src/pkg.deepin.io/{lib,dde/api}
   cp -a go-lib/* build/src/pkg.deepin.io/lib
@@ -64,6 +70,11 @@
   cd "$srcdir/dbus-factory"
   make install-golang
 
+  cd "$srcdir/go-gir-generator"
+  make GENERATOR=gir-generator build
+  make copyfile
+  cp -r out/src/gir "$GOPATH/src"/
+
   cd "$srcdir/dde-daemon"
   make USE_GCCGO=1