Update build script + add some workarounds

1 files changed, 69 insertions, 29 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 77d146131980..87552d86b370 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,71 +1,111 @@
 # Contributor: Thomas Laroche <tho.laroche@gmail.com>
-# Contributor: Kristian Klausen <klausenbusk@hotmail.com>
 # Maintainer: Thomas Fanninger <thomas@fanninger.at>
 
 pkgname=gogs-git
 _pkgname=gogs
-pkgver=20150317
+_branch=master
+pkgver=20150823
 pkgrel=1
 epoch=1
-pkgdesc="Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language. This is the current git version from branch master."
+pkgdesc="Gogs(Go Git Service) is a Self Hosted Git Service in the Go Programming Language. This is the current git version from branch ${_branch}."
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="http://gogs.io/"
 license=('MIT')
-depends=('git')
+depends=('git>=1.7.1')
 optdepends=('sqlite: SQLite support'
             'mariadb: MariaDB support'
             'postgresql: PostgreSQL support'
             'redis: Redis support'
             'memcached: MemCached support'
             'openssh: GIT over SSH support')
-makedepends=('go>=1.2' 'git' 'mercurial' 'patch')
-conflicts=('gogs-bin' 'gogs' 'gogs-git-dev')
+makedepends=('go>=1.2' 'git>=1.7.1' 'patch')
+conflicts=('gogs-bin' 'gogs' 'gogs-git')
 options=('!strip' '!emptydirs')
 backup=('srv/gogs/conf/app.ini')
 
 install=gogs.install
 
-_gourl=github.com/gogits
+_gourl=github.com/gogits/$_pkgname
 source=('gogs.service'
         'app.ini.patch'
-        "${_pkgname}::git+https://${_gourl}/${_pkgname}.git")
+        'helper.sh'
+        "$_pkgname::git+https://${_gourl}.git#branch=${_branch}")
 
-sha512sums=('2b4303f850e3b13b2fc3c9f0bc5820dae431d228002b35f01be0d4bfbcf05de8dcec2a559a85e318b609e4a4d492d44306eadf5f6508fd72333b198661bb0bb7'
-            '9c3d8425cf0e5291e9a7870b9b0ceec4d3d0de3818e0bd93b6a9e9c954cf16e8f2ae230242d6cc0d71147ad10c4224322b1f4f2f8eb3ca5e96c219e9fc35d29b'
+sha512sums=(2b4303f850e3b13b2fc3c9f0bc5820dae431d228002b35f01be0d4bfbcf05de8dcec2a559a85e318b609e4a4d492d44306eadf5f6508fd72333b198661bb0bb7
+            939be9ad851ae6e20b786e2e189b0b67c0198edfc8c83442934ec48c7be073e03c75172e79f23a6ee1e0eb467c6fa18096a66d69d1142ebba28fdc8bb2a3964c
+            e746dbdafc4c8d0b15a224dba95ae3151611ba9ff468ee6f0b1789e489955e4d7eaac0dbdf28a22e5b8211559af5950726f4a37d699a2490fd349f034401028c
             'SKIP')
 
+_goroot="/usr/lib/go"
+
 pkgver(){
-  cd "$srcdir/${_pkgname}"
+  cd "$srcdir/$_pkgname"
   echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
 }
 
 prepare() {
-  mkdir -p "${srcdir}/src/${_gourl}"
-  mv "${_pkgname}" "${srcdir}/src/${_gourl}/${_pkgname}"
-  msg2 "go get"
-  GOPATH="${srcdir}" go get -tags "sqlite redis memcache" "${_gourl}/${_pkgname}"
+  source $srcdir/helper.sh
+
+  export GOROOT=/usr/lib/go
+  
+  msg2 "Prepare GO build enviroment"
+  rm -rf build
+  mkdir -p build/go
+  cd build/go
+
+  for f in "$GOROOT/"*; do
+    ln -s "$f"
+  done
+
+  rm pkg
+  mkdir pkg
+  cd pkg
+
+  for f in "$GOROOT/pkg/"*; do
+    ln -s "$f"
+  done
+
+  export GOROOT="$srcdir/build/go"
+  export GOPATH="$srcdir/build"
+  
+  mkdir -p "$GOPATH/src/github.com/gogits"
 
-  msg2 "Patch: GOGS app.ini"
-  patch -Np1 -i "${srcdir}/app.ini.patch" "${srcdir}/src/${_gourl}/${_pkgname}/conf/app.ini"
+  mv "$srcdir/$_pkgname" $GOPATH/src/${_gourl}
+
+  msg2 "Check and download dependencies from .gopmfile"
+  get_gopm "$GOPATH/src/${_gourl}/.gopmfile" "$GOPATH/src"
+
+  msg2 "Download missing dependencies"
+  go_get github.com/shurcooL/sanitized_anchor_name "$GOPATH/src/github.com/shurcooL/sanitized_anchor_name"
+#  go_get golang.org/x/net "$GOPATH/src/golang.org/x/net"
+#  go_get golang.org/x/text "$GOPATH/src/golang.org/x/text"
+
+  msg2 "Workaround dependencies"
+  cd "$GOPATH/src/github.com/gogits/go-gogs-client/"
+  git checkout -q master
+
+  # Execute patch
+  msg2 "Execute patches"
+  patch -Np1 -i "$srcdir/app.ini.patch" "$GOPATH/src/${_gourl}/conf/app.ini"
 }
 
 build() {
+  cd $GOPATH/src/${_gourl}
+
   msg2 "Build program"
-  cd ${srcdir}/src/${_gourl}/${_pkgname}
-  GOPATH="${srcdir}" go fix
-  GOPATH="${srcdir}" go build -tags "sqlite redis memcache"
+  go fix
+  go build -x -tags='sqlite redis memcache'
 }
 
 package() {
-  install -D -m 0755 "${srcdir}/src/${_gourl}/${_pkgname}/${_pkgname}" "${pkgdir}/usr/share/${_pkgname}/${_pkgname}"
+  install -Dm0755 "$srcdir/build/src/${_gourl}/$_pkgname" "$pkgdir/usr/share/$_pkgname/$_pkgname"
 
-  cp -r "${srcdir}/src/${_gourl}/${_pkgname}/conf" "${pkgdir}/usr/share/${_pkgname}"
-  install -d "${pkgdir}/usr/share/themes/gogs/default/"
-  cp -r "${srcdir}/src/${_gourl}/${_pkgname}/public" "${pkgdir}/usr/share/themes/gogs/default"
-  cp -r "${srcdir}/src/${_gourl}/${_pkgname}/templates" "${pkgdir}/usr/share/themes/gogs/default"
+  cp -r "$srcdir/build/src/${_gourl}/conf" "$pkgdir/usr/share/$_pkgname"
+  mkdir -p "$pkgdir/usr/share/themes/gogs/default/"
+  cp -r "$srcdir/build/src/${_gourl}/public" "$pkgdir/usr/share/themes/gogs/default"
+  cp -r "$srcdir/build/src/${_gourl}/templates" "$pkgdir/usr/share/themes/gogs/default"
 
-  install -D -m 0600 "${pkgdir}/usr/share/${_pkgname}/conf/app.ini" "$pkgdir/srv/${_pkgname}/conf/app.ini"
-  install -D -m 0644 "${srcdir}/gogs.service" "$pkgdir/usr/lib/systemd/system/gogs.service"
-  install -d "${pkgdir}/var/log/gogs"
-  install -D -m 0644 "${srcdir}/src/${_gourl}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/$_pkgname"
+  install -Dm0644 "$pkgdir/usr/share/$_pkgname/conf/app.ini" "$pkgdir/srv/$_pkgname/conf/app.ini"
+  install -Dm0644 "$srcdir/gogs.service" "$pkgdir/usr/lib/systemd/system/gogs.service"
+  install -Dm0644 "$srcdir/build/src/${_gourl}/LICENSE" "$pkgdir/usr/share/licenses/$_pkgname"
 }