Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] j4-dmenu-desktop: add support for checks
@ 2021-07-13  7:28 meator
  2021-07-13 13:35 ` ericonr
                   ` (13 more replies)
  0 siblings, 14 replies; 15+ messages in thread
From: meator @ 2021-07-13  7:28 UTC (permalink / raw)
  To: ml

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

^ permalink raw reply	[flat|nested] 15+ messages in thread
end of thread, other threads:[~2021-07-14  2:44 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-13  7:28 [PR PATCH] j4-dmenu-desktop: add support for checks meator
2021-07-13 13:35 ` ericonr
2021-07-13 13:41 ` meator
2021-07-13 13:43 ` ericonr
2021-07-13 13:44 ` ericonr
2021-07-13 13:59 ` meator
2021-07-13 15:11 ` ericonr
2021-07-13 15:50 ` [PR PATCH] [Updated] " meator
2021-07-13 15:52 ` meator
2021-07-13 17:31 ` [PR REVIEW] " ericonr
2021-07-13 17:32 ` ericonr
2021-07-13 18:25 ` [PR PATCH] [Updated] " meator
2021-07-13 18:25 ` [PR REVIEW] " meator
2021-07-14  2:44 ` ericonr
2021-07-14  2:44 ` [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).