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"