pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

tig: switch to using devel/ncursesw for now.



Module Name:	pkgsrc-wip
Committed By:	Frederic Cambus <fred%statdns.com@localhost>
Pushed By:	fcambus
Date:		Fri Jan 22 17:26:06 2021 +0100
Changeset:	60f3ac19fd169f9b094138098b9cd2303bf212d8

Modified Files:
	tig/Makefile
	tig/distinfo
Removed Files:
	tig/patches/patch-src_view.c

Log Message:
tig: switch to using devel/ncursesw for now.

There were still numerous display issues with NetBSD curses(3) making
tig unusable. The version of tig in pkgsrc is stuck at 1.2.1 which is very
old now, so let's move forward.

Discussed with leot@.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=60f3ac19fd169f9b094138098b9cd2303bf212d8

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

diffstat:
 tig/Makefile                 |  6 ++----
 tig/distinfo                 |  1 -
 tig/patches/patch-src_view.c | 39 ---------------------------------------
 3 files changed, 2 insertions(+), 44 deletions(-)

diffs:
diff --git a/tig/Makefile b/tig/Makefile
index 2cf052dd3b..6f26c3ac58 100644
--- a/tig/Makefile
+++ b/tig/Makefile
@@ -16,7 +16,7 @@ DEPENDS+=	git-base-[0-9]*:../../devel/git-base
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake
-FAKE_NCURSES=	yes
+USE_NCURSES=	yes	# Display issues with NetBSD curses(3)
 
 CONF_FILES=	${EGDIR}/tigrc ${PKG_SYSCONFDIR}/tigrc
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
@@ -45,9 +45,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}/${EGDIR} && \
 	${INSTALL_DATA} ${WRKSRC}/tigrc ${DESTDIR}/${EGDIR}
 
-USE_CURSES=		getsyx
-
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/ncursesw/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/tig/distinfo b/tig/distinfo
index f48e855b91..49424ce9d9 100644
--- a/tig/distinfo
+++ b/tig/distinfo
@@ -7,4 +7,3 @@ Size (tig-2.5.0.tar.gz) = 1143004 bytes
 SHA1 (patch-Makefile) = 304457804ce9a342e903ec25c1d7d6d9cf353cf5
 SHA1 (patch-contrib_config.make-Darwin) = 4cd1fb37d3f7c6d6005d676fa10c0f16ac437707
 SHA1 (patch-include_tig_tig.h) = 2c3610048421d1410c7ed73fb5f39198e1062299
-SHA1 (patch-src_view.c) = f6aa68992ebe79ce8fbf161afcb0dfc52f7e4881
diff --git a/tig/patches/patch-src_view.c b/tig/patches/patch-src_view.c
deleted file mode 100644
index 1f315d44aa..0000000000
--- a/tig/patches/patch-src_view.c
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD$
-
-Always redraw the entire view instead of only two lines.
-
-With NetBSD curses(3) where `main' and `diff' views are present only the current
-two entries are visible in the `main' view.  To reproduce that, after invoking
-`tig':
-
- - press enter
- - press down arrow
-
-Workaround that by redrawing the entire view.
-
---- src/view.c.orig	2018-07-27 03:18:19.000000000 +0000
-+++ src/view.c
-@@ -262,17 +262,23 @@ move_view(struct view *view, enum reques
- 		return;
- 	}
- 
-+	redraw_view(view);
-+
-+#if 0
- 	/* Repaint the old "current" line if we be scrolling */
- 	if (ABS(steps) < view->height)
- 		draw_view_line(view, view->pos.lineno - steps - view->pos.offset);
-+#endif
- 
- 	if (scroll_steps) {
- 		do_scroll_view(view, scroll_steps);
- 		return;
- 	}
- 
-+#if 0
- 	/* Draw the current line */
- 	draw_view_line(view, view->pos.lineno - view->pos.offset);
-+#endif
- 
- 	wnoutrefresh(view->win);
- 	report_clear();


Home | Main Index | Thread Index | Old Index