Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 30 Mar 2021 10:24:26 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r569546 - in head/math/sc-im: . files
Message-ID:  <202103301024.12UAOQiU077672@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Tue Mar 30 10:24:25 2021
New Revision: 569546
URL: https://svnweb.freebsd.org/changeset/ports/569546

Log:
  Add a patch from upstream fixing build with older ncurses

Added:
  head/math/sc-im/files/patch-ncurses   (contents, props changed)
Modified:
  head/math/sc-im/Makefile

Modified: head/math/sc-im/Makefile
==============================================================================
--- head/math/sc-im/Makefile	Tue Mar 30 07:46:10 2021	(r569545)
+++ head/math/sc-im/Makefile	Tue Mar 30 10:24:25 2021	(r569546)
@@ -25,7 +25,8 @@ LIBS+=		-lxlsreader -lxlsxwriter
 MAKE_ENV+=	LDLIBS="${LIBS}"
 MAKE_ARGS+=	CC="${CC}" prefix="${PREFIX}" MANDIR="${MANPREFIX}/man/man1"
 
+.include <bsd.port.pre.mk>
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sc-im
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Added: head/math/sc-im/files/patch-ncurses
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/sc-im/files/patch-ncurses	Tue Mar 30 10:24:25 2021	(r569546)
@@ -0,0 +1,26 @@
+From 34b4619e1c856dd4f48f9ea55cff603ca6d19a98 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9s?= <andmarti@gmail.com>
+Date: Mon, 22 Mar 2021 09:04:56 -0300
+Subject: [PATCH] work on issue #482. added init_extended_pair according to
+ NCURSES version macros..
+
+---
+ src/tui.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/tui.c b/src/tui.c
+index ae9d9a91..c6aa73fe 100644
+--- tui.c
++++ tui.c
+@@ -1480,7 +1480,11 @@ void ui_start_colors() {
+              * NOTE: calling init_pair with -1 sets it with default
+              * terminal foreground and background colors
+              */
++#if defined(NCURSES_VERSION_MAJOR) && (( NCURSES_VERSION_MAJOR > 5 && defined(NCURSES_VERSION_MINOR) && NCURSES_VERSION_MINOR > 0) || NCURSES_VERSION_MAJOR > 6)
+             init_extended_pair( i*def+j+1, i-1, j-1); // i is fg and j is bg
++#else
++            init_pair(i*def+j+1, i-1, j-1); // i is fg and j is bg
++#endif
+         }
+     }
+ }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103301024.12UAOQiU077672>