diff options
author | xiota | 2024-01-26 06:37:25 -0800 |
---|---|---|
committer | xiota | 2024-01-26 06:45:13 -0800 |
commit | 4363cc6fcaab91d2875599ecc129b6baf5099710 (patch) | |
tree | 5a1e05ea56dad33a82c0813c6fe68ff339a4d0bf | |
parent | 7bf95aecca3beb3194f0892ee2116484826579ba (diff) | |
download | aur-4363cc6fcaab91d2875599ecc129b6baf5099710.tar.gz |
0.0.96.r1
* switch to qt6
* add dep on libolm
* build with clang/lld
-rw-r--r-- | .SRCINFO | 22 | ||||
-rw-r--r-- | PKGBUILD | 44 |
2 files changed, 42 insertions, 24 deletions
@@ -1,6 +1,6 @@ pkgbase = quaternion-git pkgdesc = Qt-based IM client for the Matrix protocol - pkgver = 0.0.95.1.r238.gc074213 + pkgver = 0.0.96.r1.gdc0381e3 pkgrel = 1 url = https://github.com/quotient-im/Quaternion arch = aarch64 @@ -10,13 +10,14 @@ pkgbase = quaternion-git license = LGPL-2.1-or-later makedepends = cmake makedepends = git - depends = hicolor-icon-theme - depends = qt5-multimedia - depends = qt5-quickcontrols2 - depends = qt5-tools - depends = qtkeychain-qt5 - optdepends = qt5-graphicaleffects: Display the conversation history at startup - provides = quaternion + makedepends = qt6-tools + makedepends = clang + makedepends = lld + depends = libolm.so + depends = qt6-multimedia + depends = qt6-declarative + depends = qtkeychain-qt6 + provides = quaternion=0.0.96 conflicts = quaternion source = quaternion::git+https://github.com/quotient-im/Quaternion source = libquotient::git+https://github.com/quotient-im/libQuotient @@ -28,3 +29,8 @@ pkgbase = quaternion-git sha256sums = SKIP pkgname = quaternion-git + depends = libolm.so + depends = qt6-multimedia + depends = qt6-declarative + depends = qtkeychain-qt6 + depends = hicolor-icon-theme @@ -9,6 +9,8 @@ # https://github.com/quotient-im/Quaternion ## options +: ${_build_clang:=true} + : ${_build_git:=true} [[ "${_build_git::1}" == "t" ]] && _pkgtype+="-git" @@ -16,7 +18,7 @@ ## basic info _pkgname="quaternion" pkgname="$_pkgname${_pkgtype:-}" -pkgver=0.0.95.1.r238.gc074213 +pkgver=0.0.96.r1.gdc0381e3 pkgrel=1 pkgdesc='Qt-based IM client for the Matrix protocol' url="https://github.com/quotient-im/Quaternion" @@ -26,20 +28,24 @@ arch=('aarch64' 'i686' 'x86_64') ## main package _main_package() { depends=( - hicolor-icon-theme - qt5-multimedia - qt5-quickcontrols2 - qt5-tools - qtkeychain-qt5 + libolm.so + qt6-multimedia + qt6-declarative + qtkeychain-qt6 ) makedepends=( cmake git - ) - optdepends=( - 'qt5-graphicaleffects: Display the conversation history at startup' + qt6-tools ) + if [[ "${_build_clang::1}" == "t" ]] ; then + makedepends+=( + clang + lld + ) + fi + if [ "${_build_git::1}" != "t" ] ; then _main_stable else @@ -58,7 +64,6 @@ _main_stable() { ) sha256sums=( 'SKIP' - 'SKIP' ) @@ -73,7 +78,7 @@ _main_stable() { ## git package _main_git() { - provides=("$_pkgname") + provides=("$_pkgname=${pkgver%.r**}") conflicts=("$_pkgname") _pkgsrc="$_pkgname" @@ -89,16 +94,14 @@ _main_git() { ) sha256sums=( 'SKIP' - 'SKIP' - 'SKIP' 'SKIP' ) pkgver() { cd "$_pkgsrc" - git describe --long --tags --exclude '[a-z]*' --exclude '*[a-z][a-z]*' \ + git describe --long --tags --abbrev=8 --exclude '[a-z]*' --exclude '*[a-z][a-z]*' \ | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } @@ -141,13 +144,18 @@ prepare() { } build() { + if [[ "${_build_clang::1}" == "t" ]] ; then + export CXX=clang++ + export LDFLAGS+=" -fuse-ld=lld" + fi + local _cmake_options=( -B build -S "$_pkgsrc" -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE=Release -DUSE_INTREE_LIBQMC=ON - -DBUILD_WITH_QT6=OFF + -DBUILD_WITH_QT6=ON ) cmake "${_cmake_options[@]}" @@ -155,7 +163,11 @@ build() { } package() { - DESTDIR="${pkgdir:?}" cmake --install build + depends+=( + hicolor-icon-theme + ) + + DESTDIR="$pkgdir" cmake --install build } ## execute |