From af34b08c17cb8177902c48af2338df163151882d Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Mon, 4 Dec 2017 21:43:10 +0200 Subject: [PATCH] Integration with matrix structs --- .SRCINFO | 6 +++--- PKGBUILD | 18 ++++++++---------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 47e2962..921e81e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nheko-git pkgdesc = Desktop client for the Matrix protocol - pkgver = 0.1.0.r174.c428ef4b + pkgver = 0.1.0.r340.b9c4a819 pkgrel = 1 url = https://github.com/mujx/nheko arch = i686 @@ -11,11 +11,11 @@ pkgbase = nheko-git makedepends = gcc makedepends = fontconfig makedepends = qt5-tools + makedepends = ninja depends = qt5-base depends = lmdb + depends = qt5-multimedia source = nheko-git::git://github.com/mujx/nheko.git - source = git://github.com/bendiken/lmdbxx.git - md5sums = SKIP md5sums = SKIP pkgname = nheko-git diff --git a/PKGBUILD b/PKGBUILD index 3ec5708..0be2bd7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Konstantinos Sideris pkgname=nheko-git -pkgver=0.1.0.r174.c428ef4b +pkgver=0.1.0.r340.b9c4a819 pkgrel=1 pkgdesc="Desktop client for the Matrix protocol" arch=("i686" "x86_64") @@ -9,17 +9,15 @@ arch=("i686" "x86_64") url="https://github.com/mujx/nheko" license=("GPL3") -depends=("qt5-base" "lmdb") -makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") +depends=("qt5-base" "lmdb" "qt5-multimedia") +makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "ninja") -source=($pkgname::git://github.com/mujx/nheko.git git://github.com/bendiken/lmdbxx.git) -md5sums=("SKIP" "SKIP") +source=($pkgname::git://github.com/mujx/nheko.git) +md5sums=("SKIP") prepare() { cd "$pkgname" - git submodule init - git config submodule.lmdbxx.url $srcdir/libs/lmdbxx - git submodule update + git submodule update --init --recursive } pkgver() { @@ -29,8 +27,8 @@ pkgver() { build() { cd "$pkgname" - cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release - make -C build -j2 + cmake -H. -Bbuild -GNinja -DCMAKE_BUILD_TYPE=Release + cmake --build build } package() {