Fix pkgver issue and hopefully add some missing deps

master
Joseph Donofry 2020-05-14 21:23:42 -04:00
parent d8cb81ea0c
commit 0ebd9ed5b9
No known key found for this signature in database
GPG Key ID: E8A1D78EF044B0CB
2 changed files with 11 additions and 8 deletions

View File

@ -1,6 +1,6 @@
pkgbase = nheko-git pkgbase = nheko-git
pkgdesc = Desktop client for the Matrix protocol pkgdesc = Desktop client for the Matrix protocol
pkgver = 0.7.1.r1586.14ce840 pkgver = 0.7.1.r1647.eb4b02e
pkgrel = 1 pkgrel = 1
url = https://github.com/Nheko-Reborn/nheko url = https://github.com/Nheko-Reborn/nheko
arch = i686 arch = i686
@ -11,16 +11,19 @@ pkgbase = nheko-git
makedepends = gcc makedepends = gcc
makedepends = fontconfig makedepends = fontconfig
makedepends = qt5-tools makedepends = qt5-tools
makedepends = nlohmann-json
depends = qt5-base depends = qt5-base
depends = lmdb depends = lmdb
depends = qt5-graphicaleffects depends = qt5-graphicaleffects
depends = qt5-multimedia depends = qt5-multimedia
depends = qt5-svg depends = qt5-svg
depends = qt5-quickcontrols2 depends = qt5-quickcontrols2
depends = boost depends = qt5-declarative
depends = boost-libs
depends = libsodium depends = libsodium
depends = openssl
depends = cmark depends = cmark
depends = openssl
depends = hicolor-icon-theme
provides = nheko provides = nheko
conflicts = nheko conflicts = nheko
source = nheko-git::git://github.com/Nheko-Reborn/nheko.git#branch=master source = nheko-git::git://github.com/Nheko-Reborn/nheko.git#branch=master

View File

@ -2,7 +2,7 @@
# Maintainer: Joseph Donofry <joe at joedonofry dot com> # Maintainer: Joseph Donofry <joe at joedonofry dot com>
pkgname=nheko-git pkgname=nheko-git
pkgver=0.7.1.r1586.14ce840 pkgver=0.7.1.r1647.eb4b02e
pkgrel=1 pkgrel=1
pkgdesc="Desktop client for the Matrix protocol" pkgdesc="Desktop client for the Matrix protocol"
arch=("i686" "x86_64") arch=("i686" "x86_64")
@ -10,8 +10,8 @@ arch=("i686" "x86_64")
url="https://github.com/Nheko-Reborn/nheko" url="https://github.com/Nheko-Reborn/nheko"
license=("GPL3") license=("GPL3")
depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "boost" "libsodium" "openssl" "cmark" ) depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "boost-libs" "libsodium" "cmark" "openssl" "hicolor-icon-theme")
makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools") makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json")
provides=("nheko") provides=("nheko")
conflicts=("nheko") conflicts=("nheko")
@ -25,7 +25,7 @@ prepare() {
pkgver() { pkgver() {
cd "$pkgname" cd "$pkgname"
printf "0.7.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" printf "0.7.1.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
} }
build() { build() {
@ -35,7 +35,7 @@ build() {
# build with more cores than the default # build with more cores than the default
export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l) export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l)
cmake -H. -Bbuild -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_OPENSSL=OFF -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF -DUSE_BUNDLED_JSON=ON \ cmake -H. -Bbuild -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_OPENSSL=OFF -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_CMARK=OFF -DUSE_BUNDLED_JSON=OFF \
-DCMAKE_INSTALL_PREFIX=.deps/usr -DCMAKE_INSTALL_PREFIX=.deps/usr
cmake --build build --config Release cmake --build build --config Release
} }