upgpkg: usql 0.7.8-1

upstream release

2 files changed, 36 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65ae7c07acec..9d2fd6f0bd25 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = usql
-	pkgdesc = usql is a universal command-line interface for SQL databases
-	pkgver = 0.6.0
+	pkgdesc = A universal command-line interface for SQL databases
+	pkgver = 0.7.8
 	pkgrel = 1
 	url = https://github.com/xo/usql
 	arch = i686
@@ -9,12 +9,10 @@ pkgbase = usql
 	arch = armv7h
 	arch = aarch64
 	license = MIT
-	makedepends = go
-	makedepends = git
-	depends = go
-	provides = usql
-	source = git+https://github.com/xo/usql#tag=v0.6.0
-	md5sums = SKIP
+	makedepends = go-pie
+	depends = icu
+	source = usql-0.7.8.tar.gz::https://github.com/xo/usql/archive/v0.7.8.tar.gz
+	sha256sums = d8d07324afe2478068f99b79e35ad5f5c06fa0e0051504cff5bce592ee75c6c2
 
 pkgname = usql
 
diff --git a/PKGBUILD b/PKGBUILD
index f983eddcfc82..715d7a5b829f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,36 @@
-# Maintainer: Christoph W <c w e g e n e r at gmail dot com>
+# Maintainer: Filipe Nascimento <flipee at tuta dot io>
+# Contributor: Christoph W <c w e g e n e r at gmail dot com>
 
-pkgname='usql'
-_gitname='usql'
-pkgver='0.6.0'
-pkgrel='1'
-pkgdesc='usql is a universal command-line interface for SQL databases'
+pkgname=usql
+pkgver=0.7.8
+pkgrel=1
+pkgdesc='A universal command-line interface for SQL databases'
 arch=('i686' 'x86_64' 'armv6h' 'armv7h' 'aarch64')
-url='https://github.com/xo/usql'
+url="https://github.com/xo/usql"
 license=('MIT')
-depends=('go')
-makedepends=('go' 'git')
-provides=('usql')
-source=("git+https://github.com/xo/usql#tag=v$pkgver")
-md5sums=('SKIP')
-build()
-{
-  export GOPATH="$srcdir"
-  export GOBIN="$GOPATH/bin"
-  export PATH="$GOBIN:$PATH"
-
-  go get -u github.com/kardianos/govendor
-
-  mkdir -p "$GOPATH/src/github.com/xo"
-  mv -f "$srcdir/usql" "$GOPATH/src/github.com/xo/"
-
-  cd "$GOPATH/src/github.com/xo/usql"
-
-  echo "Building usql version=$pkgver"
-  TAGS="most fts5 vtable json1"
-  # Remove ADODB (unavailable on linux)
-  # Temporarily remove Avatica (does not compile successfully)
-  TAGS="$TAGS no_adodb no_avatica"
-
-  govendor init
-  govendor fetch ./...
-  govendor remove github.com/xo/usql/internal
-
-  go install -tags "$TAGS" \
-  -ldflags="-X github.com/xo/usql/text.CommandName=$pkgname -X github.com/xo/usql/text.CommandVersion=$pkgver"
-
-
+depends=('icu')
+makedepends=('go-pie')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
+sha256sums=('d8d07324afe2478068f99b79e35ad5f5c06fa0e0051504cff5bce592ee75c6c2')
+
+build() {
+    cd "$pkgname-$pkgver"
+
+    TAGS="most sqlite_app_armor sqlite_fts5 sqlite_introspect sqlite_json1
+          sqlite_stat4 sqlite_userauth sqlite_vtable sqlite_icu no_adodb"
+
+    go build \
+        -tags="$TAGS" \
+        -gcflags="all=-trimpath=$PWD" \
+	    -asmflags="all=-trimpath=$PWD" \
+        -ldflags="-extldflags $LDFLAGS
+                  -s -w -X github.com/xo/usql/text.CommandName=$pkgname
+                  -X github.com/xo/usql/text.CommandVersion=$pkgver" \
+        -o $pkgname .
 }
-package()
-{
-  cd $GOBIN
-  install -Dsm755 usql "$pkgdir/usr/bin/usql"
 
-  cd "$GOPATH/src/github.com/xo/usql"
-  install -Dm644 "README.md" "${pkgdir}/usr/share/doc/usql/README.md"
-  install -Dm644 "contrib/usqlpass" "${pkgdir}/usr/share/doc/usql/usqlpass"
-  install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/usql/LICENSE"
+package() {
+    cd $pkgname-$pkgver
+    install -Dm755 $pkgname -t "$pkgdir/usr/bin"
+    install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname"
 }