kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

news/tin: Build fix for the option combination curses(pdcurses) + icu

Browse source
This commit is contained in:
micha 2021-09-01 16:43:59 +00:00
parent cc80dbfbbb
commit 27047707d4
3 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
news/tin/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.29 2021/08/27 17:45:26 micha Exp $
$NetBSD: distinfo,v 1.30 2021/09/01 16:43:59 micha Exp $
SHA1 (tin-2.6.0.tar.xz) = af5d36e909876f0fe7b17bd30995fb4a3e9efa6c
RMD160 (tin-2.6.0.tar.xz) = cbc37af5a42aadbd6df835400c696c5315d0a5e5
@ -8,5 +8,5 @@ SHA1 (patch-Makefile) = 7f9048d31e70d9630ba6511d834db5d0c60a7de1
SHA1 (patch-configure) = 124a69bda73e55fbde04076f6f1b4ec9293a1b31
SHA1 (patch-configure.in) = 9a43c69dc722b3613324afca34ae79b9f369f7ae
SHA1 (patch-include_autoconf.hin) = e35e4cbf9ed74b8bd50542f4b9bb03be6343187d
SHA1 (patch-include_tcurses.h) = 37aab6936786ee1639416b1f5ab7f440f9118952
SHA1 (patch-include_tcurses.h) = 71c2d0ca8432c427e6015a7ddda98991674186ff
SHA1 (patch-src_Makefile.in) = f6fbe7aee324cd844ed6e1870d3c871c247e06ce

3
news/tin/options.mk
View file

@ -1,10 +1,9 @@
# $NetBSD: options.mk,v 1.20 2021/08/27 17:45:26 micha Exp $
# $NetBSD: options.mk,v 1.21 2021/09/01 16:43:59 micha Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.tin
PKG_OPTIONS_REQUIRED_GROUPS= display
PKG_OPTIONS_GROUP.display= curses termcap
PKG_SUPPORTED_OPTIONS= canlock icu inet6 nls tin-use-inn-spool
# Combination of options curses(configured to pdcurses) and icu does not work
# curses(configured to curses) still does not work on NetBSD, see PR #51819
# Suggest termcap instead of curses.
PKG_SUGGESTED_OPTIONS= canlock inet6 nls termcap

17
news/tin/patches/patch-include_tcurses.h
View file

@ -1,10 +1,21 @@
$NetBSD: patch-include_tcurses.h,v 1.1 2021/08/27 17:45:26 micha Exp $
$NetBSD: patch-include_tcurses.h,v 1.2 2021/09/01 16:43:59 micha Exp $
Backported upstream patch for ncurses (without w).
Backported upstream patch for ncurses (without w) and pdcurses.
--- include/tcurses.h.orig 2021-07-13 05:56:52.000000000 +0000
+++ include/tcurses.h
@@ -75,7 +75,7 @@
@@ -44,7 +44,10 @@
# if defined(USE_CURSES) || defined(NEED_CURSES_H)
# ifdef HAVE_XCURSES
+# undef bool
+# define bool XCursesBool
# include <xcurses.h>
+# undef bool
# define getattrs(w) (w)->_attrs
# else
# if defined(HAVE_NCURSESW_NCURSES_H)
@@ -75,7 +78,7 @@
# endif /* HAVE_NCURSES_NCURSES_H */
# endif /* HAVE_NCURSES_H */
# endif /* HAVE_NCURSESW_NCURSES_H */