[PR PATCH] wlsunset: generate man page

[PR PATCH] wlsunset: generate man page

[kkga]

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

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

https://github.com/kkga/void-packages wlsunset-manpage
https://github.com/void-linux/void-packages/pull/30566

wlsunset: generate man page
<!-- 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From b94b5a0c232537d319ee4f69593634bf6a5e470f Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Wed, 28 Apr 2021 23:55:10 +0300
Subject: [PATCH] wlsunset: generate man page

---
 srcpkgs/wlsunset/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/wlsunset/template b/srcpkgs/wlsunset/template
index 3c5cc4170a20..0cfc1f7908cf 100644
--- a/srcpkgs/wlsunset/template
+++ b/srcpkgs/wlsunset/template
@@ -3,7 +3,7 @@ pkgname=wlsunset
 version=0.2.0
 revision=1
 build_style=meson
-hostmakedepends="pkg-config wayland-devel"
+hostmakedepends="scdoc pkg-config wayland-devel"
 makedepends="pkg-config wayland-devel wayland-protocols"
 short_desc="Day/night gamma adjustments for Wayland compositors"
 maintainer="Duncaen <duncaen@voidlinux.org>"

Re: wlsunset: generate man page

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30566#issuecomment-828780964

Comment:
You need to increase the revision so it gets rebuilt.

Re: [PR PATCH] [Updated] wlsunset: generate man page

[kkga]

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

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

https://github.com/kkga/void-packages wlsunset-manpage
https://github.com/void-linux/void-packages/pull/30566

wlsunset: generate man page
<!-- 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 9e44a640dbd0690dc40021c81f1962f16f264b63 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Wed, 28 Apr 2021 23:55:10 +0300
Subject: [PATCH] wlsunset: generate man page

---
 srcpkgs/wlsunset/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wlsunset/template b/srcpkgs/wlsunset/template
index 3c5cc4170a20..984ee8cbfc67 100644
--- a/srcpkgs/wlsunset/template
+++ b/srcpkgs/wlsunset/template
@@ -1,9 +1,9 @@
 # Template file for 'wlsunset'
 pkgname=wlsunset
 version=0.2.0
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="pkg-config wayland-devel"
+hostmakedepends="scdoc pkg-config wayland-devel"
 makedepends="pkg-config wayland-devel wayland-protocols"
 short_desc="Day/night gamma adjustments for Wayland compositors"
 maintainer="Duncaen <duncaen@voidlinux.org>"

Re: wlsunset: generate man page

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30566#issuecomment-828790781

Comment:
Ah, this isn't great... It isn't being picked up for cross builds.

```
 Files of wlsunset:
/usr/bin/wlsunset
/usr/share/licenses/wlsunset/LICENSE
```

Re: wlsunset: generate man page

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30566#issuecomment-830270402

Comment:
@kkga please import this patch https://git.sr.ht/~kennylevinsen/wlsunset/commit/7be432057f268fff6e68928f3c3f3b4b70d67368

Re: [PR PATCH] [Updated] wlsunset: generate man page

[kkga]

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

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

https://github.com/kkga/void-packages wlsunset-manpage
https://github.com/void-linux/void-packages/pull/30566

wlsunset: generate man page
<!-- 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 388c214ef1b1345a129e0c189192b8cf510eab61 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Wed, 28 Apr 2021 23:55:10 +0300
Subject: [PATCH] wlsunset: generate man page

---
 srcpkgs/wlsunset/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/wlsunset/template b/srcpkgs/wlsunset/template
index 3c5cc4170a20..984ee8cbfc67 100644
--- a/srcpkgs/wlsunset/template
+++ b/srcpkgs/wlsunset/template
@@ -1,9 +1,9 @@
 # Template file for 'wlsunset'
 pkgname=wlsunset
 version=0.2.0
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="pkg-config wayland-devel"
+hostmakedepends="scdoc pkg-config wayland-devel"
 makedepends="pkg-config wayland-devel wayland-protocols"
 short_desc="Day/night gamma adjustments for Wayland compositors"
 maintainer="Duncaen <duncaen@voidlinux.org>"

Re: [PR PATCH] [Updated] wlsunset: generate man page

[kkga]

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

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

https://github.com/kkga/void-packages wlsunset-manpage
https://github.com/void-linux/void-packages/pull/30566

wlsunset: generate man page
<!-- 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From bd6e95d6a8e62816b8861376cc314298840064fe Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Wed, 28 Apr 2021 23:55:10 +0300
Subject: [PATCH] wlsunset: generate man page

---
 .../patches/fix-scdoc-cross-compiling.patch   | 55 +++++++++++++++++++
 srcpkgs/wlsunset/template                     |  4 +-
 2 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch

diff --git a/srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch b/srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch
new file mode 100644
index 000000000000..f9189f0e700d
--- /dev/null
+++ b/srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch
@@ -0,0 +1,55 @@
+From 7be432057f268fff6e68928f3c3f3b4b70d67368 Mon Sep 17 00:00:00 2001
+From: Kenny Levinsen <kl@kl.wtf>
+Date: Fri, 30 Apr 2021 20:02:02 +0200
+Subject: [PATCH] meson: Copy seatd's scdoc handling
+
+This fixes cross-compiling, and avoids unnecessary search for a shell.
+---
+ meson.build | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 23d24c5..9a02caf 100644
+--- a/meson.build
++++ b/meson.build
+@@ -3,7 +3,7 @@ project(
+ 	'c',
+ 	version: '0.2.0',
+ 	license: 'MIT',
+-	meson_version: '>=0.53.0',
++	meson_version: '>=0.56.0',
+ 	default_options: [
+ 		'c_std=c11',
+ 		'warning_level=3',
+@@ -56,16 +56,13 @@ executable(
+ 	install: true,
+ )
+ 
+-scdoc = dependency('scdoc', required: get_option('man-pages'), version: '>= 1.9.7')
++scdoc = dependency('scdoc', required: get_option('man-pages'), version: '>= 1.9.7', native: true)
+ 
+ if scdoc.found()
+-	sh = find_program('sh')
+-
+-	man_pages = ['wlsunset.1.scd']
+-
++	scdoc_prog = find_program(scdoc.get_variable(pkgconfig: 'scdoc'), native: true)
+ 	mandir = get_option('mandir')
+ 
+-	foreach src : man_pages
++	foreach src : ['wlsunset.1.scd']
+ 		topic = src.split('.')[0]
+ 		section = src.split('.')[1]
+ 		output = '@0@.@1@'.format(topic, section)
+@@ -75,7 +72,7 @@ if scdoc.found()
+ 			input: src,
+ 			output: output,
+ 			command: [
+-				sh, '-c', '@0@ < @INPUT@ > @1@'.format(scdoc.get_pkgconfig_variable('scdoc'), output)
++				'sh', '-c', '@0@ < @INPUT@ > @1@'.format(scdoc_prog.full_path(), output)
+ 			],
+ 			install: true,
+ 			install_dir: '@0@/man@1@'.format(mandir, section)
+-- 
+2.30.2
+
diff --git a/srcpkgs/wlsunset/template b/srcpkgs/wlsunset/template
index 3c5cc4170a20..984ee8cbfc67 100644
--- a/srcpkgs/wlsunset/template
+++ b/srcpkgs/wlsunset/template
@@ -1,9 +1,9 @@
 # Template file for 'wlsunset'
 pkgname=wlsunset
 version=0.2.0
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="pkg-config wayland-devel"
+hostmakedepends="scdoc pkg-config wayland-devel"
 makedepends="pkg-config wayland-devel wayland-protocols"
 short_desc="Day/night gamma adjustments for Wayland compositors"
 maintainer="Duncaen <duncaen@voidlinux.org>"

Re: wlsunset: generate man page

[kkga]

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

New comment by kkga on void-packages repository

https://github.com/void-linux/void-packages/pull/30566#issuecomment-830360043

Comment:
@ericonr Added the patch, but looks like it's failing to build :/

Re: wlsunset: generate man page

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/30566#issuecomment-830406342

Comment:
It's failing to apply the patch, add `patch_args=-Np1` to the template.

Re: [PR PATCH] [Updated] wlsunset: generate man page

[kkga]

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

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

https://github.com/kkga/void-packages wlsunset-manpage
https://github.com/void-linux/void-packages/pull/30566

wlsunset: generate man page
<!-- 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


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

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

From 4d4c50e9b4e60109d85bc807b2a48d629221ca18 Mon Sep 17 00:00:00 2001
From: Gadzhi Kharkharov <me@kkga.me>
Date: Wed, 28 Apr 2021 23:55:10 +0300
Subject: [PATCH] wlsunset: generate man page

---
 .../patches/fix-scdoc-cross-compiling.patch   | 55 +++++++++++++++++++
 srcpkgs/wlsunset/template                     |  5 +-
 2 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch

diff --git a/srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch b/srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch
new file mode 100644
index 000000000000..f9189f0e700d
--- /dev/null
+++ b/srcpkgs/wlsunset/patches/fix-scdoc-cross-compiling.patch
@@ -0,0 +1,55 @@
+From 7be432057f268fff6e68928f3c3f3b4b70d67368 Mon Sep 17 00:00:00 2001
+From: Kenny Levinsen <kl@kl.wtf>
+Date: Fri, 30 Apr 2021 20:02:02 +0200
+Subject: [PATCH] meson: Copy seatd's scdoc handling
+
+This fixes cross-compiling, and avoids unnecessary search for a shell.
+---
+ meson.build | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 23d24c5..9a02caf 100644
+--- a/meson.build
++++ b/meson.build
+@@ -3,7 +3,7 @@ project(
+ 	'c',
+ 	version: '0.2.0',
+ 	license: 'MIT',
+-	meson_version: '>=0.53.0',
++	meson_version: '>=0.56.0',
+ 	default_options: [
+ 		'c_std=c11',
+ 		'warning_level=3',
+@@ -56,16 +56,13 @@ executable(
+ 	install: true,
+ )
+ 
+-scdoc = dependency('scdoc', required: get_option('man-pages'), version: '>= 1.9.7')
++scdoc = dependency('scdoc', required: get_option('man-pages'), version: '>= 1.9.7', native: true)
+ 
+ if scdoc.found()
+-	sh = find_program('sh')
+-
+-	man_pages = ['wlsunset.1.scd']
+-
++	scdoc_prog = find_program(scdoc.get_variable(pkgconfig: 'scdoc'), native: true)
+ 	mandir = get_option('mandir')
+ 
+-	foreach src : man_pages
++	foreach src : ['wlsunset.1.scd']
+ 		topic = src.split('.')[0]
+ 		section = src.split('.')[1]
+ 		output = '@0@.@1@'.format(topic, section)
+@@ -75,7 +72,7 @@ if scdoc.found()
+ 			input: src,
+ 			output: output,
+ 			command: [
+-				sh, '-c', '@0@ < @INPUT@ > @1@'.format(scdoc.get_pkgconfig_variable('scdoc'), output)
++				'sh', '-c', '@0@ < @INPUT@ > @1@'.format(scdoc_prog.full_path(), output)
+ 			],
+ 			install: true,
+ 			install_dir: '@0@/man@1@'.format(mandir, section)
+-- 
+2.30.2
+
diff --git a/srcpkgs/wlsunset/template b/srcpkgs/wlsunset/template
index 3c5cc4170a20..5ec0aa3d8c45 100644
--- a/srcpkgs/wlsunset/template
+++ b/srcpkgs/wlsunset/template
@@ -1,9 +1,9 @@
 # Template file for 'wlsunset'
 pkgname=wlsunset
 version=0.2.0
-revision=1
+revision=2
 build_style=meson
-hostmakedepends="pkg-config wayland-devel"
+hostmakedepends="scdoc pkg-config wayland-devel"
 makedepends="pkg-config wayland-devel wayland-protocols"
 short_desc="Day/night gamma adjustments for Wayland compositors"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -11,6 +11,7 @@ license="MIT"
 homepage="https://sr.ht/~kennylevinsen/wlsunset/"
 distfiles="https://git.sr.ht/~kennylevinsen/wlsunset/archive/${version}.tar.gz"
 checksum=88bce695722a09d79545f14d404cc0659f7176bb08d5db5f4f23228b6ba8bb03
+patch_args=-Np1
 
 post_install() {
 	vlicense LICENSE

Re: wlsunset: generate man page

[kkga]

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

New comment by kkga on void-packages repository

https://github.com/void-linux/void-packages/pull/30566#issuecomment-830579912

Comment:
Thanks!

Looks to be good now...
```
Installing wlsunset to /destdir//wlsunset-0.2.0/usr/bin
Installing wlsunset.1 to /destdir//wlsunset-0.2.0/usr/share/man/man1
```

Re: [PR PATCH] [Merged]: wlsunset: generate man page

[ericonr]

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

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

wlsunset: generate man page
https://github.com/void-linux/void-packages/pull/30566

Description:
<!-- 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.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->