diff options
| author | wiz <wiz@pkgsrc.org> | 2003-07-12 12:05:01 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2003-07-12 12:05:01 +0000 |
| commit | b20e82d14a039488b2b82395c9b20a94b717529a (patch) | |
| tree | 5e62f2b379f55ca98831af3accbdc88b605b9868 /chat/licq-gui-console | |
| parent | 442f146eeaa344b47896f27911b74a0bff080cef (diff) | |
| download | pkgsrc-b20e82d14a039488b2b82395c9b20a94b717529a.tar.gz | |
Make it build under -current without using ncurses.
It was using internals of ncurses data structures even though there's
an official API for this...
XXX: might need INCOMPAT_CURSES patterns for some older NetBSD versions,
but I don't know which ones, so I didn't add them.
Diffstat (limited to 'chat/licq-gui-console')
| -rw-r--r-- | chat/licq-gui-console/Makefile | 7 | ||||
| -rw-r--r-- | chat/licq-gui-console/distinfo | 3 | ||||
| -rw-r--r-- | chat/licq-gui-console/patches/patch-aa | 39 |
3 files changed, 42 insertions, 7 deletions
diff --git a/chat/licq-gui-console/Makefile b/chat/licq-gui-console/Makefile index c53cc41887a..932266b0e02 100644 --- a/chat/licq-gui-console/Makefile +++ b/chat/licq-gui-console/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/06/06 12:32:14 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2003/07/12 12:05:01 wiz Exp $ # DISTNAME= licq-1.2.6 @@ -17,11 +17,6 @@ USE_BUILDLINK2= YES GNU_CONFIGURE= YES WRKSRC= ${WRKDIR:=/${DISTNAME}/plugins/console} -# window.cpp: In method `void CWindow::wprintf(char *, ...)': -# window.cpp:150: invalid use of undefined type `struct __window' -# /usr/include/curses.h:220: forward declaration of `struct __window' -USE_NCURSES= yes - .include "../../devel/ncurses/buildlink2.mk" .include "../../mk/pthread.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/licq-gui-console/distinfo b/chat/licq-gui-console/distinfo index 537dccce06b..49ba09b7c20 100644 --- a/chat/licq-gui-console/distinfo +++ b/chat/licq-gui-console/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/04/24 23:57:36 hubertf Exp $ +$NetBSD: distinfo,v 1.2 2003/07/12 12:05:01 wiz Exp $ SHA1 (licq-1.2.6.tar.bz2) = fef2d6d8c9a368313335f3ac0e86128aa24133ef Size (licq-1.2.6.tar.bz2) = 3282918 bytes +SHA1 (patch-aa) = 4678c53369dccdcfd2035ee2cc2d9967fba2e76d diff --git a/chat/licq-gui-console/patches/patch-aa b/chat/licq-gui-console/patches/patch-aa new file mode 100644 index 00000000000..4f3492e5574 --- /dev/null +++ b/chat/licq-gui-console/patches/patch-aa @@ -0,0 +1,39 @@ +$NetBSD: patch-aa,v 1.1 2003/07/12 12:05:01 wiz Exp $ + +--- src/window.cpp.orig Mon Dec 10 15:05:49 2001 ++++ src/window.cpp +@@ -147,7 +147,10 @@ void CWindow::wprintf(char *formatIn, .. + va_list argp; + char formatOut[1024], out[1024]; + unsigned short i = 0, j = 0; +- attr_t save = win->_attrs; ++ attr_t save; ++ short dummy; ++ ++ wattr_get(win, &save, &dummy, NULL); + + va_start(argp, formatIn); + +@@ -163,12 +166,7 @@ void CWindow::wprintf(char *formatIn, .. + { + case 'C': // set color + i++; +-//#if NCURSES_VERSION_PATCH < 990213 +- win->_attrs &= ~A_COLOR; +- win->_attrs |= COLOR_PAIR(va_arg(argp, int)); +-//#else +-// wcolor_set(win, va_arg(argp, short), NULL); +-//#endif ++ wattr_set(win, save & ~A_COLOR, va_arg(argp, short), NULL); + while((formatIn[i]) && (formatIn[i] != '%') && j < 1022) formatOut[j++] = formatIn[i++]; + formatOut[j] = '\0'; + *this << formatOut; +@@ -213,7 +211,7 @@ void CWindow::wprintf(char *formatIn, .. + } + va_end(argp); + +- win->_attrs = save; ++ wattr_set(win, save, dummy, NULL); + } + + |