[PR PATCH] j4-dmenu-desktop: add support for checks

[PR PATCH] j4-dmenu-desktop: add support for checks

[meator]

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

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

https://github.com/meator/void-packages j4-dmenu-desktop
https://github.com/void-linux/void-packages/pull/31937

j4-dmenu-desktop: add support for checks
The current version of tests errors out when `/usr/share/applications` does not exist. See https://github.com/enkore/j4-dmenu-desktop/pull/123

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] x86_64-musl
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-j4-dmenu-desktop-31937.patch --]
[-- Type: text/x-diff, Size: 2909 bytes --]

From ae8cb89ddb912310e5aa0cea2ce64eb1d3da0307 Mon Sep 17 00:00:00 2001
From: meator <coder64@protonmail.com>
Date: Tue, 13 Jul 2021 08:46:44 +0200
Subject: [PATCH] j4-dmenu-desktop: add support for checks

The current version errors out when /usr/share/applications does not
exist. An alternative to the patch is to mkdir
/usr/share/applications. See
https://github.com/enkore/j4-dmenu-desktop/pull/123
---
 ...c-handle-non-existent-usr-share-appl.patch | 33 +++++++++++++++++++
 srcpkgs/j4-dmenu-desktop/template             |  9 ++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/j4-dmenu-desktop/patches/0001-TestSearchPath.cc-handle-non-existent-usr-share-appl.patch

diff --git a/srcpkgs/j4-dmenu-desktop/patches/0001-TestSearchPath.cc-handle-non-existent-usr-share-appl.patch b/srcpkgs/j4-dmenu-desktop/patches/0001-TestSearchPath.cc-handle-non-existent-usr-share-appl.patch
new file mode 100644
index 000000000000..d9c1e55cdda4
--- /dev/null
+++ b/srcpkgs/j4-dmenu-desktop/patches/0001-TestSearchPath.cc-handle-non-existent-usr-share-appl.patch
@@ -0,0 +1,33 @@
+From 665b6f67538a210764b3fe381442ad47528ca6c5 Mon Sep 17 00:00:00 2001
+From: meator <coder64@protonmail.com>
+Date: Mon, 12 Jul 2021 20:46:04 +0200
+Subject: [PATCH] TestSearchPath.cc: handle non-existent
+ /usr/share/applications/
+
+---
+ src/TestSearchPath.cc | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/TestSearchPath.cc b/src/TestSearchPath.cc
+index 0003ab0..43e9564 100644
+--- a/src/TestSearchPath.cc
++++ b/src/TestSearchPath.cc
+@@ -15,8 +15,13 @@ TEST_CASE("SearchPath/XDG_DATA_HOME", "Check SearchPath honors XDG_DATA_HOME")
+     SearchPath sp;
+     std::vector<std::string> result(sp.begin(), sp.end());
+ 
+-    REQUIRE( result.size() == 1 );
+-    REQUIRE( result[0] == "/usr/share/applications/" );
++    struct stat dirdata;
++    if (stat("/usr/share/applications", &dirdata) == 0 && S_ISDIR(dirdata.st_mode)) { // test if /usr/share/applications is valid
++        REQUIRE( result.size() == 1 );
++        REQUIRE( result.front() == "/usr/share/applications/" );
++    } else {
++        REQUIRE( result.size() == 0 );
++    }
+ }
+ 
+ TEST_CASE("SearchPath/XDG_DATA_DIRS", "Check SearchPath honors XDG_DATA_DIRS")
+-- 
+2.32.0
+
diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index e4397c672781..07d0e0f42ef6 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -4,7 +4,14 @@ version=2.18
 revision=1
 wrksrc="${pkgname}-r${version}"
 build_style=cmake
-configure_args="-DWITH_TESTS=OFF"
+checkdepends="catch2"
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-DWITH_GIT_CATCH=OFF -DCATCH_INCLUDE_DIR=/usr/include/catch2"
+else
+	configure_args="-DWITH_TESTS=OFF"
+fi
+
 depends="dmenu"
 short_desc="Fast desktop menu"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

Re: j4-dmenu-desktop: add support for checks

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31937#issuecomment-879093459

Comment:
Alternatively, we could add a package file files under `/usr/share/applications` to `checkdepends`, so it's installed when the test suite runs. What do you think?

Re: j4-dmenu-desktop: add support for checks

[meator]

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

New comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/31937#issuecomment-879098988

Comment:
What do you mean by that?

Re: j4-dmenu-desktop: add support for checks

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31937#issuecomment-879093459

Comment:
Alternatively, we could add a package with files under `/usr/share/applications` to `checkdepends`, so it's installed when the test suite runs. What do you think?

Re: j4-dmenu-desktop: add support for checks

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31937#issuecomment-879101020

Comment:
*with files

If it needs `/usr/share/applications` to exist, having something like `xterm` installed should be enough for the test suite to work...

Re: j4-dmenu-desktop: add support for checks

[meator]

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

New comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/31937#issuecomment-879113669

Comment:
It doesn't actually need any `.desktop` files in `/usr/share/applications`, it just needs the folder. Adding some packages with desktop files to `checkdepends` is not really necessary. Another solution would be to `mkdir -p /usr/share/applications` in `pre_check()`. What do you think?

Re: j4-dmenu-desktop: add support for checks

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31937#issuecomment-879173112

Comment:
I dislike `mkdir` here because we shouldn't touch the masterdir outside `builddir` and `destdir`. Using a package is preferred (add a comment on top of the `checkdepends` line, though.

Re: [PR PATCH] [Updated] j4-dmenu-desktop: add support for checks

[meator]

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

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

https://github.com/meator/void-packages j4-dmenu-desktop
https://github.com/void-linux/void-packages/pull/31937

j4-dmenu-desktop: add support for checks
The current version of tests errors out when `/usr/share/applications` does not exist. See https://github.com/enkore/j4-dmenu-desktop/pull/123

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] x86_64-musl
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-j4-dmenu-desktop-31937.patch --]
[-- Type: text/x-diff, Size: 1184 bytes --]

From 1ff330d6732b1c1de0197f5cbcc927d9f38e5a0d Mon Sep 17 00:00:00 2001
From: meator <coder64@protonmail.com>
Date: Tue, 13 Jul 2021 08:46:44 +0200
Subject: [PATCH] j4-dmenu-desktop: add support for checks

---
 srcpkgs/j4-dmenu-desktop/template | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index e4397c672781..5d11a16df302 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -4,7 +4,18 @@ version=2.18
 revision=1
 wrksrc="${pkgname}-r${version}"
 build_style=cmake
-configure_args="-DWITH_TESTS=OFF"
+# The current version (2.18) needs to have /usr/share/applications dir
+# for tests, xterm creates and populates it with its .desktop files,
+# which fixes tests in case the dir does not exist.
+# https://github.com/enkore/j4-dmenu-desktop/pull/123
+checkdepends="catch2 xterm"
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-DWITH_GIT_CATCH=OFF -DCATCH_INCLUDE_DIR=/usr/include/catch2"
+else
+	configure_args="-DWITH_TESTS=OFF"
+fi
+
 depends="dmenu"
 short_desc="Fast desktop menu"
 maintainer="Diogo Leal <diogo@diogoleal.com>"

Re: j4-dmenu-desktop: add support for checks

[meator]

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

New comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/31937#issuecomment-879204991

Comment:
Ok. I have removed the patch.

Re: [PR REVIEW] j4-dmenu-desktop: add support for checks

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31937#discussion_r668973494

Comment:
We  don't currently run tests for cross, but it doesn't hurt to do things correctly. Use 

```suggestion
	configure_args="-DWITH_GIT_CATCH=OFF
	 -DCATCH_INCLUDE_DIR=$XBPS_CROSS_BASE/usr/include/catch2"
```

Re: [PR REVIEW] j4-dmenu-desktop: add support for checks

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31937#discussion_r668974095

Comment:
This entire block should go after the `checksum` line, too.

And `checkdepends` goes below `depends`

Re: [PR PATCH] [Updated] j4-dmenu-desktop: add support for checks

[meator]

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

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

https://github.com/meator/void-packages j4-dmenu-desktop
https://github.com/void-linux/void-packages/pull/31937

j4-dmenu-desktop: add support for checks
The current version of tests errors out when `/usr/share/applications` does not exist. See https://github.com/enkore/j4-dmenu-desktop/pull/123

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] x86_64-musl
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-j4-dmenu-desktop-31937.patch --]
[-- Type: text/x-diff, Size: 1443 bytes --]

From 9c15a0f37f1577e3f9e821184edb725ba97bf51c Mon Sep 17 00:00:00 2001
From: meator <coder64@protonmail.com>
Date: Tue, 13 Jul 2021 08:46:44 +0200
Subject: [PATCH] j4-dmenu-desktop: add support for checks

---
 srcpkgs/j4-dmenu-desktop/template | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/j4-dmenu-desktop/template b/srcpkgs/j4-dmenu-desktop/template
index e4397c672781..711de937620c 100644
--- a/srcpkgs/j4-dmenu-desktop/template
+++ b/srcpkgs/j4-dmenu-desktop/template
@@ -4,11 +4,22 @@ version=2.18
 revision=1
 wrksrc="${pkgname}-r${version}"
 build_style=cmake
-configure_args="-DWITH_TESTS=OFF"
+# The current version (2.18) needs to have /usr/share/applications dir
+# for tests, xterm creates and populates it with its .desktop files,
+# which fixes tests in case the dir does not exist.
+# https://github.com/enkore/j4-dmenu-desktop/pull/123
 depends="dmenu"
+checkdepends="catch2 xterm"
 short_desc="Fast desktop menu"
 maintainer="Diogo Leal <diogo@diogoleal.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/enkore/j4-dmenu-desktop"
 distfiles="https://github.com/enkore/j4-dmenu-desktop/archive/r${version}.tar.gz"
 checksum=77c5605d0c1291bcf1e13b186ea3b32ddf4753de0d0e39127b4a7d2098393e25
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+	configure_args="-DWITH_GIT_CATCH=OFF
+	 -DCATCH_INCLUDE_DIR=$XBPS_CROSS_BASE/usr/include/catch2"
+else
+	configure_args="-DWITH_TESTS=OFF"
+fi

Re: [PR REVIEW] j4-dmenu-desktop: add support for checks

[meator]

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

New review comment by meator on void-packages repository

https://github.com/void-linux/void-packages/pull/31937#discussion_r669010082

Comment:
Ok, thanks!

Re: j4-dmenu-desktop: add support for checks

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31937#issuecomment-879541936

Comment:
Great, thanks!

Re: [PR PATCH] [Merged]: j4-dmenu-desktop: add support for checks

[ericonr]

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

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

j4-dmenu-desktop: add support for checks
https://github.com/void-linux/void-packages/pull/31937

Description:
The current version of tests errors out when `/usr/share/applications` does not exist. See https://github.com/enkore/j4-dmenu-desktop/pull/123

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [x] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [x] x86_64-musl
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl