Upgrade to version 1.0.0

PR:		16485
Submitted by:	maintainer

9 files changed, 110 insertions, 19 deletions

diff --git a/irc/kvirc/files/patch-aa b/irc/kvirc/files/patch-aa
index b911bb193261..dec6a89ee7d2 100644
--- a/irc/kvirc/files/patch-aa
+++ b/irc/kvirc/files/patch-aa
@@ -1,19 +1,13 @@
-*** kvirc/kvi_support.cpp.orig	Mon Jan 25 00:32:30 1999
---- kvirc/kvi_support.cpp	Mon Feb 15 02:10:42 1999
-***************
-*** 21,27 ****
-  
-  //#include "kvi_app.h"
-  #include <ctype.h>
-! #include <netinet/in.h>
-  #include <sys/types.h>
-  #include <sys/socket.h>      
-  #include <qstring.h> //includes <string.h> too
---- 21,27 ----
-  
-  //#include "kvi_app.h"
-  #include <ctype.h>
-! // #include <netinet/in.h>
-  #include <sys/types.h>
-  #include <sys/socket.h>      
-  #include <qstring.h> //includes <string.h> too
+--- src/kvilib/kvi_thread.h	Sat Oct 30 20:18:28 1999
++++ src/kvilib/kvi_thread.h.new	Sat Jan 29 18:29:32 2000
+@@ -24,7 +24,9 @@
+ //
+ 
+ #include <pthread.h>
+-
++#undef connect
++#undef read
++#undef write
+ #include <qsocketnotifier.h>
+ #include <qlist.h>
+ #include <qobject.h>
diff --git a/irc/kvirc/files/patch-ad b/irc/kvirc/files/patch-ad
new file mode 100644
index 000000000000..386d7f4d8190
--- /dev/null
+++ b/irc/kvirc/files/patch-ad
@@ -0,0 +1,11 @@
+--- src/kvirc/kvi_dcc_send.cpp	Sat Dec 18 08:29:12 1999
++++ src/kvirc/kvi_dcc_send.cpp.new	Sat Jan 29 17:47:32 2000
+@@ -770,7 +770,7 @@
+ 	kvi_threadTestCancel();
+ 
+ 	dcc->tmpBuffer.sprintf(__tr("Connected to %s on port %u"),dcc->szAddress.ptr(),dcc->uPort);
+-	KviDccEvent * e = new KviDccEvent(KVI_DCC_EVENT_MSG,dcc->tmpBuffer.ptr());
++	e = new KviDccEvent(KVI_DCC_EVENT_MSG,dcc->tmpBuffer.ptr());
+ 	g_pThreadEventDispatcher->postEvent(e,dcc->dccSendParent);
+ 
+ 	kvi_threadTestCancel();
diff --git a/irc/kvirc/files/patch-ae b/irc/kvirc/files/patch-ae
new file mode 100644
index 000000000000..4731b0a8c1ae
--- /dev/null
+++ b/irc/kvirc/files/patch-ae
@@ -0,0 +1,20 @@
+--- src/kvirc/kvi_dcc_voice.cpp	Sat Dec 18 08:29:36 1999
++++ src/kvirc/kvi_dcc_voice.cpp.new	Sat Jan 29 22:01:29 2000
+@@ -323,7 +323,7 @@
+ 	static int fmt=KVI_FORMAT;
+ 	if(ioctl(dcc->soundFd,SNDCTL_DSP_SETFMT,&fmt)<0)return KVI_ERROR_CanNotInitializeSoundCard;
+ 	static int chans=KVI_NUM_CHANNELS;
+-	if(ioctl(dcc->soundFd,SNDCTL_DSP_CHANNELS,&chans)<0)return KVI_ERROR_CanNotInitializeSoundCard;
++	if (ioctl(dcc->soundFd, SNDCTL_DSP_STEREO, &chans)<0) return KVI_ERROR_CanNotInitializeSoundCard;
+ 	static int speed=KVI_SPEED;
+ 	if(ioctl(dcc->soundFd,SNDCTL_DSP_SPEED,&speed)<0)return KVI_ERROR_CanNotInitializeSoundCard;
+ 	return KVI_ERROR_Success;
+@@ -905,7 +905,7 @@
+ 	kvi_threadTestCancel();
+ 
+ 	dcc->tmpBuffer.sprintf(__tr("Connected to %s on port %u"),dcc->szAddress.ptr(),dcc->uPort);
+-	KviDccEvent * e = new KviDccEvent(KVI_DCC_EVENT_MSG,dcc->tmpBuffer.ptr());
++	e = new KviDccEvent(KVI_DCC_EVENT_MSG,dcc->tmpBuffer.ptr());
+ 	g_pThreadEventDispatcher->postEvent(e,dcc->dccVoiceParent);
+ 
+ 	kvi_threadTestCancel();
diff --git a/irc/kvirc/files/patch-af b/irc/kvirc/files/patch-af
new file mode 100644
index 000000000000..766254ebe6e6
--- /dev/null
+++ b/irc/kvirc/files/patch-af
@@ -0,0 +1,11 @@
+--- src/kvirc/kvi_frame.cpp	Mon Dec 20 19:07:31 1999
++++ src/kvirc/kvi_frame.cpp.new	Sat Jan 29 17:58:45 2000
+@@ -80,6 +80,8 @@
+ 
+ #include "kvi_asyncwhois.h"
+ 
++#undef accept
++
+ #include <qcursor.h>
+ #include <qclipboard.h>
+ #include <qobjcoll.h>
diff --git a/irc/kvirc/files/patch-ag b/irc/kvirc/files/patch-ag
new file mode 100644
index 000000000000..6dc2cdf37152
--- /dev/null
+++ b/irc/kvirc/files/patch-ag
@@ -0,0 +1,12 @@
+--- src/kvirc/kvi_input.cpp	Sat Dec 11 08:09:57 1999
++++ src/kvirc/kvi_input.cpp.new	Sat Jan 29 18:02:53 2000
+@@ -43,8 +43,8 @@
+ #include "kvi_strsub.h"
+ 
+ #include <X11/Xlib.h>
+-
+ #include <ctype.h>
++#undef accept
+ 
+ #include <qnamespace.h>
+ #include <qpopupmenu.h>
diff --git a/irc/kvirc/files/patch-ah b/irc/kvirc/files/patch-ah
new file mode 100644
index 000000000000..d5dce296bbc6
--- /dev/null
+++ b/irc/kvirc/files/patch-ah
@@ -0,0 +1,11 @@
+--- src/kvirc/kvi_dlgscript.cpp	Mon Dec 20 19:19:22 1999
++++ src/kvirc/kvi_dlgscript.cpp.new	Sat Jan 29 17:56:01 2000
+@@ -45,6 +45,8 @@
+ #include "kvi_varcache.h"
+ #include "kvi_style.h"
+ 
++#undef accept
++
+ #include <qlayout.h>
+ #include <qevent.h>
+ #include <qsplitter.h>
diff --git a/irc/kvirc/files/patch-ai b/irc/kvirc/files/patch-ai
new file mode 100644
index 000000000000..7125803900ef
--- /dev/null
+++ b/irc/kvirc/files/patch-ai
@@ -0,0 +1,11 @@
+--- src/kvirc/kvi_listbox.cpp	Sat Dec 18 08:40:17 1999
++++ src/kvirc/kvi_listbox.cpp.new	Sat Jan 29 18:22:23 2000
+@@ -38,6 +38,8 @@
+ #include "kvi_query.h"
+ #include "kvi_event.h"
+ 
++#undef accept
++
+ #include <qbitmap.h>
+ 
+ #include <X11/Xlib.h>
diff --git a/irc/kvirc/files/patch-aj b/irc/kvirc/files/patch-aj
new file mode 100644
index 000000000000..4cad9e758d33
--- /dev/null
+++ b/irc/kvirc/files/patch-aj
@@ -0,0 +1,11 @@
+--- src/kvirc/kvi_helpqml.cpp	Fri Nov 19 11:15:33 1999
++++ src/kvirc/kvi_helpqml.cpp.new	Sat Jan 29 18:28:26 2000
+@@ -29,6 +29,8 @@
+ #include "kvi_options.h"
+ #include "kvi_fileutils.h"
+ 
++#undef read
++
+ #include <qfile.h>
+ #include <qtextstream.h>
+ #include <qnamespace.h>
diff --git a/irc/kvirc/files/patch-ak b/irc/kvirc/files/patch-ak
new file mode 100644
index 000000000000..cd59ff659913
--- /dev/null
+++ b/irc/kvirc/files/patch-ak
@@ -0,0 +1,10 @@
+--- src/kvirc/kvi_ircview.cpp	Sun Dec 19 19:23:13 1999
++++ src/kvirc/kvi_ircview.cpp.new	Sat Jan 29 18:42:14 2000
+@@ -59,6 +59,7 @@
+ #include "kvi_uparser.h"
+ 
+ #include <X11/Xlib.h>
++#undef accept
+ 
+ #include <qbitmap.h>
+ #include <qcursor.h>