From cf20bff789a78e18a9a79425d223a54e50399de7 Mon Sep 17 00:00:00 2001 From: Sanjay Pavan 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 " +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 --- 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 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"