* [PR PATCH] cherrytree: update to 0.99.27
@ 2020-12-25 6:29 logenkain
2020-12-25 17:11 ` logenkain
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: logenkain @ 2020-12-25 6:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 804 bytes --]
There is a new pull request by logenkain against master on the void-packages repository
https://github.com/logenkain/void-packages master
https://github.com/void-linux/void-packages/pull/27418
cherrytree: update to 0.99.27
They decided to use gtest, which is fine, but it seems as though they expect gtest to be pulled in as a sub module, which, of course, ends up being an empty folder in the release tar ball.
As seen here:
https://github.com/giuspen/cherrytree/tree/master/tests
If I pull in gtest, as it expects, it tests out properly, but I'm not sure how to do that properly for a void build, so I opted to disable the testing.
Always happy to learn better way to deal with things like this.
A patch file from https://github.com/void-linux/void-packages/pull/27418.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-27418.patch --]
[-- Type: text/x-diff, Size: 1193 bytes --]
From da3ef73f2d664cce7e8788fc180a2d67a4c119fb Mon Sep 17 00:00:00 2001
From: Logen Kain <logen@sudotask.com>
Date: Fri, 25 Dec 2020 01:25:08 -0500
Subject: [PATCH] cherrytree: update to 0.99.27
---
srcpkgs/cherrytree/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index de4faaae43b..8de20c28212 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,6 +1,6 @@
# Template file for 'cherrytree'
pkgname=cherrytree
-version=0.99.21
+version=0.99.27
revision=1
build_style=cmake
hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
@@ -13,7 +13,10 @@ maintainer="Logen K <logen@sudotask.com>"
license="GPL-3.0-or-later"
homepage="https://www.giuspen.com/cherrytree/"
distfiles="https://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=5c180fdf5cbab43bc496a246ce952e7f39e84b2a7b4cabdb22773b9d4a415850
+checksum=fff13c6b764eaa952616308a53cb5bd863b37f913bd74891117b4da20ff29832
+configure_args+=" -DBUILD_GMOCK:BOOL='OFF' \
+ -DBUILD_GTEST:BOOL='OFF' \
+ -DBUILD_TESTING:BOOL='OFF'"
do_check() {
xvfb-run make -C build test
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: cherrytree: update to 0.99.27
2020-12-25 6:29 [PR PATCH] cherrytree: update to 0.99.27 logenkain
@ 2020-12-25 17:11 ` logenkain
2020-12-25 23:35 ` [PR REVIEW] " ericonr
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: logenkain @ 2020-12-25 17:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 230 bytes --]
New comment by logenkain on void-packages repository
https://github.com/void-linux/void-packages/pull/27418#issuecomment-751272716
Comment:
Should I just skip checks, or is there a way that makes sense to get the tests working?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR REVIEW] cherrytree: update to 0.99.27
2020-12-25 6:29 [PR PATCH] cherrytree: update to 0.99.27 logenkain
2020-12-25 17:11 ` logenkain
@ 2020-12-25 23:35 ` ericonr
2020-12-27 19:35 ` [PR PATCH] [Updated] " logenkain
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-12-25 23:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 505 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27418#discussion_r548922187
Comment:
```suggestion
configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
-DBUILD_GTEST:BOOL='OFF'
-DBUILD_TESTING:BOOL='OFF'"
```
Well, tests broke because you stopped building them :P
Put this block inside a conditional like `[ -z "$XBPS_CHECK_PKGS" ]`. This is worth it only if the tests take long to build; otherwise it's easier to just allow them to build.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] cherrytree: update to 0.99.27
2020-12-25 6:29 [PR PATCH] cherrytree: update to 0.99.27 logenkain
2020-12-25 17:11 ` logenkain
2020-12-25 23:35 ` [PR REVIEW] " ericonr
@ 2020-12-27 19:35 ` logenkain
2020-12-27 19:39 ` [PR REVIEW] " logenkain
2021-01-02 2:35 ` [PR PATCH] [Merged]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: logenkain @ 2020-12-27 19:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 809 bytes --]
There is an updated pull request by logenkain against master on the void-packages repository
https://github.com/logenkain/void-packages master
https://github.com/void-linux/void-packages/pull/27418
cherrytree: update to 0.99.27
They decided to use gtest, which is fine, but it seems as though they expect gtest to be pulled in as a sub module, which, of course, ends up being an empty folder in the release tar ball.
As seen here:
https://github.com/giuspen/cherrytree/tree/master/tests
If I pull in gtest, as it expects, it tests out properly, but I'm not sure how to do that properly for a void build, so I opted to disable the testing.
Always happy to learn better way to deal with things like this.
A patch file from https://github.com/void-linux/void-packages/pull/27418.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-27418.patch --]
[-- Type: text/x-diff, Size: 1440 bytes --]
From 2c3f662081b86b009901b3de99548caf741adf14 Mon Sep 17 00:00:00 2001
From: Logen Kain <logen@sudotask.com>
Date: Fri, 25 Dec 2020 01:25:08 -0500
Subject: [PATCH] cherrytree: update to 0.99.27
---
srcpkgs/cherrytree/template | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index de4faaae43b..f3c8286b11d 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,20 +1,18 @@
# Template file for 'cherrytree'
pkgname=cherrytree
-version=0.99.21
+version=0.99.27
revision=1
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://github.com/giuspen/cherrytree/archive/$version.tar.gz"
-checksum=5c180fdf5cbab43bc496a246ce952e7f39e84b2a7b4cabdb22773b9d4a415850
-
-do_check() {
- xvfb-run make -C build test
-}
+checksum=fff13c6b764eaa952616308a53cb5bd863b37f913bd74891117b4da20ff29832
+configure_args+=" -DBUILD_GMOCK:BOOL='OFF'
+ -DBUILD_GTEST:BOOL='OFF'
+ -DBUILD_TESTING:BOOL='OFF'"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR REVIEW] cherrytree: update to 0.99.27
2020-12-25 6:29 [PR PATCH] cherrytree: update to 0.99.27 logenkain
` (2 preceding siblings ...)
2020-12-27 19:35 ` [PR PATCH] [Updated] " logenkain
@ 2020-12-27 19:39 ` logenkain
2021-01-02 2:35 ` [PR PATCH] [Merged]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: logenkain @ 2020-12-27 19:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 354 bytes --]
New review comment by logenkain on void-packages repository
https://github.com/void-linux/void-packages/pull/27418#discussion_r549156024
Comment:
The problem I ran into is that it pulls in gtest as a submodule (See: https://github.com/giuspen/cherrytree/tree/master/tests). It's not included in the source tarball, so I wasn't sure how to go about it.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: cherrytree: update to 0.99.27
2020-12-25 6:29 [PR PATCH] cherrytree: update to 0.99.27 logenkain
` (3 preceding siblings ...)
2020-12-27 19:39 ` [PR REVIEW] " logenkain
@ 2021-01-02 2:35 ` ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-01-02 2:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 650 bytes --]
There's a merged pull request on the void-packages repository
cherrytree: update to 0.99.27
https://github.com/void-linux/void-packages/pull/27418
Description:
They decided to use gtest, which is fine, but it seems as though they expect gtest to be pulled in as a sub module, which, of course, ends up being an empty folder in the release tar ball.
As seen here:
https://github.com/giuspen/cherrytree/tree/master/tests
If I pull in gtest, as it expects, it tests out properly, but I'm not sure how to do that properly for a void build, so I opted to disable the testing.
Always happy to learn better way to deal with things like this.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-01-02 2:35 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-25 6:29 [PR PATCH] cherrytree: update to 0.99.27 logenkain
2020-12-25 17:11 ` logenkain
2020-12-25 23:35 ` [PR REVIEW] " ericonr
2020-12-27 19:35 ` [PR PATCH] [Updated] " logenkain
2020-12-27 19:39 ` [PR REVIEW] " logenkain
2021-01-02 2:35 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).