diff options
author | morguldir | 2019-10-30 19:59:08 +0100 |
---|---|---|
committer | morguldir | 2019-10-30 19:59:08 +0100 |
commit | 1aa3f681f7e1f82714990e8db8a83a28c1b04e3c (patch) | |
tree | 0d1c88636d18bf7af43b614a4e7399f7b0cfc307 | |
parent | c1bf9dd6e91ea091b90031da11755e40e4ed49a3 (diff) | |
download | aur-1aa3f681f7e1f82714990e8db8a83a28c1b04e3c.tar.gz |
Go back to using a submodule
A submodule is the only way to get the correct version of libQuotient
-rw-r--r-- | .SRCINFO | 7 | ||||
-rw-r--r-- | PKGBUILD | 50 |
2 files changed, 31 insertions, 26 deletions
@@ -1,7 +1,7 @@ pkgbase = quaternion-git pkgdesc = Qt5-based IM client for the Matrix protocol - pkgver = 0.0.9.4a.r69.g253650b - pkgrel = 2 + pkgver = 0.0.9.4a.r139.ge56c41b + pkgrel = 1 url = https://matrix.org/docs/projects/client/quaternion.html arch = i686 arch = x86_64 @@ -14,10 +14,11 @@ pkgbase = quaternion-git depends = qt5-quickcontrols depends = qt5-quickcontrols2 depends = qt5-olm - depends = libquotient-git optdepends = qtkeychain: Store access tokens in a keyring provides = quaternion source = git://github.com/QMatrixClient/Quaternion + source = git://github.com/quotient-im/libQuotient + sha256sums = SKIP sha256sums = SKIP pkgname = quaternion-git @@ -1,4 +1,4 @@ -# Maintainer: Morguldir <morguldir@protonmail.com> +# Maintainer: morguldir <morguldir@protonmail.com> # Contributor: Sefa Eyeoglu <contact@scrumplex.net> # Contributor: Ivan Semkin (ivan at semkin dot ru) # Contributor: Martin Weinelt <hexa@darmstadt.ccc.de> @@ -6,47 +6,51 @@ _appname=Quaternion _pkgname=quaternion pkgname=quaternion-git -pkgver=0.0.9.4a.r69.g253650b -pkgrel=2 +pkgver=0.0.9.4a.r139.ge56c41b +pkgrel=1 pkgdesc='Qt5-based IM client for the Matrix protocol' url='https://matrix.org/docs/projects/client/quaternion.html' arch=('i686' 'x86_64') license=(GPL3) -depends=(hicolor-icon-theme qt5-multimedia qt5-tools qt5-quickcontrols qt5-quickcontrols2 qt5-olm libquotient-git) +depends=(hicolor-icon-theme qt5-multimedia qt5-tools qt5-quickcontrols qt5-quickcontrols2 qt5-olm) makedepends=(cmake git) optdepends=('qtkeychain: Store access tokens in a keyring') provides=(quaternion) -source=('git://github.com/QMatrixClient/Quaternion') -sha256sums=('SKIP') +source=('git://github.com/QMatrixClient/Quaternion' + 'git://github.com/quotient-im/libQuotient') +sha256sums=('SKIP' + 'SKIP') pkgver() { cd "$_appname" git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } -build() { +prepare() +{ + cd $_appname + git config submodule.lib.url $srcdir/libQuotient + git submodule update +} + +build() +{ mkdir ${_appname}/build_dir -p cd ${_appname}/build_dir - cmake .. -DUSE_INTREE_LIBQMC=false + + cmake .. \ + -DUSE_INTREE_LIBQMC=ON \ + -DCMAKE_INSTALL_PREFIX=$pkgdir/usr \ + -DCMAKE_BUILD_TYPE=Release + cmake --build . --target all } -package() { +package() +{ cd ${_appname} - # The binary - install -Dm755 "build_dir/${_pkgname}" -t "${pkgdir}/usr/bin/" - - # .desktop file - install -Dm644 "linux/com.github.quaternion.desktop" -t "${pkgdir}/usr/share/applications/" - - # Icons - install -Dm644 "icons/quaternion/16-apps-quaternion.png" -t "${pkgdir}/usr/share/icons/hicolor/16x16/apps/" - install -Dm644 "icons/quaternion/22-apps-quaternion.png" -t "${pkgdir}/usr/share/icons/hicolor/22x22/apps/" - 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/128x128/apps/" - install -Dm644 "icons/quaternion/sources/quaternion.svg" -t "${pkgdir}/usr/share/icons/hicolor/scalable/apps/" + cmake --install build_dir + rm $pkgdir/usr/share/icons/*/icon-theme.cache } # vim:set ts=2 sw=2 et: |