Re: [PR PATCH] [Updated] cherrytree: update to 0.99.21

[logenkain <logenkain@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1173 bytes --]

There is an updated pull request by logenkain against master on the void-packages repository

https://github.com/logenkain/void-packages cherrytree-0.99.21
https://github.com/void-linux/void-packages/pull/26558

cherrytree: update to 0.99.21
I haven't pushed an update since the runtime checks have become required. I'm not sure what to expect, but this is my result:

Running tests...
Test project /builddir/cherrytree_0.99.21/build
    Start 1: run_tests
1/1 Test #1: run_tests ........................***Failed    0.07 sec
Unable to init server: Could not connect: Connection refused

(run_tests:31504): Gtk-WARNING **: 10:39:54.094: cannot open display: 


0% tests passed, 1 tests failed out of 1

Total Test time (real) =   0.07 sec

The following tests FAILED:
	  1 - run_tests (Failed)
Errors while running CTest
make: *** [Makefile:171: test] Error 8
=> ERROR: cherrytree-0.99.21_1: do_check: 'CTEST_OUTPUT_ON_FAILURE=TRUE ${make_cmd} ${make_check_args} ${make_check_target}' exited with 2
=> ERROR:   in do_check() at common/build-style/cmake.sh:108


A patch file from https://github.com/void-linux/void-packages/pull/26558.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cherrytree-0.99.21-26558.patch --]
[-- Type: text/x-diff, Size: 1925 bytes --]

From ba2a72451a9da13b9e1639870ab671a99877c329 Mon Sep 17 00:00:00 2001
From: Logen Kain <logen@sudotask.com>
Date: Sat, 21 Nov 2020 09:59:17 -0500
Subject: [PATCH] cherrytree: update to 0.99.21

---
 srcpkgs/cherrytree/template | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index dc9530ce871..ac13deb1b89 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,25 +1,22 @@
 # Template file for 'cherrytree'
 pkgname=cherrytree
-version=0.38.9
+version=0.99.21
 revision=1
-archs=noarch
-build_style=python2-module
-pycompile_dirs="usr/share/cherrytree/modules"
-hostmakedepends="gettext python-devel desktop-file-utils"
-depends="pygtksourceview python-dbus python-enchant desktop-file-utils"
+wrksrc=${pkgname}_${version}
+build_style=cmake
+hostmakedepends="gettext pkg-config desktop-file-utils
+python3 glib-devel"
+makedepends="cpputest uchardet-devel libcurl-devel sqlite-devel
+libxml++-devel gtksourceviewmm-devel gspell-devel gtkmm-devel"
+depends="desktop-file-utils"
+checkdepends="xvfb-run"
 short_desc="Hierarchial note taking application with syntax highlighting"
 maintainer="Logen K <logen@sudotask.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.giuspen.com/cherrytree/"
-distfiles="https://www.giuspen.com/software/${pkgname}-${version}.tar.xz"
-checksum=fc16669e81e7f981f1b51671171a55035febf2ea80e801c0dd7ff52763025475
-python_version=2
+distfiles="https://www.giuspen.com/software/${pkgname}_${version}.tar.xz"
+checksum=13975afada775174a56266bdf113fc879624167aced8784e44aba15620e6ba57
 
-post_install() {
-	# don’t install useless egg
-	rm -rf ${DESTDIR}/usr/lib/python*/site-packages
-
-	# remove old mime registration files
-	rm -rf ${DESTDIR}/usr/share/application-registry
-	rm -rf ${DESTDIR}/usr/share/mime-info
+do_check() {
+	xvfb-run make tests
 }