diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 62 |
2 files changed, 27 insertions, 44 deletions
@@ -1,10 +1,11 @@ pkgbase = cherrytree-git pkgdesc = Hierarchical note-taking application, git version - pkgver = 0.99.37.r13.g1f55d501 + pkgver = 1.0.2.r39.gb88cf6eb pkgrel = 1 url = https://github.com/giuspen/cherrytree arch = x86_64 license = GPL3 + checkdepends = gtest makedepends = cmake makedepends = git makedepends = python @@ -14,12 +15,10 @@ pkgbase = cherrytree-git depends = gtksourceviewmm depends = libxml++2.6 depends = uchardet - optdepends = xorg-xhost: allow chroot access to X server for running tests + depends = vte3 provides = cherrytree conflicts = cherrytree source = git+https://github.com/giuspen/cherrytree.git - source = git+https://github.com/google/googletest.git - sha256sums = SKIP - sha256sums = SKIP + sha512sums = SKIP pkgname = cherrytree-git @@ -1,63 +1,47 @@ # Maintainer: Morgenstern <charles [at] charlesbwise [dot] com> pkgname=cherrytree-git -_pkgname="${pkgname%%-git}" -pkgver=0.99.37.r13.g1f55d501 +pkgver=1.0.2.r39.gb88cf6eb pkgrel=1 pkgdesc="Hierarchical note-taking application, git version" arch=('x86_64') -url="https://github.com/giuspen/${_pkgname}" +url="https://github.com/giuspen/${pkgname%%-git}" license=('GPL3') depends=('fmt' - 'gspell' - 'gtksourceviewmm' - 'libxml++2.6' - 'uchardet') -optdepends=('xorg-xhost: allow chroot access to X server for running tests') + 'gspell' + 'gtksourceviewmm' + 'libxml++2.6' + 'uchardet' + 'vte3') makedepends=('cmake' - 'git' - 'python' - 'spdlog') -provides=("${_pkgname}") -conflicts=("${_pkgname}") -source=("git+https://github.com/giuspen/${_pkgname}.git" - "git+https://github.com/google/googletest.git") -sha256sums=('SKIP' - 'SKIP') + 'git' + 'python' + 'spdlog') +checkdepends=('gtest') +provides=("${pkgname%%-git}") +conflicts=("${pkgname%%-git}") +source=("git+https://github.com/giuspen/${pkgname%%-git}.git") +sha512sums=('SKIP') pkgver() { - cd "${_pkgname}" - git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' -} - -prepare() { - cd "${_pkgname}" - git submodule init - git config submodule.googletest.url "${srcdir}/googletest" - #git config submodule.spdlog.url "${srcdir}/spdlog" - git submodule update + cd "${pkgname%%-git}" + git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g' } build() { cmake \ - -B "${_pkgname}/build" \ - -S "${_pkgname}" \ - -DINSTALL_GTEST:BOOL='OFF' \ + -B "${pkgname%%-git}/build" \ + -S "${pkgname%%-git}" \ -DAUTO_RUN_TESTING:BOOL='OFF' \ + -DUSE_SHARED_GTEST_GMOCK:BOOL='ON' \ -Wno-dev - make -C "${_pkgname}/build" + make -C "${pkgname%%-git}/build" } -# NOTE: In order to run tests that depend on the X server in a clean chroot, -# you must allow the chroot access your X server: -# xhost +local: -# https://wiki.archlinux.org/index.php/chroot#Run_graphical_applications_from_chroot check() { - export DISPLAY=:0 - ./"${_pkgname}/build/run_tests_with_x_1" - ./"${_pkgname}/build/run_tests_with_x_2" + ./"${pkgname%%-git}/build/run_tests_no_x" } package() { - make -C "${_pkgname}/build" DESTDIR="${pkgdir}" install + make -C "${pkgname%%-git}/build" DESTDIR="${pkgdir}" install } |