Fix PKGBUILD and update dependencies.

1 files changed, 15 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1d09b7e2ab50..a39c345c8ea9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,22 @@
 # Maintainer: Peter Hoeg <firstname at lastname dot com>
 
-_pkgbase=tensor
-pkgname=${_pkgbase}-git
-pkgver=r37.09370d4
-pkgrel=2
-pkgdesc='Matrix QML client'
+pkgname=tensor-git
+pkgver=r295.d01b8b8
+pkgrel=1
+pkgdesc='Cross-platform Qt5/QML-based Matrix client'
 arch=('x86_64' 'i686')
-url=('http://www.matrix.org')
-license=('GPL')
-depends=('qt5-base')
-source=("git+https://github.com/davidar/${_pkgbase}.git"
+url='https://github.com/davidar/tensor'
+license=('GPL3')
+depends=('qt5-quickcontrols')
+source=('git+https://github.com/davidar/tensor.git'
+        'git+https://github.com/Fxrh/libqmatrixclient.git'
         'tensor.desktop')
 sha1sums=('SKIP'
+          'SKIP'
           '4f03c6d93dce615c02360f3b2ab42e6aee883147')
 
 pkgver() {
-  cd ${srcdir}/${_pkgbase}
+  cd ${srcdir}/tensor
   ( set -o pipefail
     git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@@ -23,25 +24,19 @@ pkgver() {
 }
 
 prepare() {
-  cd ${srcdir}/${_pkgbase}
+  cd ${srcdir}/tensor
+  git config submodule.lib.url $srcdir/libqmatrixclient
   git submodule update --init
-  cd matrix-js-sdk && npm install && npm run build && cd ..
 }
 
 build() {
-  cd ${srcdir}/${_pkgbase}
+  cd ${srcdir}/tensor
   qmake
   make
 }
 
 package() {
-  cd ${srcdir}/${_pkgbase}
-
-  for r in 16 24 32 48 64 128 192 256 384 ; do
-    _icondir=${pkgdir}/usr/share/icons/hicolor/${r}x${r}/apps
-    mkdir -p $_icondir
-    convert -resize ${r}x${r} src/logo.png ${_icondir}/tensor.png
-  done
+  cd ${srcdir}/tensor
 
   mkdir -p $pkgdir/usr/bin
   install -m755 tensor $pkgdir/usr/bin/tensor