CVS commit: pkgsrc/sysutils/nnn

["Sijmen J. Mulder" <sjmulder%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sjmulder
Date:           Mon Jul 15 22:36:52 UTC 2024

Modified Files:
        pkgsrc/sysutils/nnn: distinfo
        pkgsrc/sysutils/nnn/patches: patch-src_nnn.c

Log Message:
sysutils/nnn: Fix build on CentOS 7

In glibc <2.23, fts.h doesn't have large file support, so don't enable it
there.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 pkgsrc/sysutils/nnn/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/nnn/patches/patch-src_nnn.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/nnn/distinfo
diff -u pkgsrc/sysutils/nnn/distinfo:1.30 pkgsrc/sysutils/nnn/distinfo:1.31
--- pkgsrc/sysutils/nnn/distinfo:1.30   Tue Jan 30 15:57:18 2024
+++ pkgsrc/sysutils/nnn/distinfo        Mon Jul 15 22:36:52 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.30 2024/01/30 15:57:18 sjmulder Exp $
+$NetBSD: distinfo,v 1.31 2024/07/15 22:36:52 sjmulder Exp $
 
 BLAKE2s (nnn-4.9.tar.gz) = 55ebf293e0ed886798eb9ce90969b45c3cfadc88714d74e16c01fa05872b7150
 SHA512 (nnn-4.9.tar.gz) = 3c16ed1cbc5466b05306e38c6f5d8eb7ade9cf5ad766f9ff3bf7d20d5bfb9bdf1564527e27191e2cd85542c25245f338e1236630de3d1c8e5fbd10d54d628a14
 Size (nnn-4.9.tar.gz) = 255144 bytes
-SHA1 (patch-src_nnn.c) = cbd382a0fe4c5cce1f384987d006675cbf280bdc
+SHA1 (patch-src_nnn.c) = a61aa482a61cbffa4b3fcfcc1c1778c7b67716b9

Index: pkgsrc/sysutils/nnn/patches/patch-src_nnn.c
diff -u pkgsrc/sysutils/nnn/patches/patch-src_nnn.c:1.5 pkgsrc/sysutils/nnn/patches/patch-src_nnn.c:1.6
--- pkgsrc/sysutils/nnn/patches/patch-src_nnn.c:1.5     Mon Oct 25 22:26:53 2021
+++ pkgsrc/sysutils/nnn/patches/patch-src_nnn.c Mon Jul 15 22:36:52 2024
@@ -1,10 +1,31 @@
-$NetBSD: patch-src_nnn.c,v 1.5 2021/10/25 22:26:53 sjmulder Exp $
+$NetBSD: patch-src_nnn.c,v 1.6 2024/07/15 22:36:52 sjmulder Exp $
 
-dprintf() polyfill for Solaris
+ - dprintf() polyfill for Solaris.
+ - Disable large file support on old glibc where unsupported in fts.h.
+   https://github.com/jarun/nnn/pull/1910
 
---- src/nnn.c.orig     2021-09-28 23:10:13.183444540 +0000
+--- src/nnn.c.orig     2023-08-27 04:25:13.000000000 +0000
 +++ src/nnn.c
-@@ -117,6 +117,10 @@
+@@ -28,13 +28,16 @@
+  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+-#define _FILE_OFFSET_BITS 64 /* Support large files on 32-bit glibc */
+-
+ #if defined(__linux__) || defined(MINGW) || defined(__MINGW32__) \
+       || defined(__MINGW64__) || defined(__CYGWIN__)
+ #ifndef _GNU_SOURCE
+ #define _GNU_SOURCE
+ #endif
++#include <features.h>         /* __GLIBC__ etc */
++/* large file support on 32-bit glibc >= 2.23 where fts.h supports it */
++#if !defined(__GLIBC__) || __GLIBC__ > 2 || __GLIBC_MINOR__ >= 23
++#define _FILE_OFFSET_BITS 64
++#endif
+ #if defined(__linux__)
+ #include <sys/inotify.h>
+ #define LINUX_INOTIFY
+@@ -121,6 +124,10 @@
  #define alloca(size) __builtin_alloca(size)
  #endif
  
@@ -15,7 +36,7 @@ dprintf() polyfill for Solaris
  #include "nnn.h"
  #include "dbg.h"
  
-@@ -834,6 +838,25 @@ static void notify_fifo(bool force);
+@@ -854,6 +861,25 @@ static void notify_fifo(bool force);
  
  /* Functions */