diff options
| author | Morgenstern | 2023-09-04 13:32:15 +1200 |
|---|---|---|
| committer | Morgenstern | 2023-09-04 13:32:15 +1200 |
| commit | d3202ccb6b70740f991a8be8ae6f7291f600a9d2 (patch) | |
| tree | aba40f64b526655892a99546e317a109bf1b2143 | |
| parent | 5debf1e4a2719a808bcc56984542df7863b0349e (diff) | |
| download | aur-d3202ccb6b70740f991a8be8ae6f7291f600a9d2.tar.gz | |
Use extra/spdlog and extra/fmt for dependencies
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 23 |
2 files changed, 10 insertions, 19 deletions
@@ -1,6 +1,6 @@ pkgbase = cherrytree-git pkgdesc = Hierarchical note-taking application, git version - pkgver = 1.0.1.r2.g08eec868 + pkgver = 1.0.1.r5.gc144e215 pkgrel = 1 url = https://github.com/giuspen/cherrytree arch = x86_64 @@ -10,6 +10,8 @@ pkgbase = cherrytree-git makedepends = cmake makedepends = git makedepends = python + makedepends = spdlog + depends = fmt depends = gspell depends = gtksourceviewmm depends = libxml++2.6 @@ -18,8 +20,6 @@ pkgbase = cherrytree-git provides = cherrytree conflicts = cherrytree source = git+https://github.com/giuspen/cherrytree.git - source = git+https://github.com/gabime/spdlog.git - sha512sums = SKIP sha512sums = SKIP pkgname = cherrytree-git @@ -1,49 +1,40 @@ # Maintainer: Morgenstern <charles [at] charlesbwise [dot] com> pkgname=cherrytree-git -pkgver=1.0.1.r2.g08eec868 +pkgver=1.0.1.r5.gc144e215 pkgrel=1 pkgdesc="Hierarchical note-taking application, git version" arch=('x86_64') url="https://github.com/giuspen/${pkgname%%-git}" license=('GPL3') -depends=('gspell' +depends=('fmt' + 'gspell' 'gtksourceviewmm' 'libxml++2.6' 'uchardet' 'vte3') makedepends=('cmake' 'git' - 'python') + 'python' + 'spdlog') checkdepends=('gmock' 'gtest') provides=("${pkgname%%-git}") conflicts=("${pkgname%%-git}") -source=("git+https://github.com/giuspen/${pkgname%%-git}.git" - "git+https://github.com/gabime/spdlog.git") -sha512sums=('SKIP' - 'SKIP') +source=("git+https://github.com/giuspen/${pkgname%%-git}.git") +sha512sums=('SKIP') pkgver() { cd "${pkgname%%-git}" git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' } -# Remove once extra/spdlog>=1.12 -prepare() { - cd "${pkgname%%-git}" - git submodule init - git config submodule.src/spdlog.url "${srcdir}/spdlog" - git -c protocol.file.allow=always submodule update -} - build() { cmake \ -B "${pkgname%%-git}/build" \ -S "${pkgname%%-git}" \ -DAUTO_RUN_TESTING:BOOL='OFF' \ -DUSE_SHARED_GTEST_GMOCK:BOOL='ON' \ - -DUSE_SHARED_FMT_SPDLOG:BOOL='OFF' \ -Wno-dev make -C "${pkgname%%-git}/build" } |