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

[Felix Yan]

    Date: Friday, October 28, 2016 @ 06:02:30
  Author: felixonmars
Revision: 193868

upgpkg: deepin-daemon 3.0.23-3

Modified:
  deepin-daemon/trunk/PKGBUILD

----------+
 PKGBUILD |   32 +++-----------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-28 06:01:07 UTC (rev 193867)
+++ PKGBUILD	2016-10-28 06:02:30 UTC (rev 193868)
@@ -5,11 +5,7 @@
 
 pkgname=deepin-daemon
 pkgver=3.0.23
-_golibver=0.5.1
-_deepinapiver=3.0.14
-_dbusfactoryver=3.0.6
-_girgeneratorver=0.9.6
-pkgrel=2
+pkgrel=3
 pkgdesc='Daemon handling the DDE session settings'
 arch=('i686' 'x86_64')
 url="https://github.com/linuxdeepin/dde-daemon"
@@ -19,7 +15,7 @@
          'mobile-broadband-provider-info' 'polkit-gnome' 'udisks2' 'upower' # 'gcc-libs>=5.3.0-3'
          'libxkbfile' 'accountsservice' 'deepin-desktop-base' 'bamf' 'pulseaudio'
          'gnome-keyring')
-makedepends=('deepin-dbus-generator' 'deepin-gir-generator' 'sqlite' 'git' 'mercurial' 'go') # 'gcc-go')
+makedepends=('deepin-dbus-factory' 'deepin-gir-generator' 'deepin-go-lib' 'deepin-api' 'sqlite' 'git' 'mercurial' 'go') # 'gcc-go')
 optdepends=('networkmanager: Network Management daemon'
             'deepin-grub2-themes: deepin theme for grub menu')
 conflicts=('dde-daemon')
@@ -27,29 +23,15 @@
 groups=('deepin')
 install="${pkgname}.install"
 source=("git+https://cr.deepin.io/dde/dde-daemon.git#tag=$pkgver"
-        "git+https://cr.deepin.io/go-lib.git#tag=$_golibver"
-        "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"
         'deepin-daemon.sysusers'
         'polkit-gnome-authentication-agent-1-deepin.desktop')
 sha256sums=('SKIP'
-            '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:/usr/share/gocode"
 
-  export GOPATH="$srcdir/build"
-  mkdir -p build/src/pkg.deepin.io/{lib,dde/api}
-  cp -a go-lib/* build/src/pkg.deepin.io/lib
-  cp -a dde-api/* build/src/pkg.deepin.io/dde/api/
-  
   go get github.com/BurntSushi/xgb github.com/BurntSushi/xgbutil github.com/howeyc/fsnotify \
          github.com/mattn/go-sqlite3 gopkg.in/alecthomas/kingpin.v2 github.com/disintegration/imaging \
          github.com/BurntSushi/freetype-go/freetype github.com/BurntSushi/freetype-go/freetype/truetype \
@@ -57,14 +39,6 @@
 }
 
 build() {
-  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
 }