Update version number generation and add support for lmdbxx hoytech fork

master
Joseph Donofry 2021-03-04 19:04:59 -05:00
parent d9e06bfadc
commit 66d53a133b
No known key found for this signature in database
GPG Key ID: E8A1D78EF044B0CB
2 changed files with 7 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.2.r2316.b6f2acfe pkgver = 0.8.1.r189.g87bf761d
pkgrel = 1 pkgrel = 1
url = https://github.com/Nheko-Reborn/nheko url = https://github.com/Nheko-Reborn/nheko
arch = i686 arch = i686
@ -34,10 +34,9 @@ pkgbase = nheko-git
depends = libolm depends = libolm
depends = spdlog depends = spdlog
depends = tweeny depends = tweeny
depends = lmdbxx
provides = nheko provides = nheko
conflicts = nheko conflicts = nheko
source = nheko-git::git://github.com/Nheko-Reborn/nheko.git#branch=master source = nheko-git::git+https://github.com/Nheko-Reborn/nheko.git#branch=master
md5sums = SKIP md5sums = SKIP
pkgname = nheko-git pkgname = nheko-git

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.2.r2316.b6f2acfe pkgver=0.8.1.r189.g87bf761d
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,13 +10,13 @@ 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" "qt5-declarative" "qtkeychain-qt5" "boost-libs" "libsodium" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "libnice" "libolm" "spdlog" "tweeny" "lmdbxx") depends=("qt5-base" "lmdb" "qt5-graphicaleffects" "qt5-multimedia" "qt5-svg" "qt5-quickcontrols2" "qt5-declarative" "qtkeychain-qt5" "boost-libs" "libsodium" "cmark" "openssl" "hicolor-icon-theme" "gstreamer" "gst-plugins-base" "gst-plugins-good" "gst-plugins-bad" "libnice" "libolm" "spdlog" "tweeny")
makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "boost") makedepends=("git" "cmake" "gcc" "fontconfig" "qt5-tools" "nlohmann-json" "boost")
provides=("nheko") provides=("nheko")
conflicts=("nheko") conflicts=("nheko")
source=($pkgname::git://github.com/Nheko-Reborn/nheko.git#branch=master) source=($pkgname::git+https://github.com/Nheko-Reborn/nheko.git#branch=master)
md5sums=("SKIP") md5sums=("SKIP")
prepare() { prepare() {
@ -25,7 +25,7 @@ prepare() {
pkgver() { pkgver() {
cd "$pkgname" cd "$pkgname"
printf "0.7.2.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
} }
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=OFF -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_MTXCLIENT=ON -DCMAKE_INSTALL_PREFIX=.deps/usr -DCMAKE_BUILD_TYPE=Release cmake -H. -Bbuild -DHUNTER_ENABLED=OFF -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_MTXCLIENT=ON -DUSE_BUNDLED_LMDBXX=ON -DCMAKE_INSTALL_PREFIX=.deps/usr -DCMAKE_BUILD_TYPE=Release
cmake --build build --config Release cmake --build build --config Release
} }