Re: [PR PATCH] [Updated] nsxiv: update to 28

[WitherCubes <WitherCubes@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 427 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/34493

nsxiv: update to 28
#### Testing the changes
- I tested the changes in this PR: **YES** (all check have passed and I'm running it)

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

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

From fd907d62aa4022fa56464b1938e884478e644541 Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <tsppavan7@gmail.com>
Date: Sun, 12 Dec 2021 18:10:19 +0530
Subject: [PATCH 1/2] nsxiv: update to 28

---
 .../nsxiv/patches/nsxiv-27.1-makefile.patch   | 31 -------------------
 srcpkgs/nsxiv/template                        | 10 +++---
 2 files changed, 5 insertions(+), 36 deletions(-)
 delete 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
deleted file mode 100644
index 83f09fe2d0f5..000000000000
--- a/srcpkgs/nsxiv/patches/nsxiv-27.1-makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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
index 65954bc98288..b83b3fe41141 100644
--- a/srcpkgs/nsxiv/template
+++ b/srcpkgs/nsxiv/template
@@ -1,21 +1,21 @@
 # Template file for 'nsxiv'
 pkgname=nsxiv
-version=27.1
+version=28
 revision=1
 build_style=gnu-makefile
-makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel"
+makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel libwebp-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
+checksum=38047f60e51854363dd98fb7b3bc9f1cfa9b7d6f9e8788508b6f1e317328dd75
 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
+do_install() {
+	make PREFIX=/usr DESTDIR=${DESTDIR} install-all
 }

From f2dc66c20a89c70e93b557bf54ff26a906f110ac Mon Sep 17 00:00:00 2001
From: Sanjay Pavan <tsppavan7@gmail.com>
Date: Fri, 17 Dec 2021 18:29:28 +0530
Subject: [PATCH 2/2] Clean up

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

diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template
index b83b3fe41141..ca5eebf9f26e 100644
--- a/srcpkgs/nsxiv/template
+++ b/srcpkgs/nsxiv/template
@@ -3,7 +3,8 @@ pkgname=nsxiv
 version=28
 revision=1
 build_style=gnu-makefile
-makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel libwebp-devel"
+makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel
+ libwebp-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"
@@ -16,6 +17,4 @@ pre_build() {
 	[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h ||:
 }
 
-do_install() {
-	make PREFIX=/usr DESTDIR=${DESTDIR} install-all
-}
+make_install_target=install-all