From owner-svn-ports-head@freebsd.org Tue Mar 30 10:24:26 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6F2ED5C19FC; Tue, 30 Mar 2021 10:24:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4F8ltL2k5Xz4Xg2; Tue, 30 Mar 2021 10:24:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5046024E0F; Tue, 30 Mar 2021 10:24:26 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12UAOQ6m077673; Tue, 30 Mar 2021 10:24:26 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12UAOQiU077672; Tue, 30 Mar 2021 10:24:26 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <202103301024.12UAOQiU077672@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Tue, 30 Mar 2021 10:24:26 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: bapt X-SVN-Commit-Paths: in head/math/sc-im: . files X-SVN-Commit-Revision: 569546 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Mar 2021 10:24:26 -0000 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 post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sc-im -.include +.include 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?= +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 + } + } + }