summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgenstern2020-12-28 09:24:12 +1300
committerMorgenstern2020-12-28 09:24:12 +1300
commit6e92ec8460f776ffeecbab56904b2983cfabf9f5 (patch)
treeee980142c610d23ce95940b971460d057c056255
parentd8b3f4c502e091831ac63a830818aa1bf1b564cd (diff)
downloadaur-6e92ec8460f776ffeecbab56904b2983cfabf9f5.tar.gz
Use external library for spdlog
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD8
2 files changed, 6 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a559ac49724..42d2f9d334d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = cherrytree-git
pkgdesc = Hierarchical note-taking application, git version
- pkgver = 0.99.27.r6.g6e9d4a38
+ pkgver = 0.99.27.r13.g36b10bdd
pkgrel = 1
url = https://github.com/giuspen/cherrytree
arch = x86_64
@@ -11,15 +11,14 @@ pkgbase = cherrytree-git
depends = gspell
depends = gtksourceviewmm
depends = libxml++2.6
+ depends = spdlog
depends = uchardet
provides = cherrytree
conflicts = cherrytree
source = git+https://github.com/giuspen/cherrytree.git
- source = git+https://github.com/gabime/spdlog.git
source = git+https://github.com/google/googletest.git
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = SKIP
pkgname = cherrytree-git
diff --git a/PKGBUILD b/PKGBUILD
index 621594dff6b..82724f8108b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=cherrytree-git
_pkgname="${pkgname%%-git}"
-pkgver=0.99.27.r6.g6e9d4a38
+pkgver=0.99.27.r13.g36b10bdd
pkgrel=1
pkgdesc="Hierarchical note-taking application, git version"
arch=('x86_64')
@@ -11,6 +11,7 @@ license=('GPL3')
depends=('gspell'
'gtksourceviewmm'
'libxml++2.6'
+ 'spdlog'
'uchardet')
makedepends=('cmake'
'git'
@@ -18,10 +19,8 @@ makedepends=('cmake'
provides=("${_pkgname}")
conflicts=("${_pkgname}")
source=("git+https://github.com/giuspen/${_pkgname}.git"
- "git+https://github.com/gabime/spdlog.git"
"git+https://github.com/google/googletest.git")
sha256sums=('SKIP'
- 'SKIP'
'SKIP')
pkgver() {
@@ -32,11 +31,12 @@ pkgver() {
prepare() {
cd "${_pkgname}"
git submodule init
- git config submodule.spdlog.url "${srcdir}/spdlog"
git config submodule.googletest.url "${srcdir}/googletest"
git submodule update
}
+# Remove GMOCK and TESTING options to build and run tests
+# If utilising tests, make sure cherrytree is NOT already running!
build() {
cmake \
-B "${_pkgname}/build" \