Update to 0.0.9

2 files changed, 36 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2615e95088c7..466271fd4e23 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = quaternion
 	pkgdesc = Qt5-based IM client for the Matrix protocol
-	pkgver = 0.0.5
-	pkgrel = 3
+	pkgver = 0.0.9
+	pkgrel = 1
 	url = https://matrix.org/docs/projects/client/quaternion.html
-	arch = any
+	arch = i686
+	arch = x86_64
 	license = GPL3
 	makedepends = cmake
-	depends = qt5-base
 	depends = qt5-declarative
-	depends = qt5-quickcontrols
+	depends = hicolor-icon-theme
 	provides = quaternion
-	conflicts = quaternion
-	source = https://github.com/QMatrixClient/Quaternion/archive/v0.0.5.tar.gz
-	source = https://github.com/QMatrixClient/libqmatrixclient/archive/v0.2-q0.0.5.tar.gz
-	sha256sums = ece45e3c483d3c6ed480dcd4b07221465db6e010c154e343e77c2a55dfebba9c
-	sha256sums = b955bdddd7b5a33403e92ab4a3c25988e55a105fe640d6cbfd37a6059b7382f0
+	conflicts = quaternion-git
+	source = https://github.com/QMatrixClient/Quaternion/archive/v0.0.9.tar.gz
+	source = https://github.com/QMatrixClient/libqmatrixclient/archive/v0.2.1.tar.gz
+	sha256sums = 0f471051abf31acdd70a80de3b731775d4d8ad4fbe45f4d72371fc7229321b16
+	sha256sums = 615f52f29b0958a633587846bd9f8ff711cc58f7e0fbb98ea485e0746d7f01a3
 
 pkgname = quaternion
 
diff --git a/PKGBUILD b/PKGBUILD
index 82f9c5605005..40dd761bc50a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,40 +3,44 @@
  
 appname=Quaternion
 pkgname=quaternion
-pkgver=0.0.5
-pkgrel=3
+libname=libQMatrixClient
+_libname=libqmatrixclient
+pkgver=0.0.9
+_libqmatrixclient_pkgver=0.2.1
+pkgrel=1
 pkgdesc='Qt5-based IM client for the Matrix protocol'
-arch=('any')
+arch=('i686' 'x86_64')
 url='https://matrix.org/docs/projects/client/quaternion.html'
 license=('GPL3')
-depends=('qt5-base' 'qt5-declarative' 'qt5-quickcontrols')
+depends=('qt5-declarative' 'hicolor-icon-theme')
 makedepends=('cmake')
 provides=('quaternion')
-conflicts=('quaternion')
+conflicts=('quaternion-git')
 source=("https://github.com/QMatrixClient/Quaternion/archive/v$pkgver.tar.gz"
-        'https://github.com/QMatrixClient/libqmatrixclient/archive/v0.2-q0.0.5.tar.gz')
-sha256sums=('ece45e3c483d3c6ed480dcd4b07221465db6e010c154e343e77c2a55dfebba9c'
-            'b955bdddd7b5a33403e92ab4a3c25988e55a105fe640d6cbfd37a6059b7382f0')
+        "https://github.com/QMatrixClient/libqmatrixclient/archive/v${_libqmatrixclient_pkgver}.tar.gz"
+)
+sha256sums=('0f471051abf31acdd70a80de3b731775d4d8ad4fbe45f4d72371fc7229321b16'
+            '615f52f29b0958a633587846bd9f8ff711cc58f7e0fbb98ea485e0746d7f01a3')
 
 prepare() {
-  mv libqmatrixclient-0.2-q0.0.5/* $appname-$pkgver/lib
+  cp -r $_libname-$_libqmatrixclient_pkgver/* ${srcdir}/${appname}-${pkgver}/lib/
 }
 
 build() {
-  mkdir $appname-$pkgver/build -p
-  cd $appname-$pkgver/build
-  cmake ..
-  make $MAKEFLAGS
+  mkdir $appname-$pkgver/build_dir -p
+  cd $appname-$pkgver/build_dir
+  cmake .. -DBUILD_SHARED_LIBS:BOOL=ON
+  cmake --build . --target all
 }
  
 package() {
   cd $appname-$pkgver
 
   # The binary
-  install -Dm755 "build/quaternion" -t "$pkgdir/usr/bin/"
+  install -Dm755 "build_dir/$pkgname" -t "$pkgdir/usr/bin/"
 
   # .desktop file
-  install -Dm644 "linux/quaternion.desktop" -t "$pkgdir/usr/share/applications/"
+  install -Dm644 "linux/$pkgname.desktop" -t "$pkgdir/usr/share/applications/"
 
   # Icons
   install -Dm644 "icons/quaternion/16-apps-quaternion.png" -t "$pkgdir/usr/share/icons/hicolor/16x16/apps/"
@@ -44,7 +48,13 @@ package() {
   install -Dm644 "icons/quaternion/32-apps-quaternion.png" -t "$pkgdir/usr/share/icons/hicolor/32x32/apps/"
   install -Dm644 "icons/quaternion/48-apps-quaternion.png" -t "$pkgdir/usr/share/icons/hicolor/48x48/apps/"
   install -Dm644 "icons/quaternion/64-apps-quaternion.png" -t "$pkgdir/usr/share/icons/hicolor/64x64/apps/"
-  install -Dm644 "icons/quaternion/128-apps-quaternion.png" -t "$pkgdir/usr/share/icons/hicolor/128x1128/apps/"
+  install -Dm644 "icons/quaternion/128-apps-quaternion.png" -t "$pkgdir/usr/share/icons/hicolor/128x128/apps/"
   install -Dm644 "icons/quaternion/sources/quaternion.svg" -t "$pkgdir/usr/share/icons/hicolor/scalable/apps/"
+
+  # The lib
+  mkdir $pkgdir/usr/lib
+  mv build_dir/lib/$libname.so.0.2.0 $pkgdir/usr/lib/
+  ln -s /usr/lib/$libname.so.0.2.0 $pkgdir/usr/lib/$libname.so.0
+  ln -s /usr/lib/$libname.so.0.2.0 $pkgdir/usr/lib/$libname.so
 }
 # vim:set ts=2 sw=2 et: