Since all the licq packages use the same distfile and need the same

patches, it is better to provide them once for all packages.

Fixed building the gui plugins.

4 files changed, 70 insertions, 1 deletions

diff --git a/chat/licq-core/distinfo b/chat/licq-core/distinfo
index aea3e3cc930..50b7c614ebe 100644
--- a/chat/licq-core/distinfo
+++ b/chat/licq-core/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2007/09/29 12:51:17 rillig Exp $
+$NetBSD: distinfo,v 1.9 2007/10/10 10:20:32 rillig Exp $
 
 SHA1 (licq-1.2.6.tar.bz2) = fef2d6d8c9a368313335f3ac0e86128aa24133ef
 RMD160 (licq-1.2.6.tar.bz2) = fcb2e19bf7d30c1824392a9be3ea1619072e4ce5
@@ -12,3 +12,6 @@ SHA1 (patch-af) = 86a99ad96c56f0e53547025a7c5536a01fd2a8b8
 SHA1 (patch-ag) = a8924861f010c4052ee5ade8937a064b675b3a37
 SHA1 (patch-ah) = cec92dd4d617f47e98339b7b662052dc06d4d220
 SHA1 (patch-ai) = f8cebb4e821a1b648e69135db5dd232a9459773a
+SHA1 (patch-ca) = 36475ac0642e8908a2ae6a8913efa25ba09af1c3
+SHA1 (patch-qa) = 92cac6e7248275ba4c1a611262e56dd2a33ffe73
+SHA1 (patch-qb) = 2fa14d43c3d415947fdd67db30642b31030e5a3b
diff --git a/chat/licq-core/patches/patch-ca b/chat/licq-core/patches/patch-ca
new file mode 100644
index 00000000000..2556b9545e0
--- /dev/null
+++ b/chat/licq-core/patches/patch-ca
@@ -0,0 +1,39 @@
+$NetBSD: patch-ca,v 1.1 2007/10/10 10:20:32 rillig Exp $
+
+--- plugins/console/src/window.cpp.orig	Mon Dec 10 15:05:49 2001
++++ plugins/console/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, int), 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);
+ }
+ 
+ 
diff --git a/chat/licq-core/patches/patch-qa b/chat/licq-core/patches/patch-qa
new file mode 100644
index 00000000000..45214a8c30d
--- /dev/null
+++ b/chat/licq-core/patches/patch-qa
@@ -0,0 +1,15 @@
+$NetBSD: patch-qa,v 1.1 2007/10/10 10:20:32 rillig Exp $
+
+--- plugins/qt-gui/configure.orig	2006-04-28 10:36:59.000000000 +0000
++++ plugins/qt-gui/configure
+@@ -17307,8 +17307,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+     save_LIBS="$LIBS"
+ 
+     CXXFLAGS="$CXXFLAGS $QT_INCLUDES $X_CFLAGS"
+-    LDFLAGS="$X_LIBS $QT_LDFLAGS $LDFLAGS"
+-    LIBS="$LIB_QT $X_PRE_LIBS -lX11 -lXext $LIBS"
++    LDFLAGS="$X_LIBS $QT_LDFLAGS $LDFLAGS $PTHREAD_LDFLAGS"
++    LIBS="$LIB_QT $X_PRE_LIBS -lX11 -lXext $LIBS $PTHREAD_LIBS"
+ 
+     cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
diff --git a/chat/licq-core/patches/patch-qb b/chat/licq-core/patches/patch-qb
new file mode 100644
index 00000000000..90544c3a5fc
--- /dev/null
+++ b/chat/licq-core/patches/patch-qb
@@ -0,0 +1,12 @@
+$NetBSD: patch-qb,v 1.1 2007/10/10 10:20:32 rillig Exp $
+
+--- plugins/qt-gui/src/messagebox.h.orig	2001-11-22 20:27:00.000000000 +0000
++++ plugins/qt-gui/src/messagebox.h	2007-10-10 10:11:48.000000000 +0000
+@@ -8,6 +8,7 @@
+ 
+ class CUserEvent;
+ class MsgView;
++class CMsgViewTips;
+ 
+ //=====UserViewItem================================================================================
+ class MsgViewItem : public QListViewItem