* [PR PATCH] New Package: walld-1.4.1
@ 2022-07-09 4:14 Dotz0cat
2022-07-09 4:17 ` [PR REVIEW] " classabbyamp
` (16 more replies)
0 siblings, 17 replies; 18+ messages in thread
From: Dotz0cat @ 2022-07-09 4:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1173 bytes --]
There is a new pull request by Dotz0cat against master on the void-packages repository
https://github.com/Dotz0cat/void-packages master
https://github.com/void-linux/void-packages/pull/37933
New Package: walld-1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (amd64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- i686
A patch file from https://github.com/void-linux/void-packages/pull/37933.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37933.patch --]
[-- Type: text/x-diff, Size: 1042 bytes --]
From b26fa6c5b4ea354351c9743d4936df4dd1c25940 Mon Sep 17 00:00:00 2001
From: Dotz0cat <Dotz0cat@gmail.com>
Date: Fri, 8 Jul 2022 22:47:01 -0500
Subject: [PATCH] New Package: walld-1.4.1
---
srcpkgs/walld/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/walld/template
diff --git a/srcpkgs/walld/template b/srcpkgs/walld/template
new file mode 100644
index 000000000000..56ceb25bbdf4
--- /dev/null
+++ b/srcpkgs/walld/template
@@ -0,0 +1,15 @@
+# Template file for 'walld'
+pkgname=walld
+version=1.4.1
+revision=1
+archs="i686 x86_64"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="libconfig-devel libevent-devel libmagick-devel"
+depends="feh"
+short_desc="Wallpapper daemon"
+maintainer="Dotz0cat <Dotz0cat@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://github.com/Dotz0cat/walld"
+distfiles="https://github.com/Dotz0cat/walld/archive/refs/tags/${version}.tar.gz>${pkgname}-${version}.tar.gz"
+checksum="c13b94a680081cec8ae8bff21c3e52d9e4c70a7c506de0ff17d7c76b83ad883e"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] New Package: walld-1.4.1
2022-07-09 4:14 [PR PATCH] New Package: walld-1.4.1 Dotz0cat
2022-07-09 4:17 ` [PR REVIEW] " classabbyamp
2022-07-09 4:17 ` classabbyamp
@ 2022-07-09 4:17 ` classabbyamp
2022-07-09 4:34 ` Dotz0cat
` (13 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: classabbyamp @ 2022-07-09 4:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/37933#discussion_r917218519
Comment:
this will probably build on all arches, let's drop the restriction for now
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] New Package: walld-1.4.1
2022-07-09 4:14 [PR PATCH] New Package: walld-1.4.1 Dotz0cat
@ 2022-07-09 4:17 ` classabbyamp
2022-07-09 4:17 ` classabbyamp
` (15 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: classabbyamp @ 2022-07-09 4:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/37933#discussion_r917218451
Comment:
typo? (papper)
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] New Package: walld-1.4.1
2022-07-09 4:14 [PR PATCH] New Package: walld-1.4.1 Dotz0cat
2022-07-09 4:17 ` [PR REVIEW] " classabbyamp
@ 2022-07-09 4:17 ` classabbyamp
2022-07-09 4:17 ` classabbyamp
` (14 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: classabbyamp @ 2022-07-09 4:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 288 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/37933#discussion_r917218407
Comment:
```suggestion
distfiles="https://github.com/Dotz0cat/walld/archive/refs/tags/${version}.tar.gz"
```
should work fine without renaming
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] New Package: walld-1.4.1
2022-07-09 4:14 [PR PATCH] New Package: walld-1.4.1 Dotz0cat
` (2 preceding siblings ...)
2022-07-09 4:17 ` classabbyamp
@ 2022-07-09 4:34 ` Dotz0cat
2022-07-09 4:37 ` [PR PATCH] [Updated] " Dotz0cat
` (12 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Dotz0cat @ 2022-07-09 4:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New review comment by Dotz0cat on void-packages repository
https://github.com/void-linux/void-packages/pull/37933#discussion_r917220005
Comment:
It should on all glibc arches. So I will set it as ~*-musl
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] New Package: walld-1.4.1
2022-07-09 4:14 [PR PATCH] New Package: walld-1.4.1 Dotz0cat
` (3 preceding siblings ...)
2022-07-09 4:34 ` Dotz0cat
@ 2022-07-09 4:37 ` Dotz0cat
2022-07-09 8:50 ` [PR REVIEW] " paper42
` (11 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Dotz0cat @ 2022-07-09 4:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]
There is an updated pull request by Dotz0cat against master on the void-packages repository
https://github.com/Dotz0cat/void-packages master
https://github.com/void-linux/void-packages/pull/37933
New Package: walld-1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (amd64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- i686
A patch file from https://github.com/void-linux/void-packages/pull/37933.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37933.patch --]
[-- Type: text/x-diff, Size: 1008 bytes --]
From 23cd168f96bd35d39a3a39fc1daba74e67ae281e Mon Sep 17 00:00:00 2001
From: Dotz0cat <Dotz0cat@gmail.com>
Date: Fri, 8 Jul 2022 22:47:01 -0500
Subject: [PATCH] New Package: walld-1.4.1
---
srcpkgs/walld/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/walld/template
diff --git a/srcpkgs/walld/template b/srcpkgs/walld/template
new file mode 100644
index 000000000000..b5bd7d779014
--- /dev/null
+++ b/srcpkgs/walld/template
@@ -0,0 +1,15 @@
+# Template file for 'walld'
+pkgname=walld
+version=1.4.1
+revision=1
+archs="~*-musl"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="libconfig-devel libevent-devel libmagick-devel"
+depends="feh"
+short_desc="Wallpaper daemon"
+maintainer="Dotz0cat <Dotz0cat@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://github.com/Dotz0cat/walld"
+distfiles="https://github.com/Dotz0cat/walld/archive/refs/tags/${version}.tar.gz"
+checksum="c13b94a680081cec8ae8bff21c3e52d9e4c70a7c506de0ff17d7c76b83ad883e"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] New Package: walld-1.4.1
2022-07-09 4:14 [PR PATCH] New Package: walld-1.4.1 Dotz0cat
` (4 preceding siblings ...)
2022-07-09 4:37 ` [PR PATCH] [Updated] " Dotz0cat
@ 2022-07-09 8:50 ` paper42
2022-07-10 0:30 ` [PR PATCH] [Updated] " Dotz0cat
` (10 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: paper42 @ 2022-07-09 8:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 230 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/37933#discussion_r917244226
Comment:
Why does it not build on musl? That should be fixed with a patch and sent upstream.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] New Package: walld-1.4.1
2022-07-09 4:14 [PR PATCH] New Package: walld-1.4.1 Dotz0cat
` (5 preceding siblings ...)
2022-07-09 8:50 ` [PR REVIEW] " paper42
@ 2022-07-10 0:30 ` Dotz0cat
2022-07-10 0:32 ` Dotz0cat
` (9 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Dotz0cat @ 2022-07-10 0:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]
There is an updated pull request by Dotz0cat against master on the void-packages repository
https://github.com/Dotz0cat/void-packages master
https://github.com/void-linux/void-packages/pull/37933
New Package: walld-1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (amd64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- i686
A patch file from https://github.com/void-linux/void-packages/pull/37933.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37933.patch --]
[-- Type: text/x-diff, Size: 2780 bytes --]
From 39c0db8b1e7aae467f09bde73f176293f2f87bf5 Mon Sep 17 00:00:00 2001
From: Dotz0cat <Dotz0cat@gmail.com>
Date: Fri, 8 Jul 2022 22:47:01 -0500
Subject: [PATCH] New Package: walld-1.4.1
---
srcpkgs/walld/patches/fix-musl.patch | 67 ++++++++++++++++++++++++++++
srcpkgs/walld/template | 15 +++++++
2 files changed, 82 insertions(+)
create mode 100755 srcpkgs/walld/patches/fix-musl.patch
create mode 100644 srcpkgs/walld/template
diff --git a/srcpkgs/walld/patches/fix-musl.patch b/srcpkgs/walld/patches/fix-musl.patch
new file mode 100755
index 000000000000..57a87d0d282a
--- /dev/null
+++ b/srcpkgs/walld/patches/fix-musl.patch
@@ -0,0 +1,67 @@
+From b85741372fea0af6be79a6f40fda2da9cf985f5f Mon Sep 17 00:00:00 2001
+From: Dotz0cat <Dotz0cat@gmail.com>
+Date: Sat, 9 Jul 2022 17:19:52 -0500
+Subject: [PATCH] void fix musl
+
+---
+ src/main.c | 44 ++++----------------------------------------
+ 1 file changed, 4 insertions(+), 40 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index 3a13829..b062efa 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -146,46 +146,10 @@ static void init_daemon(const char* home_dir) {
+ close(x);
+ }
+
+- int char_count = snprintf(NULL, 0, "%s%s", home_dir, "/.walld/log");
+-
+- if (char_count <= 0) {
+- abort();
+- }
+-
+- char* log_file = malloc(char_count + 1U);
+-
+- if (log_file == NULL) {
+- abort();
+- }
+-
+- snprintf(log_file, char_count + 1U, "%s%s", home_dir, "/.walld/log");
+-
+- stdin = fopen("/dev/null", "r");
+- stdout = fopen(log_file, "w");
+-
+- free(log_file);
+-
+- char_count = 0;
+-
+- char_count = snprintf(NULL, 0, "%s%s", home_dir, "/.walld/error-log");
+-
+- if (char_count <= 0) {
+- abort();
+- }
+-
+- char* err_log_file = malloc(char_count + 1U);
+-
+- if (err_log_file == NULL) {
+- abort();
+- }
+-
+- snprintf(err_log_file, char_count + 1U, "%s%s", home_dir, "/.walld/error-log");
+-
+-
+- stderr = fopen(err_log_file, "w");
+-
+- free(err_log_file);
+-
++ fclose(stdin);
++ fclose(stdout);
++ fclose(stderr);
++
+ openlog("walld", LOG_PID, LOG_DAEMON);
+ }
+
+--
+2.37.0
+
diff --git a/srcpkgs/walld/template b/srcpkgs/walld/template
new file mode 100644
index 000000000000..b5bd7d779014
--- /dev/null
+++ b/srcpkgs/walld/template
@@ -0,0 +1,15 @@
+# Template file for 'walld'
+pkgname=walld
+version=1.4.1
+revision=1
+archs="~*-musl"
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="libconfig-devel libevent-devel libmagick-devel"
+depends="feh"
+short_desc="Wallpaper daemon"
+maintainer="Dotz0cat <Dotz0cat@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://github.com/Dotz0cat/walld"
+distfiles="https://github.com/Dotz0cat/walld/archive/refs/tags/${version}.tar.gz"
+checksum="c13b94a680081cec8ae8bff21c3e52d9e4c70a7c506de0ff17d7c76b83ad883e"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] New Package: walld-1.4.1
2022-07-09 4:14 [PR PATCH] New Package: walld-1.4.1 Dotz0cat
` (6 preceding siblings ...)
2022-07-10 0:30 ` [PR PATCH] [Updated] " Dotz0cat
@ 2022-07-10 0:32 ` Dotz0cat
2022-07-10 0:36 ` [PR REVIEW] " Dotz0cat
` (8 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Dotz0cat @ 2022-07-10 0:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]
There is an updated pull request by Dotz0cat against master on the void-packages repository
https://github.com/Dotz0cat/void-packages master
https://github.com/void-linux/void-packages/pull/37933
New Package: walld-1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (amd64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- i686
A patch file from https://github.com/void-linux/void-packages/pull/37933.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37933.patch --]
[-- Type: text/x-diff, Size: 2762 bytes --]
From 3b9945e9c3ac45d7e7377661b97cd4702ce7c7cf Mon Sep 17 00:00:00 2001
From: Dotz0cat <Dotz0cat@gmail.com>
Date: Fri, 8 Jul 2022 22:47:01 -0500
Subject: [PATCH] New Package: walld-1.4.1
---
srcpkgs/walld/patches/fix-musl.patch | 67 ++++++++++++++++++++++++++++
srcpkgs/walld/template | 14 ++++++
2 files changed, 81 insertions(+)
create mode 100755 srcpkgs/walld/patches/fix-musl.patch
create mode 100644 srcpkgs/walld/template
diff --git a/srcpkgs/walld/patches/fix-musl.patch b/srcpkgs/walld/patches/fix-musl.patch
new file mode 100755
index 000000000000..57a87d0d282a
--- /dev/null
+++ b/srcpkgs/walld/patches/fix-musl.patch
@@ -0,0 +1,67 @@
+From b85741372fea0af6be79a6f40fda2da9cf985f5f Mon Sep 17 00:00:00 2001
+From: Dotz0cat <Dotz0cat@gmail.com>
+Date: Sat, 9 Jul 2022 17:19:52 -0500
+Subject: [PATCH] void fix musl
+
+---
+ src/main.c | 44 ++++----------------------------------------
+ 1 file changed, 4 insertions(+), 40 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index 3a13829..b062efa 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -146,46 +146,10 @@ static void init_daemon(const char* home_dir) {
+ close(x);
+ }
+
+- int char_count = snprintf(NULL, 0, "%s%s", home_dir, "/.walld/log");
+-
+- if (char_count <= 0) {
+- abort();
+- }
+-
+- char* log_file = malloc(char_count + 1U);
+-
+- if (log_file == NULL) {
+- abort();
+- }
+-
+- snprintf(log_file, char_count + 1U, "%s%s", home_dir, "/.walld/log");
+-
+- stdin = fopen("/dev/null", "r");
+- stdout = fopen(log_file, "w");
+-
+- free(log_file);
+-
+- char_count = 0;
+-
+- char_count = snprintf(NULL, 0, "%s%s", home_dir, "/.walld/error-log");
+-
+- if (char_count <= 0) {
+- abort();
+- }
+-
+- char* err_log_file = malloc(char_count + 1U);
+-
+- if (err_log_file == NULL) {
+- abort();
+- }
+-
+- snprintf(err_log_file, char_count + 1U, "%s%s", home_dir, "/.walld/error-log");
+-
+-
+- stderr = fopen(err_log_file, "w");
+-
+- free(err_log_file);
+-
++ fclose(stdin);
++ fclose(stdout);
++ fclose(stderr);
++
+ openlog("walld", LOG_PID, LOG_DAEMON);
+ }
+
+--
+2.37.0
+
diff --git a/srcpkgs/walld/template b/srcpkgs/walld/template
new file mode 100644
index 000000000000..c2687a07fad1
--- /dev/null
+++ b/srcpkgs/walld/template
@@ -0,0 +1,14 @@
+# Template file for 'walld'
+pkgname=walld
+version=1.4.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="libconfig-devel libevent-devel libmagick-devel"
+depends="feh"
+short_desc="Wallpaper daemon"
+maintainer="Dotz0cat <Dotz0cat@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://github.com/Dotz0cat/walld"
+distfiles="https://github.com/Dotz0cat/walld/archive/refs/tags/${version}.tar.gz"
+checksum="c13b94a680081cec8ae8bff21c3e52d9e4c70a7c506de0ff17d7c76b83ad883e"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] New Package: walld-1.4.1
2022-07-09 4:14 [PR PATCH] New Package: walld-1.4.1 Dotz0cat
` (7 preceding siblings ...)
2022-07-10 0:32 ` Dotz0cat
@ 2022-07-10 0:36 ` Dotz0cat
2022-07-11 20:46 ` paper42
` (7 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Dotz0cat @ 2022-07-10 0:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 267 bytes --]
New review comment by Dotz0cat on void-packages repository
https://github.com/void-linux/void-packages/pull/37933#discussion_r917322799
Comment:
It reassigned stdin, stdout, and stderr. There is a patch that just closes them. It will be included in upstream 1.4.2.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] New Package: walld-1.4.1
2022-07-09 4:14 [PR PATCH] New Package: walld-1.4.1 Dotz0cat
` (8 preceding siblings ...)
2022-07-10 0:36 ` [PR REVIEW] " Dotz0cat
@ 2022-07-11 20:46 ` paper42
2022-07-11 20:46 ` paper42
` (6 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: paper42 @ 2022-07-11 20:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 614 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/37933#discussion_r918335923
Comment:
Why did you just delete part of the program? Fix it properly
```
../src/main.c:163:8: error: assignment of read-only variable 'stdin'
163 | stdin = fopen("/dev/null", "r");
| ^
../src/main.c:164:9: error: assignment of read-only variable 'stdout'
164 | stdout = fopen(log_file, "w");
| ^
../src/main.c:185:9: error: assignment of read-only variable 'stderr'
185 | stderr = fopen(err_log_file, "w");
| ^
```
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] New Package: walld-1.4.1
2022-07-09 4:14 [PR PATCH] New Package: walld-1.4.1 Dotz0cat
` (9 preceding siblings ...)
2022-07-11 20:46 ` paper42
@ 2022-07-11 20:46 ` paper42
2022-07-11 20:46 ` paper42
` (5 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: paper42 @ 2022-07-11 20:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 641 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/37933#discussion_r918335923
Comment:
Why did you just delete part of the program? Fix it properly and send the fix upstream.
```
../src/main.c:163:8: error: assignment of read-only variable 'stdin'
163 | stdin = fopen("/dev/null", "r");
| ^
../src/main.c:164:9: error: assignment of read-only variable 'stdout'
164 | stdout = fopen(log_file, "w");
| ^
../src/main.c:185:9: error: assignment of read-only variable 'stderr'
185 | stderr = fopen(err_log_file, "w");
| ^
```
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] New Package: walld-1.4.1
2022-07-09 4:14 [PR PATCH] New Package: walld-1.4.1 Dotz0cat
` (10 preceding siblings ...)
2022-07-11 20:46 ` paper42
@ 2022-07-11 20:46 ` paper42
2022-07-11 20:59 ` paper42
` (4 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: paper42 @ 2022-07-11 20:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 642 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/37933#discussion_r918335923
Comment:
Why did you just delete part of the program? Fix it properly and apply the fix upstream.
```
../src/main.c:163:8: error: assignment of read-only variable 'stdin'
163 | stdin = fopen("/dev/null", "r");
| ^
../src/main.c:164:9: error: assignment of read-only variable 'stdout'
164 | stdout = fopen(log_file, "w");
| ^
../src/main.c:185:9: error: assignment of read-only variable 'stderr'
185 | stderr = fopen(err_log_file, "w");
| ^
```
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: New Package: walld-1.4.1
2022-07-09 4:14 [PR PATCH] New Package: walld-1.4.1 Dotz0cat
` (11 preceding siblings ...)
2022-07-11 20:46 ` paper42
@ 2022-07-11 20:59 ` paper42
2022-08-13 17:28 ` [PR PATCH] [Updated] " Dotz0cat
` (3 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: paper42 @ 2022-07-11 20:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 425 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/37933#issuecomment-1180864581
Comment:
I see this is your project, noone else requested this package and it only has 13 stars. Every package increases the maintenance effort needed by void maintainers and I think this one is just not worth it if noone is going to use it. Sorry, but this package is getting a NACK from me.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] New Package: walld-1.4.1
2022-07-09 4:14 [PR PATCH] New Package: walld-1.4.1 Dotz0cat
` (12 preceding siblings ...)
2022-07-11 20:59 ` paper42
@ 2022-08-13 17:28 ` Dotz0cat
2022-08-13 18:09 ` Dotz0cat
` (2 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: Dotz0cat @ 2022-08-13 17:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]
There is an updated pull request by Dotz0cat against master on the void-packages repository
https://github.com/Dotz0cat/void-packages master
https://github.com/void-linux/void-packages/pull/37933
New Package: walld-1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (amd64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- i686
A patch file from https://github.com/void-linux/void-packages/pull/37933.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37933.patch --]
[-- Type: text/x-diff, Size: 5136 bytes --]
From 3b9945e9c3ac45d7e7377661b97cd4702ce7c7cf Mon Sep 17 00:00:00 2001
From: Dotz0cat <Dotz0cat@gmail.com>
Date: Fri, 8 Jul 2022 22:47:01 -0500
Subject: [PATCH 1/2] New Package: walld-1.4.1
---
srcpkgs/walld/patches/fix-musl.patch | 67 ++++++++++++++++++++++++++++
srcpkgs/walld/template | 14 ++++++
2 files changed, 81 insertions(+)
create mode 100755 srcpkgs/walld/patches/fix-musl.patch
create mode 100644 srcpkgs/walld/template
diff --git a/srcpkgs/walld/patches/fix-musl.patch b/srcpkgs/walld/patches/fix-musl.patch
new file mode 100755
index 000000000000..57a87d0d282a
--- /dev/null
+++ b/srcpkgs/walld/patches/fix-musl.patch
@@ -0,0 +1,67 @@
+From b85741372fea0af6be79a6f40fda2da9cf985f5f Mon Sep 17 00:00:00 2001
+From: Dotz0cat <Dotz0cat@gmail.com>
+Date: Sat, 9 Jul 2022 17:19:52 -0500
+Subject: [PATCH] void fix musl
+
+---
+ src/main.c | 44 ++++----------------------------------------
+ 1 file changed, 4 insertions(+), 40 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index 3a13829..b062efa 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -146,46 +146,10 @@ static void init_daemon(const char* home_dir) {
+ close(x);
+ }
+
+- int char_count = snprintf(NULL, 0, "%s%s", home_dir, "/.walld/log");
+-
+- if (char_count <= 0) {
+- abort();
+- }
+-
+- char* log_file = malloc(char_count + 1U);
+-
+- if (log_file == NULL) {
+- abort();
+- }
+-
+- snprintf(log_file, char_count + 1U, "%s%s", home_dir, "/.walld/log");
+-
+- stdin = fopen("/dev/null", "r");
+- stdout = fopen(log_file, "w");
+-
+- free(log_file);
+-
+- char_count = 0;
+-
+- char_count = snprintf(NULL, 0, "%s%s", home_dir, "/.walld/error-log");
+-
+- if (char_count <= 0) {
+- abort();
+- }
+-
+- char* err_log_file = malloc(char_count + 1U);
+-
+- if (err_log_file == NULL) {
+- abort();
+- }
+-
+- snprintf(err_log_file, char_count + 1U, "%s%s", home_dir, "/.walld/error-log");
+-
+-
+- stderr = fopen(err_log_file, "w");
+-
+- free(err_log_file);
+-
++ fclose(stdin);
++ fclose(stdout);
++ fclose(stderr);
++
+ openlog("walld", LOG_PID, LOG_DAEMON);
+ }
+
+--
+2.37.0
+
diff --git a/srcpkgs/walld/template b/srcpkgs/walld/template
new file mode 100644
index 000000000000..c2687a07fad1
--- /dev/null
+++ b/srcpkgs/walld/template
@@ -0,0 +1,14 @@
+# Template file for 'walld'
+pkgname=walld
+version=1.4.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="libconfig-devel libevent-devel libmagick-devel"
+depends="feh"
+short_desc="Wallpaper daemon"
+maintainer="Dotz0cat <Dotz0cat@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://github.com/Dotz0cat/walld"
+distfiles="https://github.com/Dotz0cat/walld/archive/refs/tags/${version}.tar.gz"
+checksum="c13b94a680081cec8ae8bff21c3e52d9e4c70a7c506de0ff17d7c76b83ad883e"
From 2bfca5c120b570aa2c456e67bfc6a077bc35900d Mon Sep 17 00:00:00 2001
From: Dotz0cat <Dotz0cat@gmail.com>
Date: Sat, 13 Aug 2022 12:27:47 -0500
Subject: [PATCH 2/2] add 1.4.4; drop 1.4.1
---
srcpkgs/walld/patches/fix-musl.patch | 67 ----------------------------
srcpkgs/walld/template | 2 +-
2 files changed, 1 insertion(+), 68 deletions(-)
delete mode 100755 srcpkgs/walld/patches/fix-musl.patch
diff --git a/srcpkgs/walld/patches/fix-musl.patch b/srcpkgs/walld/patches/fix-musl.patch
deleted file mode 100755
index 57a87d0d282a..000000000000
--- a/srcpkgs/walld/patches/fix-musl.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From b85741372fea0af6be79a6f40fda2da9cf985f5f Mon Sep 17 00:00:00 2001
-From: Dotz0cat <Dotz0cat@gmail.com>
-Date: Sat, 9 Jul 2022 17:19:52 -0500
-Subject: [PATCH] void fix musl
-
----
- src/main.c | 44 ++++----------------------------------------
- 1 file changed, 4 insertions(+), 40 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index 3a13829..b062efa 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -146,46 +146,10 @@ static void init_daemon(const char* home_dir) {
- close(x);
- }
-
-- int char_count = snprintf(NULL, 0, "%s%s", home_dir, "/.walld/log");
--
-- if (char_count <= 0) {
-- abort();
-- }
--
-- char* log_file = malloc(char_count + 1U);
--
-- if (log_file == NULL) {
-- abort();
-- }
--
-- snprintf(log_file, char_count + 1U, "%s%s", home_dir, "/.walld/log");
--
-- stdin = fopen("/dev/null", "r");
-- stdout = fopen(log_file, "w");
--
-- free(log_file);
--
-- char_count = 0;
--
-- char_count = snprintf(NULL, 0, "%s%s", home_dir, "/.walld/error-log");
--
-- if (char_count <= 0) {
-- abort();
-- }
--
-- char* err_log_file = malloc(char_count + 1U);
--
-- if (err_log_file == NULL) {
-- abort();
-- }
--
-- snprintf(err_log_file, char_count + 1U, "%s%s", home_dir, "/.walld/error-log");
--
--
-- stderr = fopen(err_log_file, "w");
--
-- free(err_log_file);
--
-+ fclose(stdin);
-+ fclose(stdout);
-+ fclose(stderr);
-+
- openlog("walld", LOG_PID, LOG_DAEMON);
- }
-
---
-2.37.0
-
diff --git a/srcpkgs/walld/template b/srcpkgs/walld/template
index c2687a07fad1..13abb4a15b6f 100644
--- a/srcpkgs/walld/template
+++ b/srcpkgs/walld/template
@@ -1,6 +1,6 @@
# Template file for 'walld'
pkgname=walld
-version=1.4.1
+version=1.4.4
revision=1
build_style=meson
hostmakedepends="pkg-config"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] New Package: walld-1.4.1
2022-07-09 4:14 [PR PATCH] New Package: walld-1.4.1 Dotz0cat
` (13 preceding siblings ...)
2022-08-13 17:28 ` [PR PATCH] [Updated] " Dotz0cat
@ 2022-08-13 18:09 ` Dotz0cat
2022-11-12 2:11 ` github-actions
2022-11-27 2:08 ` [PR PATCH] [Closed]: " github-actions
16 siblings, 0 replies; 18+ messages in thread
From: Dotz0cat @ 2022-08-13 18:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]
There is an updated pull request by Dotz0cat against master on the void-packages repository
https://github.com/Dotz0cat/void-packages master
https://github.com/void-linux/void-packages/pull/37933
New Package: walld-1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (amd64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- i686
A patch file from https://github.com/void-linux/void-packages/pull/37933.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37933.patch --]
[-- Type: text/x-diff, Size: 5506 bytes --]
From 3b9945e9c3ac45d7e7377661b97cd4702ce7c7cf Mon Sep 17 00:00:00 2001
From: Dotz0cat <Dotz0cat@gmail.com>
Date: Fri, 8 Jul 2022 22:47:01 -0500
Subject: [PATCH 1/2] New Package: walld-1.4.1
---
srcpkgs/walld/patches/fix-musl.patch | 67 ++++++++++++++++++++++++++++
srcpkgs/walld/template | 14 ++++++
2 files changed, 81 insertions(+)
create mode 100755 srcpkgs/walld/patches/fix-musl.patch
create mode 100644 srcpkgs/walld/template
diff --git a/srcpkgs/walld/patches/fix-musl.patch b/srcpkgs/walld/patches/fix-musl.patch
new file mode 100755
index 000000000000..57a87d0d282a
--- /dev/null
+++ b/srcpkgs/walld/patches/fix-musl.patch
@@ -0,0 +1,67 @@
+From b85741372fea0af6be79a6f40fda2da9cf985f5f Mon Sep 17 00:00:00 2001
+From: Dotz0cat <Dotz0cat@gmail.com>
+Date: Sat, 9 Jul 2022 17:19:52 -0500
+Subject: [PATCH] void fix musl
+
+---
+ src/main.c | 44 ++++----------------------------------------
+ 1 file changed, 4 insertions(+), 40 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index 3a13829..b062efa 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -146,46 +146,10 @@ static void init_daemon(const char* home_dir) {
+ close(x);
+ }
+
+- int char_count = snprintf(NULL, 0, "%s%s", home_dir, "/.walld/log");
+-
+- if (char_count <= 0) {
+- abort();
+- }
+-
+- char* log_file = malloc(char_count + 1U);
+-
+- if (log_file == NULL) {
+- abort();
+- }
+-
+- snprintf(log_file, char_count + 1U, "%s%s", home_dir, "/.walld/log");
+-
+- stdin = fopen("/dev/null", "r");
+- stdout = fopen(log_file, "w");
+-
+- free(log_file);
+-
+- char_count = 0;
+-
+- char_count = snprintf(NULL, 0, "%s%s", home_dir, "/.walld/error-log");
+-
+- if (char_count <= 0) {
+- abort();
+- }
+-
+- char* err_log_file = malloc(char_count + 1U);
+-
+- if (err_log_file == NULL) {
+- abort();
+- }
+-
+- snprintf(err_log_file, char_count + 1U, "%s%s", home_dir, "/.walld/error-log");
+-
+-
+- stderr = fopen(err_log_file, "w");
+-
+- free(err_log_file);
+-
++ fclose(stdin);
++ fclose(stdout);
++ fclose(stderr);
++
+ openlog("walld", LOG_PID, LOG_DAEMON);
+ }
+
+--
+2.37.0
+
diff --git a/srcpkgs/walld/template b/srcpkgs/walld/template
new file mode 100644
index 000000000000..c2687a07fad1
--- /dev/null
+++ b/srcpkgs/walld/template
@@ -0,0 +1,14 @@
+# Template file for 'walld'
+pkgname=walld
+version=1.4.1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="libconfig-devel libevent-devel libmagick-devel"
+depends="feh"
+short_desc="Wallpaper daemon"
+maintainer="Dotz0cat <Dotz0cat@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://github.com/Dotz0cat/walld"
+distfiles="https://github.com/Dotz0cat/walld/archive/refs/tags/${version}.tar.gz"
+checksum="c13b94a680081cec8ae8bff21c3e52d9e4c70a7c506de0ff17d7c76b83ad883e"
From 281afb8de9a58107f3e1ec6a1e69da96eca1a4ca Mon Sep 17 00:00:00 2001
From: Dotz0cat <Dotz0cat@gmail.com>
Date: Sat, 13 Aug 2022 12:27:47 -0500
Subject: [PATCH 2/2] walld: update to 1.4.4
---
srcpkgs/walld/patches/fix-musl.patch | 67 ----------------------------
srcpkgs/walld/template | 4 +-
2 files changed, 2 insertions(+), 69 deletions(-)
delete mode 100755 srcpkgs/walld/patches/fix-musl.patch
diff --git a/srcpkgs/walld/patches/fix-musl.patch b/srcpkgs/walld/patches/fix-musl.patch
deleted file mode 100755
index 57a87d0d282a..000000000000
--- a/srcpkgs/walld/patches/fix-musl.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From b85741372fea0af6be79a6f40fda2da9cf985f5f Mon Sep 17 00:00:00 2001
-From: Dotz0cat <Dotz0cat@gmail.com>
-Date: Sat, 9 Jul 2022 17:19:52 -0500
-Subject: [PATCH] void fix musl
-
----
- src/main.c | 44 ++++----------------------------------------
- 1 file changed, 4 insertions(+), 40 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index 3a13829..b062efa 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -146,46 +146,10 @@ static void init_daemon(const char* home_dir) {
- close(x);
- }
-
-- int char_count = snprintf(NULL, 0, "%s%s", home_dir, "/.walld/log");
--
-- if (char_count <= 0) {
-- abort();
-- }
--
-- char* log_file = malloc(char_count + 1U);
--
-- if (log_file == NULL) {
-- abort();
-- }
--
-- snprintf(log_file, char_count + 1U, "%s%s", home_dir, "/.walld/log");
--
-- stdin = fopen("/dev/null", "r");
-- stdout = fopen(log_file, "w");
--
-- free(log_file);
--
-- char_count = 0;
--
-- char_count = snprintf(NULL, 0, "%s%s", home_dir, "/.walld/error-log");
--
-- if (char_count <= 0) {
-- abort();
-- }
--
-- char* err_log_file = malloc(char_count + 1U);
--
-- if (err_log_file == NULL) {
-- abort();
-- }
--
-- snprintf(err_log_file, char_count + 1U, "%s%s", home_dir, "/.walld/error-log");
--
--
-- stderr = fopen(err_log_file, "w");
--
-- free(err_log_file);
--
-+ fclose(stdin);
-+ fclose(stdout);
-+ fclose(stderr);
-+
- openlog("walld", LOG_PID, LOG_DAEMON);
- }
-
---
-2.37.0
-
diff --git a/srcpkgs/walld/template b/srcpkgs/walld/template
index c2687a07fad1..874ef377a358 100644
--- a/srcpkgs/walld/template
+++ b/srcpkgs/walld/template
@@ -1,6 +1,6 @@
# Template file for 'walld'
pkgname=walld
-version=1.4.1
+version=1.4.4
revision=1
build_style=meson
hostmakedepends="pkg-config"
@@ -11,4 +11,4 @@ maintainer="Dotz0cat <Dotz0cat@gmail.com>"
license="GPL-3.0-only"
homepage="https://github.com/Dotz0cat/walld"
distfiles="https://github.com/Dotz0cat/walld/archive/refs/tags/${version}.tar.gz"
-checksum="c13b94a680081cec8ae8bff21c3e52d9e4c70a7c506de0ff17d7c76b83ad883e"
+checksum="abffb9af4cce3e7cba83364305d919088434a8b4c1863721deef0d9bb9836019"
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: New Package: walld-1.4.1
2022-07-09 4:14 [PR PATCH] New Package: walld-1.4.1 Dotz0cat
` (14 preceding siblings ...)
2022-08-13 18:09 ` Dotz0cat
@ 2022-11-12 2:11 ` github-actions
2022-11-27 2:08 ` [PR PATCH] [Closed]: " github-actions
16 siblings, 0 replies; 18+ messages in thread
From: github-actions @ 2022-11-12 2:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/37933#issuecomment-1312317978
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Closed]: New Package: walld-1.4.1
2022-07-09 4:14 [PR PATCH] New Package: walld-1.4.1 Dotz0cat
` (15 preceding siblings ...)
2022-11-12 2:11 ` github-actions
@ 2022-11-27 2:08 ` github-actions
16 siblings, 0 replies; 18+ messages in thread
From: github-actions @ 2022-11-27 2:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1021 bytes --]
There's a closed pull request on the void-packages repository
New Package: walld-1.4.1
https://github.com/void-linux/void-packages/pull/37933
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (amd64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- i686
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2022-11-27 2:08 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-09 4:14 [PR PATCH] New Package: walld-1.4.1 Dotz0cat
2022-07-09 4:17 ` [PR REVIEW] " classabbyamp
2022-07-09 4:17 ` classabbyamp
2022-07-09 4:17 ` classabbyamp
2022-07-09 4:34 ` Dotz0cat
2022-07-09 4:37 ` [PR PATCH] [Updated] " Dotz0cat
2022-07-09 8:50 ` [PR REVIEW] " paper42
2022-07-10 0:30 ` [PR PATCH] [Updated] " Dotz0cat
2022-07-10 0:32 ` Dotz0cat
2022-07-10 0:36 ` [PR REVIEW] " Dotz0cat
2022-07-11 20:46 ` paper42
2022-07-11 20:46 ` paper42
2022-07-11 20:46 ` paper42
2022-07-11 20:59 ` paper42
2022-08-13 17:28 ` [PR PATCH] [Updated] " Dotz0cat
2022-08-13 18:09 ` Dotz0cat
2022-11-12 2:11 ` github-actions
2022-11-27 2:08 ` [PR PATCH] [Closed]: " github-actions
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).