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

[Felix Yan]

    Date: Friday, October 28, 2016 @ 06:07:24
  Author: felixonmars
Revision: 193870

upgpkg: startdde 3.0.12-3

Modified:
  startdde/trunk/PKGBUILD

----------+
 PKGBUILD |   38 ++++++--------------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-28 06:03:11 UTC (rev 193869)
+++ PKGBUILD	2016-10-28 06:07:24 UTC (rev 193870)
@@ -5,50 +5,24 @@
 
 pkgname=startdde
 pkgver=3.0.12
-_golibver=0.5.1
-_deepinapiver=3.0.14
-_dbusfactoryver=3.0.6
-_girgeneratorver=0.9.6
-pkgrel=2
+pkgrel=3
 pkgdesc="starter of deepin desktop environment"
 arch=('i686' 'x86_64')
 url="https://github.com/linuxdeepin/startdde"
 license=('GPL3')
 depends=('deepin-daemon' 'deepin-wm-switcher') # 'gcc-libs>=5.3.0-3')
-makedepends=('cmake' 'coffee-script' 'deepin-dbus-generator' 'deepin-gir-generator' 'go' 'python2' 'webkitgtk' 'git') # 'gcc-go')
+makedepends=('cmake' 'coffee-script' 'deepin-dbus-factory' 'deepin-gir-generator' 'deepin-go-lib'
+             'deepin-api' 'go' 'python2' 'webkitgtk' 'git') # 'gcc-go')
 groups=('deepin')
-source=("git+https://cr.deepin.io/dde/startdde.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")
-sha256sums=('SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP')
+source=("git+https://cr.deepin.io/dde/startdde.git#tag=$pkgver")
+sha256sums=('SKIP')
 
 prepare() {
-  sed -i "s|\"\${GOLDFLAGS}\"|\"\${GOLDFLAGS} $CFLAGS $LDFLAGS\"|" startdde/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
-  cp -a dde-api/* build/src/pkg.deepin.io/dde/api/
-
+  export GOPATH="$srcdir/build:/usr/share/gocode"
   go get github.com/BurntSushi/xgb github.com/BurntSushi/xgbutil github.com/howeyc/fsnotify
 }
 
 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/startdde"
   make # USE_GCCGO=1
 }