[PR PATCH] zathura: add make-deps and enable Dtests

[PR PATCH] zathura: add make-deps and enable Dtests

[dkwo]

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

There is a new pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages zatst
https://github.com/void-linux/void-packages/pull/31724

zathura: add make-deps and enable Dtests
trying to fix a segfault issue

- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me


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

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

From 6a1f04f92c9327f47253070766bafb7892e83a0e Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 30 Jun 2021 15:09:46 +0200
Subject: [PATCH] zathura: add make-deps and enable Dtests

---
 srcpkgs/zathura/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template
index f74e51c9d2ee..f4936be68b53 100644
--- a/srcpkgs/zathura/template
+++ b/srcpkgs/zathura/template
@@ -1,13 +1,13 @@
 # Template file for 'zathura'
 pkgname=zathura
 version=0.4.7
-revision=2
+revision=3
 build_style=meson
-configure_args="-Dsynctex=enabled -Dtests=disabled"
+configure_args="-Dsynctex=enabled -Dtests=enabled"
 hostmakedepends="pkg-config intltool python3-Sphinx desktop-file-utils
  appstream-glib glib-devel librsvg-utils"
 makedepends="girara-devel sqlite-devel file-devel zlib-devel libseccomp-devel
- libglib-devel texlive-devel"
+ libglib-devel texlive-devel check-devel gettext-devel"
 short_desc="Highly customizable and functional document viewer"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"

Re: [PR REVIEW] zathura: add make-deps and enable Dtests

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#discussion_r661517017

Comment:
Please use `checkdepends` for these, since the package itself doesn't need them (I'd add `-Dtests=enabled/disabled` conditionally to `configure_args` as well, using `XBPS_CHECK_PKGS`).

Re: [PR REVIEW] zathura: add make-deps and enable Dtests

[dkwo]

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#discussion_r661570891

Comment:
Ehm, if I move `check` to `checkdepends`, then I get error
```
Run-time dependency check found: NO (tried pkgconfig)
tests/meson.build:1:0: ERROR: Dependency "check" not found, tried pkgconfig
```

Re: [PR PATCH] [Updated] zathura: add make-deps and enable Dtests

[dkwo]

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

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

https://github.com/dkwo/void-packages zatst
https://github.com/void-linux/void-packages/pull/31724

zathura: add make-deps and enable Dtests
Trying to fix a segfault issue #31722 (but not succeding yet).

- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

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

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

From 1f993003166718c7dbf63be98c7e670c43ae634a Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 30 Jun 2021 15:09:46 +0200
Subject: [PATCH] zathura: add make-deps and enable Dtests

---
 srcpkgs/zathura/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template
index f74e51c9d2ee..e589c4b30261 100644
--- a/srcpkgs/zathura/template
+++ b/srcpkgs/zathura/template
@@ -1,20 +1,26 @@
 # Template file for 'zathura'
 pkgname=zathura
 version=0.4.7
-revision=2
+revision=3
 build_style=meson
-configure_args="-Dsynctex=enabled -Dtests=disabled"
+configure_args="-Dsynctex=enabled"
 hostmakedepends="pkg-config intltool python3-Sphinx desktop-file-utils
  appstream-glib glib-devel librsvg-utils"
 makedepends="girara-devel sqlite-devel file-devel zlib-devel libseccomp-devel
- libglib-devel texlive-devel"
+ libglib-devel texlive-devel check-devel gettext-devel"
 short_desc="Highly customizable and functional document viewer"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="https://pwmt.org/projects/zathura/"
-distfiles="https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz"
+homepage="https://pwmt.org/projects/zathura"
+distfiles="${homepage}/download/zathura-${version}.tar.xz"
 checksum=e012dbfe2b981b826553a9af8420d42a9c5d3387fbe14a5399ce94a2d374a1e7
 
+if [ "$XBPS_CHECK_PKGS" = full ]; then
+	configure_args+=" -Dtests=enabled"
+else
+	configure_args+=" -Dtests=disabled"
+fi
+
 post_install() {
 	vlicense LICENSE
 }

Re: [PR REVIEW] zathura: add make-deps and enable Dtests

[dkwo]

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#discussion_r661587636

Comment:
is it better now?

Re: zathura: add make-deps and enable Dtests

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#issuecomment-871506136

Comment:
also, I didn't notice it still fails/skips two tests
```
Running suite(s): Types
100%: Checks: 2, Failures: 0, Errors: 0
-------


Summary of Failures:

4/7 session          SKIP           0.03s
5/7 sandbox          SKIP           0.02s

Ok:                 5
Expected Fail:      0
Fail:               0
Unexpected Pass:    0
Skipped:            2
Timeout:            0
```

Re: zathura: add make-deps and enable Dtests

[dkwo]

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

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#issuecomment-871506136

Comment:
also, I didn't notice it still skips two tests
```
Running suite(s): Types
100%: Checks: 2, Failures: 0, Errors: 0
-------


Summary of Failures:

4/7 session          SKIP           0.03s
5/7 sandbox          SKIP           0.02s

Ok:                 5
Expected Fail:      0
Fail:               0
Unexpected Pass:    0
Skipped:            2
Timeout:            0
```

Re: [PR REVIEW] zathura: add make-deps and enable Dtests

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#discussion_r661761758

Comment:
What command did you use that resulted in that? 

Re: [PR REVIEW] zathura: add make-deps and enable Dtests

[dkwo]

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#discussion_r662049012

Comment:
I used `./xbps-src pkg -f` on a template that had `Dtests=enabled`.

Re: [PR REVIEW] zathura: add make-deps and enable Dtests

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#discussion_r662303298

Comment:
With tests disabled, the dependencies should work when put in checkdepends.

Re: [PR REVIEW] zathura: add make-deps and enable Dtests

[dkwo]

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#discussion_r662326065

Comment:
As soon as I have `check-devel` in `checkdeps`, it fails, even with `-Dtests=disabled`; if I remove it, it works.

Re: [PR REVIEW] zathura: add make-deps and enable Dtests

[dkwo]

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#discussion_r662326065

Comment:
As soon as I have `check-devel` in `checkdepends`, it fails, even with `-Dtests=disabled`; if I remove it, it works.

Re: [PR REVIEW] zathura: add make-deps and enable Dtests

[dkwo]

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#discussion_r662327024

Comment:
```
$ => zathura-0.4.7_3: skipping check (XBPS_CHECK_PKGS is disabled) ...
=> zathura-0.4.7_3: running pre-install hook: 00-libdir ...
=> zathura-0.4.7_3: running pre-install hook: 02-script-wrapper ...
=> zathura-0.4.7_3: running pre-install hook: 98-fixup-gir-path ...
=> zathura-0.4.7_3: running do_install ...
ninja: Entering directory `build'
ninja: error: '/usr/lib64/libcheck.so', needed by 'tests/test_document', missing and no known rule to make it
=> ERROR: zathura-0.4.7_3: do_install: 'DESTDIR=${DESTDIR} ${make_cmd} -C ${meson_builddir} ${make_install_args} ${make_install_target}' exited with 1
=> ERROR:   in do_install() at common/build-style/meson.sh:148
```

Re: [PR REVIEW] zathura: add make-deps and enable Dtests

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#discussion_r662367366

Comment:
Have you cleaned your build directory? That didn't happen previously... (unless it's gettext-devel to blame).

Re: [PR REVIEW] zathura: add make-deps and enable Dtests

[dkwo]

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#discussion_r662883027

Comment:
Ok, I take it back, now it works if Dtests are disabled.

Re: [PR REVIEW] zathura: add make-deps and enable Dtests

[dkwo]

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#discussion_r662884562

Comment:
Is anything like this correct then?
```
if [ "$XBPS_CHECK_PKGS" = full ]; then
	configure_args+=" -Dtests=enabled"
	makedepends+=" check-devel"
else
	configure_args+=" -Dtests=disabled"
	check-depends+=" check-devel"
fi
```

Re: [PR REVIEW] zathura: add make-deps and enable Dtests

[dkwo]

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#discussion_r662884562

Comment:
Is anything like this correct then?
```
if [ "$XBPS_CHECK_PKGS" = full ]; then
	configure_args+=" -Dtests=enabled"
	makedepends+=" check-devel"
else
	configure_args+=" -Dtests=disabled"
	checkdepends+=" check-devel"
fi
```

Re: [PR PATCH] [Updated] zathura: add make-deps and enable Dtests

[dkwo]

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

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

https://github.com/dkwo/void-packages zatst
https://github.com/void-linux/void-packages/pull/31724

zathura: add make-deps and enable Dtests
Trying to fix a segfault issue #31722 (but not succeding yet).

- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

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

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

From f915de68af3df096232110815d5065391fcd986a Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 30 Jun 2021 15:09:46 +0200
Subject: [PATCH] zathura: add make-deps and enable Dtests conditionally

---
 srcpkgs/zathura/template | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template
index f74e51c9d2ee..3a6afd35e56c 100644
--- a/srcpkgs/zathura/template
+++ b/srcpkgs/zathura/template
@@ -1,20 +1,26 @@
 # Template file for 'zathura'
 pkgname=zathura
 version=0.4.7
-revision=2
+revision=3
 build_style=meson
-configure_args="-Dsynctex=enabled -Dtests=disabled"
+configure_args="-Dsynctex=enabled"
 hostmakedepends="pkg-config intltool python3-Sphinx desktop-file-utils
  appstream-glib glib-devel librsvg-utils"
 makedepends="girara-devel sqlite-devel file-devel zlib-devel libseccomp-devel
- libglib-devel texlive-devel"
+ libglib-devel texlive-devel gettext-devel"
+checkdepends="check-devel"
 short_desc="Highly customizable and functional document viewer"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="https://pwmt.org/projects/zathura/"
-distfiles="https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz"
+homepage="https://pwmt.org/projects/zathura"
+distfiles="${homepage}/download/zathura-${version}.tar.xz"
 checksum=e012dbfe2b981b826553a9af8420d42a9c5d3387fbe14a5399ce94a2d374a1e7
 
+if [ "$XBPS_CHECK_PKGS" = full ]; then
+	configure_args+=" -Dtests=enabled"
+	makedepends+=" check-devel"
+fi
+
 post_install() {
 	vlicense LICENSE
 }

Re: [PR REVIEW] zathura: add make-deps and enable Dtests

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#discussion_r663049282

Comment:
check-devel can always be in checkdepends (just set the variable after `depends`), and should never be in makedepends.

With tests=disabled, meson should never try to look for it.

Re: [PR REVIEW] zathura: add make-deps and enable Dtests

[dkwo]

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#discussion_r663201539

Comment:
With tests disabled, there's no problem.
If dtests are enabled, it is not enough to have it it checkdepends, it has to be in makedepends, otherwise I get error.
Do you agree?
```
if [ "$XBPS_CHECK_PKGS" = full ]; then
	configure_args+=" -Dtests=enabled"
	makedepends+=" check-devel"
fi
```

Re: [PR REVIEW] zathura: add make-deps and enable Dtests

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#discussion_r663228487

Comment:
No, `checkdepends` will be installed equivalently to how `makedepends` is, for the cases where we run tests.

```diff
diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template
index 3a6afd35e5..31b514eb4a 100644
--- a/srcpkgs/zathura/template
+++ b/srcpkgs/zathura/template
@@ -7,8 +7,8 @@ configure_args="-Dsynctex=enabled"
 hostmakedepends="pkg-config intltool python3-Sphinx desktop-file-utils
  appstream-glib glib-devel librsvg-utils"
 makedepends="girara-devel sqlite-devel file-devel zlib-devel libseccomp-devel
- libglib-devel texlive-devel gettext-devel"
-checkdepends="check-devel"
+ libglib-devel texlive-devel"
+checkdepends="check-devel gettext-devel"
 short_desc="Highly customizable and functional document viewer"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
@@ -16,9 +16,10 @@ homepage="https://pwmt.org/projects/zathura"
 distfiles="${homepage}/download/zathura-${version}.tar.xz"
 checksum=e012dbfe2b981b826553a9af8420d42a9c5d3387fbe14a5399ce94a2d374a1e7
 
-if [ "$XBPS_CHECK_PKGS" = full ]; then
+if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -Dtests=enabled"
-	makedepends+=" check-devel"
+else
+	configure_args+=" -Dtests=disabled"
 fi
 
 post_install() {
```

Re: [PR REVIEW] zathura: add make-deps and enable Dtests

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#discussion_r663231265

Comment:
Also, no need to increase revision here.

Re: [PR PATCH] [Updated] zathura: add make-deps and enable Dtests

[dkwo]

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

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

https://github.com/dkwo/void-packages zatst
https://github.com/void-linux/void-packages/pull/31724

zathura: add make-deps and enable Dtests
Trying to fix a segfault issue #31722 (but not succeding yet).

- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

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

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

From 68c61b376892eee1010785f95b67f44cf52cdde0 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Wed, 30 Jun 2021 15:09:46 +0200
Subject: [PATCH] zathura: add check-deps and enable Dtests conditionally

---
 srcpkgs/zathura/template | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template
index f74e51c9d2ee..de6933801623 100644
--- a/srcpkgs/zathura/template
+++ b/srcpkgs/zathura/template
@@ -3,18 +3,25 @@ pkgname=zathura
 version=0.4.7
 revision=2
 build_style=meson
-configure_args="-Dsynctex=enabled -Dtests=disabled"
+configure_args="-Dsynctex=enabled"
 hostmakedepends="pkg-config intltool python3-Sphinx desktop-file-utils
  appstream-glib glib-devel librsvg-utils"
 makedepends="girara-devel sqlite-devel file-devel zlib-devel libseccomp-devel
  libglib-devel texlive-devel"
+checkdepends="gettext-devel check-devel"
 short_desc="Highly customizable and functional document viewer"
 maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="Zlib"
-homepage="https://pwmt.org/projects/zathura/"
-distfiles="https://pwmt.org/projects/zathura/download/zathura-${version}.tar.xz"
+homepage="https://pwmt.org/projects/zathura"
+distfiles="${homepage}/download/zathura-${version}.tar.xz"
 checksum=e012dbfe2b981b826553a9af8420d42a9c5d3387fbe14a5399ce94a2d374a1e7
 
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args+=" -Dtests=enabled"
+else
+	configure_args+=" -Dtests=disabled"
+fi
+
 post_install() {
 	vlicense LICENSE
 }

Re: [PR REVIEW] zathura: add make-deps and enable Dtests

[dkwo]

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

New review comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/31724#discussion_r663354499

Comment:
Done. Althoug it still fails on my system, if I do `pkg -f`. Perhaps it is just a local issue.

Re: [PR PATCH] [Merged]: zathura: various fixes

[ericonr]

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

There's a merged pull request on the void-packages repository

zathura: various fixes
https://github.com/void-linux/void-packages/pull/31724

Description:
Trying to fix a segfault issue #31722 (but not succeding yet).

- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me