[PR PATCH] New package: nsxiv-27.1

[PR PATCH] New package: nsxiv-27.1

[WitherCubes]

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

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

https://github.com/WitherCubes/void-packages master
https://github.com/void-linux/void-packages/pull/33009

New package: nsxiv-27.1
<!-- Mark items with [x] where applicable -->

#### General
- [x] 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/33009.patch is attached

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

From f1cff3083158ae5b243c22e1510266d23117a84e Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <tsppavan7@gmail.com>
Date: Sat, 18 Sep 2021 11:48:37 +0530
Subject: [PATCH] New package: nsxiv-27.1

---
 srcpkgs/nsxiv/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/nsxiv/template

diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
new file mode 100644
index 000000000000..7b7ea373b7ce
--- /dev/null
+++ b/srcpkgs/nsxiv/template
@@ -0,0 +1,25 @@
+# Template file for 'nsxiv'
+pkgname=nsxiv
+version=27.1
+revision=1
+build_style=gnu-makefile
+makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel"
+short_desc="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
+maintainer="Sanjay Pavan <tsppavan7@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/nsxiv/nsxiv"
+distfiles="https://github.com/nsxiv/nsxiv/archive/v${version}.tar.gz"
+checksum=416247c6930d2a5ba482010a7c095fc3e6fe0fe609f2bce0049f69bebd63e00c
+
+pre_build() {
+	[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h ||:
+}
+
+post_install() {
+	vinstall nsxiv.desktop 644 usr/share/applications
+}
+
+if [ "$CROSS_BUILD" ]; then
+	# otherwise ft2build.h is not found
+	hostmakedepends+=" freetype-devel"
+fi

Re: New package: nsxiv-27.1

[WitherCubes]

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

New comment by WitherCubes on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-923503742

Comment:
Does anyone have any idea why merging this pull request takes so long?

Re: New package: nsxiv-27.1

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-923699397

Comment:
> Does anyone have any idea why merging this pull request takes so long?

New packages need to be properly reviewed and maintainers need to be at least a bit interested in maintaining the package if the original maintainer goes away. If this was just an upstream change for sxiv, it would be simpler to review, but this is a fork which changes the project name, so it needs to be a new package.

I noticed this package installs examples in /usr/share/nsxiv/exec/, but sxiv installs them in /usr/share/examples. Do you know why this change was made? Do you think we should move them to /usr/share/examples?

Re: New package: nsxiv-27.1

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-923699397

Comment:
> Does anyone have any idea why merging this pull request takes so long?

New packages need to be properly reviewed and maintainers need to be at least a bit interested in maintaining the package if the original maintainer goes away. In this case it's simpler because it this is a simple program. If this was just an upstream change for sxiv, it would be simpler to review, but this is a fork which changes the project name, so it needs to be a new package.

I noticed this package installs examples in /usr/share/nsxiv/exec/, but sxiv installs them in /usr/share/examples. Do you know why this change was made? Do you think we should move them to /usr/share/examples?

Re: New package: nsxiv-27.1

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-923699397

Comment:
> Does anyone have any idea why merging this pull request takes so long?

New packages need to be properly reviewed and maintainers need to be at least a bit interested in maintaining the package, fixing it when the build breaks or dropping it if the original maintainer goes away. In this case it's simpler because it this is a simple program. If this was just an upstream change for sxiv, it would be simpler to review, but this is a fork which changes the project name, so it needs to be a new package.

I noticed this package installs examples in /usr/share/nsxiv/exec/, but sxiv installs them in /usr/share/examples. Do you know why this change was made? Do you think we should move them to /usr/share/examples?

Re: New package: nsxiv-27.1

[WitherCubes]

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

New comment by WitherCubes on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-923900095

Comment:
Thanks for the information, I didn't think about placing the examples in /usr/share/example. It is a great idea to move them.

Re: [PR REVIEW] New package: nsxiv-27.1

[Johnnynator]

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

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#discussion_r713288915

Comment:
They do have hardcoded include path which cause the trouble

https://github.com/nsxiv/nsxiv/blob/v27.1/Makefile#L32

You can probably get around it by setting `CFLAGS="${XBPS_CROSS_BASE}/usr/include/freetype2"`

Re: New package: nsxiv-27.1

[N-R-K]

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

New comment by N-R-K on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-924329879

Comment:
> I noticed this package installs examples in /usr/share/nsxiv/exec/, but sxiv installs them in /usr/share/examples.

Hi, I don't believe we changed anything. Sxiv installs them in `$(DESTDIR)$(PREFIX)/share/sxiv/exec/` , we only chnaged the name to nsxiv.
https://github.com/muennich/sxiv/blob/1d28627868f5133a25a0197af21a187799ffa98e/Makefile#L78

Re: New package: nsxiv-27.1

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-924334800

Comment:
> > I noticed this package installs examples in /usr/share/nsxiv/exec/, but sxiv installs them in /usr/share/examples.
> 
> Hi, I don't believe we changed anything. Sxiv installs them in `$(DESTDIR)$(PREFIX)/share/sxiv/exec/` , we only chnaged the name to nsxiv.
> [muennich/sxiv@`1d28627`/Makefile#L78](https://github.com/muennich/sxiv/blob/1d28627868f5133a25a0197af21a187799ffa98e/Makefile#L78)

Hi, Void patches this in the sxiv package: https://github.com/void-linux/void-packages/blob/75403cef76a93199456befdcb8884fbac39adbb3/srcpkgs/sxiv/patches/sxiv-1.3-makefile.patch. Do you think this could be upstreamed? Having examples in /usr/share/examples is quite common and people expect them there.

Re: New package: nsxiv-27.1

[N-R-K]

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

New comment by N-R-K on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-924339177

Comment:
> Having examples in /usr/share/examples is quite common and people expect them there.

Good point, I'll open an issue and see what other maintainers have to say about this. We try to be backwards compatible with `sxiv` as much as possible, so I can't guarantee weather this will get upstreamed.

Re: New package: nsxiv-27.1

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-924342656

Comment:
@WitherCubes could you add the patch?

Re: New package: nsxiv-27.1

[N-R-K]

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

New comment by N-R-K on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-924345747

Comment:
Btw, since the topic of package maintenance cam up, we ended up carelessly including some non-POSIX extensions in our Makefile, we're in the process of reverting them https://github.com/nsxiv/nsxiv/pull/71.
This should get merged in `v28` and after this, I don't believe our build system will change much if at all. So bumping version should be a smooth experience for maintainers.

Re: New package: nsxiv-27.1

[N-R-K]

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

New comment by N-R-K on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-924345747

Comment:
Btw, since the topic of package maintenance came up, we ended up carelessly including some non-POSIX extensions in our Makefile, we're in the process of reverting them https://github.com/nsxiv/nsxiv/pull/71.
This should get merged in `v28` and after this, I don't believe our build system will change much if at all. So bumping version should be a smooth experience for maintainers.

Re: New package: nsxiv-27.1

[eylles]

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

New comment by eylles on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-924432212

Comment:
Altho not all distros follow the usage of `/udr/share/examples` i think probably the sanest way would be to make 2 additions into upstream, have a var for the directory where to install the examples, which would default to the current one (`/usr/share/nsxiv/exec`) but have that var set to `/usr/share/examples` in the void linux build, additionally have another option like EXAMPLES which would be 1 by default and changing ti to 0 would disable installing them, that to also respect the way sxiv is installed in the debian package.

Re: New package: nsxiv-27.1

[N-R-K]

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

New comment by N-R-K on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-924452976

Comment:
@eylles That seems like needless complexity. Currently in https://github.com/nsxiv/nsxiv/pull/86 we're offering a `DOCPREFIX`. Distros can change that to their liking.

Re: [PR PATCH] [Updated] New package: nsxiv-27.1

[WitherCubes]

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

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

https://github.com/WitherCubes/void-packages master
https://github.com/void-linux/void-packages/pull/33009

New package: nsxiv-27.1
<!-- Mark items with [x] where applicable -->

#### General
- [x] 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/33009.patch is attached

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

From f1cff3083158ae5b243c22e1510266d23117a84e Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <tsppavan7@gmail.com>
Date: Sat, 18 Sep 2021 11:48:37 +0530
Subject: [PATCH 1/2] New package: nsxiv-27.1

---
 srcpkgs/nsxiv/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/nsxiv/template

diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
new file mode 100644
index 000000000000..7b7ea373b7ce
--- /dev/null
+++ b/srcpkgs/nsxiv/template
@@ -0,0 +1,25 @@
+# Template file for 'nsxiv'
+pkgname=nsxiv
+version=27.1
+revision=1
+build_style=gnu-makefile
+makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel"
+short_desc="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
+maintainer="Sanjay Pavan <tsppavan7@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/nsxiv/nsxiv"
+distfiles="https://github.com/nsxiv/nsxiv/archive/v${version}.tar.gz"
+checksum=416247c6930d2a5ba482010a7c095fc3e6fe0fe609f2bce0049f69bebd63e00c
+
+pre_build() {
+	[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h ||:
+}
+
+post_install() {
+	vinstall nsxiv.desktop 644 usr/share/applications
+}
+
+if [ "$CROSS_BUILD" ]; then
+	# otherwise ft2build.h is not found
+	hostmakedepends+=" freetype-devel"
+fi

From f75cc093da1a223f605c1eaed4b5552d6cf3bf85 Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <tsppavan7@gmail.com>
Date: Wed, 22 Sep 2021 17:27:48 +0530
Subject: [PATCH 2/2] added patch for nsxiv Makefile

---
 .../nsxiv/patches/nsxiv-27.1-makefile.patch   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch

diff --git a/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch b/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
new file mode 100644
index 000000000000..83f09fe2d0f5
--- /dev/null
+++ b/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
@@ -0,0 +1,31 @@
+--- a/Makefile	2021-09-22 17:00:05.123980000 +0530
++++ b/Makefile	2021-09-22 16:59:53.050646000 +0530
+@@ -86,7 +86,7 @@
+ 		>$(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
+ 	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
+ 	@echo "INSTALL share/nsxiv/"
+-	install -Dt $(DESTDIR)$(PREFIX)/share/nsxiv/exec exec/*
++	install -Dt $(DESTDIR)$(PREFIX)/share/doc/nsxiv/examples exec/*
+ 
+ uninstall:
+ 	@echo "REMOVE bin/nsxiv"
+--- a/nsxiv.1	2021-09-22 16:55:16.433967000 +0530
++++ b/nsxiv.1	2021-09-22 17:03:11.870655000 +0530
+@@ -428,7 +428,7 @@
+ 3) image height.
+ .P
+ There is also an example script installed together with nsxiv as
+-.IR PREFIX/share/nsxiv/exec/image-info .
++.IR PREFIX/share/doc/nsxiv/examples/image-info .
+ .SH EXTERNAL KEY HANDLER
+ Additional external keyboard commands can be defined using a handler program
+ located in
+@@ -446,7 +446,7 @@
+ keysym as listed in /usr/include/X11/keysymdef.h without the "XK_" prefix.
+ 
+ There is also an example script installed together with nsxiv as
+-.IR PREFIX/share/nsxiv/exec/key-handler .
++.IR PREFIX/share/doc/nsxiv/examples/key-handler .
+ .SH THUMBNAIL CACHING
+ nsxiv stores all thumbnails under
+ .IR $XDG_CACHE_HOME/nsxiv/ .

Re: New package: nsxiv-27.1

[WitherCubes]

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

New comment by WitherCubes on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-924862060

Comment:
Added the patch, tested it out and it is working.

Re: New package: nsxiv-27.1

[N-R-K]

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

New comment by N-R-K on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-925304484

Comment:
> Do you think this could be upstreamed?

Yes, merged https://github.com/nsxiv/nsxiv/pull/86

That will be for `v28` however. For this version, a patch will still be needed.

Re: [PR PATCH] [Updated] New package: nsxiv-27.1

[WitherCubes]

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

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

https://github.com/WitherCubes/void-packages master
https://github.com/void-linux/void-packages/pull/33009

New package: nsxiv-27.1
<!-- Mark items with [x] where applicable -->

#### General
- [x] 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/33009.patch is attached

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

From f1cff3083158ae5b243c22e1510266d23117a84e Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <tsppavan7@gmail.com>
Date: Sat, 18 Sep 2021 11:48:37 +0530
Subject: [PATCH 1/3] New package: nsxiv-27.1

---
 srcpkgs/nsxiv/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/nsxiv/template

diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
new file mode 100644
index 000000000000..7b7ea373b7ce
--- /dev/null
+++ b/srcpkgs/nsxiv/template
@@ -0,0 +1,25 @@
+# Template file for 'nsxiv'
+pkgname=nsxiv
+version=27.1
+revision=1
+build_style=gnu-makefile
+makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel"
+short_desc="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
+maintainer="Sanjay Pavan <tsppavan7@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/nsxiv/nsxiv"
+distfiles="https://github.com/nsxiv/nsxiv/archive/v${version}.tar.gz"
+checksum=416247c6930d2a5ba482010a7c095fc3e6fe0fe609f2bce0049f69bebd63e00c
+
+pre_build() {
+	[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h ||:
+}
+
+post_install() {
+	vinstall nsxiv.desktop 644 usr/share/applications
+}
+
+if [ "$CROSS_BUILD" ]; then
+	# otherwise ft2build.h is not found
+	hostmakedepends+=" freetype-devel"
+fi

From f75cc093da1a223f605c1eaed4b5552d6cf3bf85 Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <tsppavan7@gmail.com>
Date: Wed, 22 Sep 2021 17:27:48 +0530
Subject: [PATCH 2/3] added patch for nsxiv Makefile

---
 .../nsxiv/patches/nsxiv-27.1-makefile.patch   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch

diff --git a/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch b/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
new file mode 100644
index 000000000000..83f09fe2d0f5
--- /dev/null
+++ b/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
@@ -0,0 +1,31 @@
+--- a/Makefile	2021-09-22 17:00:05.123980000 +0530
++++ b/Makefile	2021-09-22 16:59:53.050646000 +0530
+@@ -86,7 +86,7 @@
+ 		>$(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
+ 	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
+ 	@echo "INSTALL share/nsxiv/"
+-	install -Dt $(DESTDIR)$(PREFIX)/share/nsxiv/exec exec/*
++	install -Dt $(DESTDIR)$(PREFIX)/share/doc/nsxiv/examples exec/*
+ 
+ uninstall:
+ 	@echo "REMOVE bin/nsxiv"
+--- a/nsxiv.1	2021-09-22 16:55:16.433967000 +0530
++++ b/nsxiv.1	2021-09-22 17:03:11.870655000 +0530
+@@ -428,7 +428,7 @@
+ 3) image height.
+ .P
+ There is also an example script installed together with nsxiv as
+-.IR PREFIX/share/nsxiv/exec/image-info .
++.IR PREFIX/share/doc/nsxiv/examples/image-info .
+ .SH EXTERNAL KEY HANDLER
+ Additional external keyboard commands can be defined using a handler program
+ located in
+@@ -446,7 +446,7 @@
+ keysym as listed in /usr/include/X11/keysymdef.h without the "XK_" prefix.
+ 
+ There is also an example script installed together with nsxiv as
+-.IR PREFIX/share/nsxiv/exec/key-handler .
++.IR PREFIX/share/doc/nsxiv/examples/key-handler .
+ .SH THUMBNAIL CACHING
+ nsxiv stores all thumbnails under
+ .IR $XDG_CACHE_HOME/nsxiv/ .

From c21465ff936c8a7ae96d3631ab3771aa486b22b4 Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <tsppavan7@gmail.com>
Date: Fri, 24 Sep 2021 20:21:59 +0530
Subject: [PATCH 3/3] Fixed the issue @Johnnynator mentioned

---
 srcpkgs/nsxiv/template | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
index 7b7ea373b7ce..8b78d4635c5c 100644
--- a/srcpkgs/nsxiv/template
+++ b/srcpkgs/nsxiv/template
@@ -1,7 +1,7 @@
 # Template file for 'nsxiv'
 pkgname=nsxiv
 version=27.1
-revision=1
+revision=2
 build_style=gnu-makefile
 makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel"
 short_desc="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
@@ -19,7 +19,4 @@ post_install() {
 	vinstall nsxiv.desktop 644 usr/share/applications
 }
 
-if [ "$CROSS_BUILD" ]; then
-	# otherwise ft2build.h is not found
-	hostmakedepends+=" freetype-devel"
-fi
+CFLAGS="${XBPS_CROSS_BASE}/usr/include/freetype2"

Re: [PR REVIEW] New package: nsxiv-27.1

[WitherCubes]

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

New review comment by WitherCubes on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#discussion_r715685191

Comment:
Fixed it, see [this commit](https://github.com/void-linux/void-packages/pull/33009/commits/c21465ff936c8a7ae96d3631ab3771aa486b22b4).

Re: New package: nsxiv-27.1

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-926717388

Comment:
Squash the commits and reset the revision to 1.

Re: New package: nsxiv-27.1

[WitherCubes]

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

New comment by WitherCubes on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-926728665

Comment:
@paper42 Is there any issue in the package, there are checks failed. If any issue please inform me what is the info

Re: New package: nsxiv-27.1

[WitherCubes]

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

New comment by WitherCubes on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-926728665

Comment:
@paper42 Is there any issue in the package, there are checks failed. If any issue please give me the info of the failed checks

Re: [PR PATCH] [Updated] New package: nsxiv-27.1

[WitherCubes]

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

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

https://github.com/WitherCubes/void-packages master
https://github.com/void-linux/void-packages/pull/33009

New package: nsxiv-27.1
<!-- Mark items with [x] where applicable -->

#### General
- [x] 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/33009.patch is attached

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

From f1cff3083158ae5b243c22e1510266d23117a84e Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <tsppavan7@gmail.com>
Date: Sat, 18 Sep 2021 11:48:37 +0530
Subject: [PATCH 1/4] New package: nsxiv-27.1

---
 srcpkgs/nsxiv/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/nsxiv/template

diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
new file mode 100644
index 000000000000..7b7ea373b7ce
--- /dev/null
+++ b/srcpkgs/nsxiv/template
@@ -0,0 +1,25 @@
+# Template file for 'nsxiv'
+pkgname=nsxiv
+version=27.1
+revision=1
+build_style=gnu-makefile
+makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel"
+short_desc="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
+maintainer="Sanjay Pavan <tsppavan7@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/nsxiv/nsxiv"
+distfiles="https://github.com/nsxiv/nsxiv/archive/v${version}.tar.gz"
+checksum=416247c6930d2a5ba482010a7c095fc3e6fe0fe609f2bce0049f69bebd63e00c
+
+pre_build() {
+	[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h ||:
+}
+
+post_install() {
+	vinstall nsxiv.desktop 644 usr/share/applications
+}
+
+if [ "$CROSS_BUILD" ]; then
+	# otherwise ft2build.h is not found
+	hostmakedepends+=" freetype-devel"
+fi

From f75cc093da1a223f605c1eaed4b5552d6cf3bf85 Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <tsppavan7@gmail.com>
Date: Wed, 22 Sep 2021 17:27:48 +0530
Subject: [PATCH 2/4] added patch for nsxiv Makefile

---
 .../nsxiv/patches/nsxiv-27.1-makefile.patch   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch

diff --git a/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch b/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
new file mode 100644
index 000000000000..83f09fe2d0f5
--- /dev/null
+++ b/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
@@ -0,0 +1,31 @@
+--- a/Makefile	2021-09-22 17:00:05.123980000 +0530
++++ b/Makefile	2021-09-22 16:59:53.050646000 +0530
+@@ -86,7 +86,7 @@
+ 		>$(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
+ 	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
+ 	@echo "INSTALL share/nsxiv/"
+-	install -Dt $(DESTDIR)$(PREFIX)/share/nsxiv/exec exec/*
++	install -Dt $(DESTDIR)$(PREFIX)/share/doc/nsxiv/examples exec/*
+ 
+ uninstall:
+ 	@echo "REMOVE bin/nsxiv"
+--- a/nsxiv.1	2021-09-22 16:55:16.433967000 +0530
++++ b/nsxiv.1	2021-09-22 17:03:11.870655000 +0530
+@@ -428,7 +428,7 @@
+ 3) image height.
+ .P
+ There is also an example script installed together with nsxiv as
+-.IR PREFIX/share/nsxiv/exec/image-info .
++.IR PREFIX/share/doc/nsxiv/examples/image-info .
+ .SH EXTERNAL KEY HANDLER
+ Additional external keyboard commands can be defined using a handler program
+ located in
+@@ -446,7 +446,7 @@
+ keysym as listed in /usr/include/X11/keysymdef.h without the "XK_" prefix.
+ 
+ There is also an example script installed together with nsxiv as
+-.IR PREFIX/share/nsxiv/exec/key-handler .
++.IR PREFIX/share/doc/nsxiv/examples/key-handler .
+ .SH THUMBNAIL CACHING
+ nsxiv stores all thumbnails under
+ .IR $XDG_CACHE_HOME/nsxiv/ .

From c21465ff936c8a7ae96d3631ab3771aa486b22b4 Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <tsppavan7@gmail.com>
Date: Fri, 24 Sep 2021 20:21:59 +0530
Subject: [PATCH 3/4] Fixed the issue @Johnnynator mentioned

---
 srcpkgs/nsxiv/template | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
index 7b7ea373b7ce..8b78d4635c5c 100644
--- a/srcpkgs/nsxiv/template
+++ b/srcpkgs/nsxiv/template
@@ -1,7 +1,7 @@
 # Template file for 'nsxiv'
 pkgname=nsxiv
 version=27.1
-revision=1
+revision=2
 build_style=gnu-makefile
 makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel"
 short_desc="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
@@ -19,7 +19,4 @@ post_install() {
 	vinstall nsxiv.desktop 644 usr/share/applications
 }
 
-if [ "$CROSS_BUILD" ]; then
-	# otherwise ft2build.h is not found
-	hostmakedepends+=" freetype-devel"
-fi
+CFLAGS="${XBPS_CROSS_BASE}/usr/include/freetype2"

From 7714820359122c60b3dffee88f2ea02d0b46dce2 Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <tsppavan7@gmail.com>
Date: Fri, 24 Sep 2021 21:18:37 +0530
Subject: [PATCH 4/4] Revert back to revision 1

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

diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
index 8b78d4635c5c..63c3786e2df6 100644
--- a/srcpkgs/nsxiv/template
+++ b/srcpkgs/nsxiv/template
@@ -1,7 +1,7 @@
 # Template file for 'nsxiv'
 pkgname=nsxiv
 version=27.1
-revision=2
+revision=1
 build_style=gnu-makefile
 makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel"
 short_desc="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"

Re: [PR PATCH] [Updated] New package: nsxiv-27.1

[WitherCubes]

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

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

https://github.com/WitherCubes/void-packages master
https://github.com/void-linux/void-packages/pull/33009

New package: nsxiv-27.1
<!-- Mark items with [x] where applicable -->

#### General
- [x] 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/33009.patch is attached

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

From cf20bff789a78e18a9a79425d223a54e50399de7 Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <tsppavan7@gmail.com>
Date: Sat, 18 Sep 2021 11:48:37 +0530
Subject: [PATCH] New package: nsxiv-27.1

---
 .../nsxiv/patches/nsxiv-27.1-makefile.patch   | 31 +++++++++++++++++++
 srcpkgs/nsxiv/template                        | 22 +++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
 create mode 100644 srcpkgs/nsxiv/template

diff --git a/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch b/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
new file mode 100644
index 000000000000..83f09fe2d0f5
--- /dev/null
+++ b/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
@@ -0,0 +1,31 @@
+--- a/Makefile	2021-09-22 17:00:05.123980000 +0530
++++ b/Makefile	2021-09-22 16:59:53.050646000 +0530
+@@ -86,7 +86,7 @@
+ 		>$(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
+ 	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
+ 	@echo "INSTALL share/nsxiv/"
+-	install -Dt $(DESTDIR)$(PREFIX)/share/nsxiv/exec exec/*
++	install -Dt $(DESTDIR)$(PREFIX)/share/doc/nsxiv/examples exec/*
+ 
+ uninstall:
+ 	@echo "REMOVE bin/nsxiv"
+--- a/nsxiv.1	2021-09-22 16:55:16.433967000 +0530
++++ b/nsxiv.1	2021-09-22 17:03:11.870655000 +0530
+@@ -428,7 +428,7 @@
+ 3) image height.
+ .P
+ There is also an example script installed together with nsxiv as
+-.IR PREFIX/share/nsxiv/exec/image-info .
++.IR PREFIX/share/doc/nsxiv/examples/image-info .
+ .SH EXTERNAL KEY HANDLER
+ Additional external keyboard commands can be defined using a handler program
+ located in
+@@ -446,7 +446,7 @@
+ keysym as listed in /usr/include/X11/keysymdef.h without the "XK_" prefix.
+ 
+ There is also an example script installed together with nsxiv as
+-.IR PREFIX/share/nsxiv/exec/key-handler .
++.IR PREFIX/share/doc/nsxiv/examples/key-handler .
+ .SH THUMBNAIL CACHING
+ nsxiv stores all thumbnails under
+ .IR $XDG_CACHE_HOME/nsxiv/ .
diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
new file mode 100644
index 000000000000..63c3786e2df6
--- /dev/null
+++ b/srcpkgs/nsxiv/template
@@ -0,0 +1,22 @@
+# Template file for 'nsxiv'
+pkgname=nsxiv
+version=27.1
+revision=1
+build_style=gnu-makefile
+makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel"
+short_desc="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
+maintainer="Sanjay Pavan <tsppavan7@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/nsxiv/nsxiv"
+distfiles="https://github.com/nsxiv/nsxiv/archive/v${version}.tar.gz"
+checksum=416247c6930d2a5ba482010a7c095fc3e6fe0fe609f2bce0049f69bebd63e00c
+
+pre_build() {
+	[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h ||:
+}
+
+post_install() {
+	vinstall nsxiv.desktop 644 usr/share/applications
+}
+
+CFLAGS="${XBPS_CROSS_BASE}/usr/include/freetype2"

Re: New package: nsxiv-27.1

[WitherCubes]

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

New comment by WitherCubes on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-926728665

Comment:
@paper42 Is there any issue in the package, there are checks failed. If any issue please give me the info of the failed checks

Re: New package: nsxiv-27.1

[WitherCubes]

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

New comment by WitherCubes on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-926748227

Comment:
Some checks are failing, @paper42 do you know the details of this problem?

Re: [PR REVIEW] New package: nsxiv-27.1

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#discussion_r716052514

Comment:
```suggestion
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
```
and move this up to the end of the first block (after checksum)

Re: [PR PATCH] [Updated] New package: nsxiv-27.1

[WitherCubes]

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

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

https://github.com/WitherCubes/void-packages master
https://github.com/void-linux/void-packages/pull/33009

New package: nsxiv-27.1
<!-- Mark items with [x] where applicable -->

#### General
- [x] 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/33009.patch is attached

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

From cf20bff789a78e18a9a79425d223a54e50399de7 Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <tsppavan7@gmail.com>
Date: Sat, 18 Sep 2021 11:48:37 +0530
Subject: [PATCH 1/2] New package: nsxiv-27.1

---
 .../nsxiv/patches/nsxiv-27.1-makefile.patch   | 31 +++++++++++++++++++
 srcpkgs/nsxiv/template                        | 22 +++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
 create mode 100644 srcpkgs/nsxiv/template

diff --git a/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch b/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
new file mode 100644
index 000000000000..83f09fe2d0f5
--- /dev/null
+++ b/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
@@ -0,0 +1,31 @@
+--- a/Makefile	2021-09-22 17:00:05.123980000 +0530
++++ b/Makefile	2021-09-22 16:59:53.050646000 +0530
+@@ -86,7 +86,7 @@
+ 		>$(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
+ 	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
+ 	@echo "INSTALL share/nsxiv/"
+-	install -Dt $(DESTDIR)$(PREFIX)/share/nsxiv/exec exec/*
++	install -Dt $(DESTDIR)$(PREFIX)/share/doc/nsxiv/examples exec/*
+ 
+ uninstall:
+ 	@echo "REMOVE bin/nsxiv"
+--- a/nsxiv.1	2021-09-22 16:55:16.433967000 +0530
++++ b/nsxiv.1	2021-09-22 17:03:11.870655000 +0530
+@@ -428,7 +428,7 @@
+ 3) image height.
+ .P
+ There is also an example script installed together with nsxiv as
+-.IR PREFIX/share/nsxiv/exec/image-info .
++.IR PREFIX/share/doc/nsxiv/examples/image-info .
+ .SH EXTERNAL KEY HANDLER
+ Additional external keyboard commands can be defined using a handler program
+ located in
+@@ -446,7 +446,7 @@
+ keysym as listed in /usr/include/X11/keysymdef.h without the "XK_" prefix.
+ 
+ There is also an example script installed together with nsxiv as
+-.IR PREFIX/share/nsxiv/exec/key-handler .
++.IR PREFIX/share/doc/nsxiv/examples/key-handler .
+ .SH THUMBNAIL CACHING
+ nsxiv stores all thumbnails under
+ .IR $XDG_CACHE_HOME/nsxiv/ .
diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
new file mode 100644
index 000000000000..63c3786e2df6
--- /dev/null
+++ b/srcpkgs/nsxiv/template
@@ -0,0 +1,22 @@
+# Template file for 'nsxiv'
+pkgname=nsxiv
+version=27.1
+revision=1
+build_style=gnu-makefile
+makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel"
+short_desc="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
+maintainer="Sanjay Pavan <tsppavan7@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/nsxiv/nsxiv"
+distfiles="https://github.com/nsxiv/nsxiv/archive/v${version}.tar.gz"
+checksum=416247c6930d2a5ba482010a7c095fc3e6fe0fe609f2bce0049f69bebd63e00c
+
+pre_build() {
+	[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h ||:
+}
+
+post_install() {
+	vinstall nsxiv.desktop 644 usr/share/applications
+}
+
+CFLAGS="${XBPS_CROSS_BASE}/usr/include/freetype2"

From 717950b685314a7a06c78ffd30cb884fb15fa162 Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <72592921+WitherCubes@users.noreply.github.com>
Date: Sat, 25 Sep 2021 22:04:25 +0530
Subject: [PATCH 2/2] Trying the Fix for failed checks

I will squash the commits and make them clean if this check passes

Co-authored-by: Michal Vasilek <michal@vasilek.cz>
---
 srcpkgs/nsxiv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
index 63c3786e2df6..985d9302bbc1 100644
--- a/srcpkgs/nsxiv/template
+++ b/srcpkgs/nsxiv/template
@@ -19,4 +19,4 @@ post_install() {
 	vinstall nsxiv.desktop 644 usr/share/applications
 }
 
-CFLAGS="${XBPS_CROSS_BASE}/usr/include/freetype2"
+CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"

Re: New package: nsxiv-27.1

[WitherCubes]

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

New comment by WitherCubes on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-927150889

Comment:
@paper42 Should I bother about the lint template check failing or ignore it and squash the commits?

Re: [PR PATCH] [Updated] New package: nsxiv-27.1

[WitherCubes]

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

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

https://github.com/WitherCubes/void-packages master
https://github.com/void-linux/void-packages/pull/33009

New package: nsxiv-27.1
<!-- Mark items with [x] where applicable -->

#### General
- [x] 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/33009.patch is attached

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

From cf20bff789a78e18a9a79425d223a54e50399de7 Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <tsppavan7@gmail.com>
Date: Sat, 18 Sep 2021 11:48:37 +0530
Subject: [PATCH 1/3] New package: nsxiv-27.1

---
 .../nsxiv/patches/nsxiv-27.1-makefile.patch   | 31 +++++++++++++++++++
 srcpkgs/nsxiv/template                        | 22 +++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
 create mode 100644 srcpkgs/nsxiv/template

diff --git a/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch b/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
new file mode 100644
index 000000000000..83f09fe2d0f5
--- /dev/null
+++ b/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
@@ -0,0 +1,31 @@
+--- a/Makefile	2021-09-22 17:00:05.123980000 +0530
++++ b/Makefile	2021-09-22 16:59:53.050646000 +0530
+@@ -86,7 +86,7 @@
+ 		>$(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
+ 	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
+ 	@echo "INSTALL share/nsxiv/"
+-	install -Dt $(DESTDIR)$(PREFIX)/share/nsxiv/exec exec/*
++	install -Dt $(DESTDIR)$(PREFIX)/share/doc/nsxiv/examples exec/*
+ 
+ uninstall:
+ 	@echo "REMOVE bin/nsxiv"
+--- a/nsxiv.1	2021-09-22 16:55:16.433967000 +0530
++++ b/nsxiv.1	2021-09-22 17:03:11.870655000 +0530
+@@ -428,7 +428,7 @@
+ 3) image height.
+ .P
+ There is also an example script installed together with nsxiv as
+-.IR PREFIX/share/nsxiv/exec/image-info .
++.IR PREFIX/share/doc/nsxiv/examples/image-info .
+ .SH EXTERNAL KEY HANDLER
+ Additional external keyboard commands can be defined using a handler program
+ located in
+@@ -446,7 +446,7 @@
+ keysym as listed in /usr/include/X11/keysymdef.h without the "XK_" prefix.
+ 
+ There is also an example script installed together with nsxiv as
+-.IR PREFIX/share/nsxiv/exec/key-handler .
++.IR PREFIX/share/doc/nsxiv/examples/key-handler .
+ .SH THUMBNAIL CACHING
+ nsxiv stores all thumbnails under
+ .IR $XDG_CACHE_HOME/nsxiv/ .
diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
new file mode 100644
index 000000000000..63c3786e2df6
--- /dev/null
+++ b/srcpkgs/nsxiv/template
@@ -0,0 +1,22 @@
+# Template file for 'nsxiv'
+pkgname=nsxiv
+version=27.1
+revision=1
+build_style=gnu-makefile
+makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel"
+short_desc="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
+maintainer="Sanjay Pavan <tsppavan7@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/nsxiv/nsxiv"
+distfiles="https://github.com/nsxiv/nsxiv/archive/v${version}.tar.gz"
+checksum=416247c6930d2a5ba482010a7c095fc3e6fe0fe609f2bce0049f69bebd63e00c
+
+pre_build() {
+	[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h ||:
+}
+
+post_install() {
+	vinstall nsxiv.desktop 644 usr/share/applications
+}
+
+CFLAGS="${XBPS_CROSS_BASE}/usr/include/freetype2"

From 717950b685314a7a06c78ffd30cb884fb15fa162 Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <72592921+WitherCubes@users.noreply.github.com>
Date: Sat, 25 Sep 2021 22:04:25 +0530
Subject: [PATCH 2/3] Trying the Fix for failed checks

I will squash the commits and make them clean if this check passes

Co-authored-by: Michal Vasilek <michal@vasilek.cz>
---
 srcpkgs/nsxiv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
index 63c3786e2df6..985d9302bbc1 100644
--- a/srcpkgs/nsxiv/template
+++ b/srcpkgs/nsxiv/template
@@ -19,4 +19,4 @@ post_install() {
 	vinstall nsxiv.desktop 644 usr/share/applications
 }
 
-CFLAGS="${XBPS_CROSS_BASE}/usr/include/freetype2"
+CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"

From 5da2ce5179dfd4d848c788a72380e27b4a2f113d Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <tsppavan7@gmail.com>
Date: Sat, 25 Sep 2021 22:35:52 +0530
Subject: [PATCH 3/3] Moved the CFLAGS variable

---
 srcpkgs/nsxiv/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
index 985d9302bbc1..65954bc98288 100644
--- a/srcpkgs/nsxiv/template
+++ b/srcpkgs/nsxiv/template
@@ -10,6 +10,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/nsxiv/nsxiv"
 distfiles="https://github.com/nsxiv/nsxiv/archive/v${version}.tar.gz"
 checksum=416247c6930d2a5ba482010a7c095fc3e6fe0fe609f2bce0049f69bebd63e00c
+CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
 
 pre_build() {
 	[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h ||:
@@ -18,5 +19,3 @@ pre_build() {
 post_install() {
 	vinstall nsxiv.desktop 644 usr/share/applications
 }
-
-CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"

Re: New package: nsxiv-27.1

[WitherCubes]

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

New comment by WitherCubes on void-packages repository

https://github.com/void-linux/void-packages/pull/33009#issuecomment-927150889

Comment:
@paper42 Should I bother about the lint template check failing or ignore it and squash the commits?

Re: [PR PATCH] [Updated] New package: nsxiv-27.1

[WitherCubes]

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

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

https://github.com/WitherCubes/void-packages master
https://github.com/void-linux/void-packages/pull/33009

New package: nsxiv-27.1
<!-- Mark items with [x] where applicable -->

#### General
- [x] 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/33009.patch is attached

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

From 09b9aba3d7047a031ebe3194d704ec8247b81d87 Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <tsppavan7@gmail.com>
Date: Sat, 18 Sep 2021 11:48:37 +0530
Subject: [PATCH] New package: nsxiv-27.1

---
 .../nsxiv/patches/nsxiv-27.1-makefile.patch   | 31 +++++++++++++++++++
 srcpkgs/nsxiv/template                        | 21 +++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
 create mode 100644 srcpkgs/nsxiv/template

diff --git a/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch b/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
new file mode 100644
index 000000000000..83f09fe2d0f5
--- /dev/null
+++ b/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
@@ -0,0 +1,31 @@
+--- a/Makefile	2021-09-22 17:00:05.123980000 +0530
++++ b/Makefile	2021-09-22 16:59:53.050646000 +0530
+@@ -86,7 +86,7 @@
+ 		>$(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
+ 	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
+ 	@echo "INSTALL share/nsxiv/"
+-	install -Dt $(DESTDIR)$(PREFIX)/share/nsxiv/exec exec/*
++	install -Dt $(DESTDIR)$(PREFIX)/share/doc/nsxiv/examples exec/*
+ 
+ uninstall:
+ 	@echo "REMOVE bin/nsxiv"
+--- a/nsxiv.1	2021-09-22 16:55:16.433967000 +0530
++++ b/nsxiv.1	2021-09-22 17:03:11.870655000 +0530
+@@ -428,7 +428,7 @@
+ 3) image height.
+ .P
+ There is also an example script installed together with nsxiv as
+-.IR PREFIX/share/nsxiv/exec/image-info .
++.IR PREFIX/share/doc/nsxiv/examples/image-info .
+ .SH EXTERNAL KEY HANDLER
+ Additional external keyboard commands can be defined using a handler program
+ located in
+@@ -446,7 +446,7 @@
+ keysym as listed in /usr/include/X11/keysymdef.h without the "XK_" prefix.
+ 
+ There is also an example script installed together with nsxiv as
+-.IR PREFIX/share/nsxiv/exec/key-handler .
++.IR PREFIX/share/doc/nsxiv/examples/key-handler .
+ .SH THUMBNAIL CACHING
+ nsxiv stores all thumbnails under
+ .IR $XDG_CACHE_HOME/nsxiv/ .
diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
new file mode 100644
index 000000000000..65954bc98288
--- /dev/null
+++ b/srcpkgs/nsxiv/template
@@ -0,0 +1,21 @@
+# Template file for 'nsxiv'
+pkgname=nsxiv
+version=27.1
+revision=1
+build_style=gnu-makefile
+makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel"
+short_desc="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer"
+maintainer="Sanjay Pavan <tsppavan7@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://github.com/nsxiv/nsxiv"
+distfiles="https://github.com/nsxiv/nsxiv/archive/v${version}.tar.gz"
+checksum=416247c6930d2a5ba482010a7c095fc3e6fe0fe609f2bce0049f69bebd63e00c
+CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2"
+
+pre_build() {
+	[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h ||:
+}
+
+post_install() {
+	vinstall nsxiv.desktop 644 usr/share/applications
+}

Re: [PR PATCH] [Merged]: New package: nsxiv-27.1

[paper42]

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

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

New package: nsxiv-27.1
https://github.com/void-linux/void-packages/pull/33009

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

#### General
- [x] 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
-->