Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] cherrytree: update to 0.99.21
@ 2020-11-21 16:03 logenkain
  2020-11-21 16:13 ` [PR REVIEW] " ericonr
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: logenkain @ 2020-11-21 16:03 UTC (permalink / raw)
  To: ml

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

There is a new 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: 1864 bytes --]

From 3c96bf74517bd5194d197b8dbd2d185515e696c9 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 | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index dc9530ce871..9f18d7b60a8 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,25 +1,14 @@
 # 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="cpputest uchardet-devel libcurl-devel sqlite-devel libxml++-devel gtksourceviewmm-devel gspell-devel gtkmm-devel gettext pkg-config desktop-file-utils"
+depends="uchardet libxml++ gspell gtksourceviewmm desktop-file-utils"
 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
-
-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
-}
+distfiles="https://www.giuspen.com/software/${pkgname}_${version}.tar.xz"
+checksum=13975afada775174a56266bdf113fc879624167aced8784e44aba15620e6ba57

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR REVIEW] cherrytree: update to 0.99.21
  2020-11-21 16:03 [PR PATCH] cherrytree: update to 0.99.21 logenkain
@ 2020-11-21 16:13 ` ericonr
  2020-11-21 16:13 ` ericonr
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: ericonr @ 2020-11-21 16:13 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26558#discussion_r528212882

Comment:
Break this line at around 80 columns or so.

Most of these dependencies (the `devel` ones) should go in `makedepends`.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR REVIEW] cherrytree: update to 0.99.21
  2020-11-21 16:03 [PR PATCH] cherrytree: update to 0.99.21 logenkain
  2020-11-21 16:13 ` [PR REVIEW] " ericonr
@ 2020-11-21 16:13 ` ericonr
  2020-11-21 17:05 ` [PR PATCH] [Updated] " logenkain
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: ericonr @ 2020-11-21 16:13 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26558#discussion_r528212972

Comment:
> uchardet libxml++ gspell gtksourceviewmm

These should be detected automatically at build time, I don't think you need to add them.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] cherrytree: update to 0.99.21
  2020-11-21 16:03 [PR PATCH] cherrytree: update to 0.99.21 logenkain
  2020-11-21 16:13 ` [PR REVIEW] " ericonr
  2020-11-21 16:13 ` ericonr
@ 2020-11-21 17:05 ` logenkain
  2020-11-21 17:10 ` logenkain
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: logenkain @ 2020-11-21 17:05 UTC (permalink / raw)
  To: ml

[-- 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: 1889 bytes --]

From 16b2bf8507ff97e12335e5814044d4a1f21e8fa9 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 | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index dc9530ce871..8fb5a3b5647 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,25 +1,20 @@
 # 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="cpputest uchardet-devel libcurl-devel sqlite-devel
+ libxml++-devel gtksourceviewmm-devel gspell-devel gtkmm-devel gettext pkg-config desktop-file-utils"
+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
 }

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: cherrytree: update to 0.99.21
  2020-11-21 16:03 [PR PATCH] cherrytree: update to 0.99.21 logenkain
                   ` (2 preceding siblings ...)
  2020-11-21 17:05 ` [PR PATCH] [Updated] " logenkain
@ 2020-11-21 17:10 ` logenkain
  2020-11-21 20:53 ` ndowens
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: logenkain @ 2020-11-21 17:10 UTC (permalink / raw)
  To: ml

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

New comment by logenkain on void-packages repository

https://github.com/void-linux/void-packages/pull/26558#issuecomment-731606740

Comment:
arm's pkg-config seems to be failing at detecting gtkmm. Is there something we can do to fix that?
Oh, and the hostmakedepnds will be broken into yet another line, just realized it's still too long.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: cherrytree: update to 0.99.21
  2020-11-21 16:03 [PR PATCH] cherrytree: update to 0.99.21 logenkain
                   ` (3 preceding siblings ...)
  2020-11-21 17:10 ` logenkain
@ 2020-11-21 20:53 ` ndowens
  2020-11-21 21:50 ` ndowens
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: ndowens @ 2020-11-21 20:53 UTC (permalink / raw)
  To: ml

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

New comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/26558#issuecomment-731635191

Comment:
> arm's pkg-config seems to be failing at detecting gtkmm. Is there something we can do to fix that?
> Oh, and the hostmakedepnds will be broken into yet another line, just realized it's still too long.

Working on it and seeing if I can get it to build

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: cherrytree: update to 0.99.21
  2020-11-21 16:03 [PR PATCH] cherrytree: update to 0.99.21 logenkain
                   ` (4 preceding siblings ...)
  2020-11-21 20:53 ` ndowens
@ 2020-11-21 21:50 ` ndowens
  2020-11-22 12:24 ` logenkain
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: ndowens @ 2020-11-21 21:50 UTC (permalink / raw)
  To: ml

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

New comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/26558#issuecomment-731642069

Comment:
Ok to fix the cross-builds, you need to move all the -devel to makedepends; add python3 and glib-devel to hostmakedepends 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: cherrytree: update to 0.99.21
  2020-11-21 16:03 [PR PATCH] cherrytree: update to 0.99.21 logenkain
                   ` (5 preceding siblings ...)
  2020-11-21 21:50 ` ndowens
@ 2020-11-22 12:24 ` logenkain
  2020-11-22 13:25 ` [PR PATCH] [Updated] " logenkain
  2020-11-24  2:42 ` logenkain
  8 siblings, 0 replies; 10+ messages in thread
From: logenkain @ 2020-11-22 12:24 UTC (permalink / raw)
  To: ml

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

New comment by logenkain on void-packages repository

https://github.com/void-linux/void-packages/pull/26558#issuecomment-731739894

Comment:
> Ok to fix the cross-builds, you need to move all the -devel to makedepends; add python3 and glib-devel to hostmakedepends

Thanks, I should have known that. I'm out of practice and forgot makedepends was a thing.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] cherrytree: update to 0.99.21
  2020-11-21 16:03 [PR PATCH] cherrytree: update to 0.99.21 logenkain
                   ` (6 preceding siblings ...)
  2020-11-22 12:24 ` logenkain
@ 2020-11-22 13:25 ` logenkain
  2020-11-24  2:42 ` logenkain
  8 siblings, 0 replies; 10+ messages in thread
From: logenkain @ 2020-11-22 13:25 UTC (permalink / raw)
  To: ml

[-- 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
 }

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: cherrytree: update to 0.99.21
  2020-11-21 16:03 [PR PATCH] cherrytree: update to 0.99.21 logenkain
                   ` (7 preceding siblings ...)
  2020-11-22 13:25 ` [PR PATCH] [Updated] " logenkain
@ 2020-11-24  2:42 ` logenkain
  8 siblings, 0 replies; 10+ messages in thread
From: logenkain @ 2020-11-24  2:42 UTC (permalink / raw)
  To: ml

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

New comment by logenkain on void-packages repository

https://github.com/void-linux/void-packages/pull/26558#issuecomment-732558646

Comment:
All should be well now.

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2020-11-24  2:42 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-21 16:03 [PR PATCH] cherrytree: update to 0.99.21 logenkain
2020-11-21 16:13 ` [PR REVIEW] " ericonr
2020-11-21 16:13 ` ericonr
2020-11-21 17:05 ` [PR PATCH] [Updated] " logenkain
2020-11-21 17:10 ` logenkain
2020-11-21 20:53 ` ndowens
2020-11-21 21:50 ` ndowens
2020-11-22 12:24 ` logenkain
2020-11-22 13:25 ` [PR PATCH] [Updated] " logenkain
2020-11-24  2:42 ` logenkain

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git