CVS commit: pkgsrc/devel/ncurses

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Sun Mar 31 14:13:17 UTC 2024

Modified Files:
        pkgsrc/devel/ncurses: distinfo
Added Files:
        pkgsrc/devel/ncurses/patches: patch-ncurses_base_lib_initscr.c
            patch-ncurses_tinfo_lib_raw.c

Log Message:
Fix devel/ncurses on QNX


To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 pkgsrc/devel/ncurses/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/devel/ncurses/patches/patch-ncurses_base_lib_initscr.c \
    pkgsrc/devel/ncurses/patches/patch-ncurses_tinfo_lib_raw.c

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

Modified files:

Index: pkgsrc/devel/ncurses/distinfo
diff -u pkgsrc/devel/ncurses/distinfo:1.51 pkgsrc/devel/ncurses/distinfo:1.52
--- pkgsrc/devel/ncurses/distinfo:1.51  Thu Jan 19 12:09:20 2023
+++ pkgsrc/devel/ncurses/distinfo       Sun Mar 31 14:13:17 2024
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.51 2023/01/19 12:09:20 wiz Exp $
+$NetBSD: distinfo,v 1.52 2024/03/31 14:13:17 js Exp $
 
 BLAKE2s (ncurses-6.4.tar.gz) = bf6718282abda300f0a840bcf03b7fe9444b6200a8ab1ffd826d6181282e97ec
 SHA512 (ncurses-6.4.tar.gz) = 1c2efff87a82a57e57b0c60023c87bae93f6718114c8f9dc010d4c21119a2f7576d0225dab5f0a227c2cfc6fb6bdbd62728e407f35fce5bf351bb50cf9e0fd34
 Size (ncurses-6.4.tar.gz) = 3612591 bytes
 SHA1 (patch-misc_run__tic.in) = a6a8dd89da1a2fbbc5fcabfa6d41ce3a41b75722
+SHA1 (patch-ncurses_base_lib_initscr.c) = 3f47c8ce9b98a82aa8db6b6da55810727559d30c
+SHA1 (patch-ncurses_tinfo_lib_raw.c) = 1adea51819538433b681c209f9754a18d0e37ebb

Added files:

Index: pkgsrc/devel/ncurses/patches/patch-ncurses_base_lib_initscr.c
diff -u /dev/null pkgsrc/devel/ncurses/patches/patch-ncurses_base_lib_initscr.c:1.3
--- /dev/null   Sun Mar 31 14:13:17 2024
+++ pkgsrc/devel/ncurses/patches/patch-ncurses_base_lib_initscr.c       Sun Mar 31 14:13:17 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-ncurses_base_lib_initscr.c,v 1.3 2024/03/31 14:13:17 js Exp $
+
+QNX's <sys/termio.h> complains if some of the defines from ncurses exist.
+
+--- ncurses/base/lib_initscr.c.orig    2024-03-31 14:07:51.483557685 +0000
++++ ncurses/base/lib_initscr.c
+@@ -42,7 +42,7 @@
+ 
+ #include <curses.priv.h>
+ 
+-#if HAVE_SYS_TERMIO_H
++#if HAVE_SYS_TERMIO_H && !defined(__QNX__)
+ #include <sys/termio.h>               /* needed for ISC */
+ #endif
+ 
Index: pkgsrc/devel/ncurses/patches/patch-ncurses_tinfo_lib_raw.c
diff -u /dev/null pkgsrc/devel/ncurses/patches/patch-ncurses_tinfo_lib_raw.c:1.3
--- /dev/null   Sun Mar 31 14:13:17 2024
+++ pkgsrc/devel/ncurses/patches/patch-ncurses_tinfo_lib_raw.c  Sun Mar 31 14:13:17 2024
@@ -0,0 +1,11 @@
+$NetBSD: patch-ncurses_tinfo_lib_raw.c,v 1.3 2024/03/31 14:13:17 js Exp $
+
+QNX's <sys/termio.h> complains if some of the defines from ncurses exist.
+
+--- ncurses/tinfo/lib_raw.c.orig       2024-03-31 14:08:41.262178407 +0000
++++ ncurses/tinfo/lib_raw.c
+@@ -54,3 +54,3 @@ MODULE_ID("$Id: lib_raw.c,v 1.26 2020/11
+ 
+-#if HAVE_SYS_TERMIO_H
++#if HAVE_SYS_TERMIO_H && !defined(__QNX__)
+ #include <sys/termio.h>               /* needed for ISC */