From 51200dff62bc825ac82bfe20fdefaa10c3bbdc3f Mon Sep 17 00:00:00 2001
From: Tilman Keskinoz <arved@FreeBSD.org>
Date: Tue, 10 Aug 2004 15:59:28 +0000
Subject: Update to 3.0.1

PR:		70089
Submitted by:	Michael Ranner <mranner@inode.at>
---
 irc/kvirc/files/patch-modules-snd                | 30 +++++++++++++++---------
 irc/kvirc/files/patch-src-kvilib-file-kvi_file.h | 21 -----------------
 irc/kvirc/files/patch-src-kvilib-net-kvi_dns.cpp | 25 --------------------
 3 files changed, 19 insertions(+), 57 deletions(-)
 delete mode 100644 irc/kvirc/files/patch-src-kvilib-file-kvi_file.h
 delete mode 100644 irc/kvirc/files/patch-src-kvilib-net-kvi_dns.cpp

(limited to 'irc/kvirc/files')

diff --git a/irc/kvirc/files/patch-modules-snd b/irc/kvirc/files/patch-modules-snd
index c39aa42bbe33..69e102fa3e91 100644
--- a/irc/kvirc/files/patch-modules-snd
+++ b/irc/kvirc/files/patch-modules-snd
@@ -1,11 +1,19 @@
---- src/modules/snd/libkvisnd.cpp	Sat Dec 14 20:30:41 2002
-+++ src/modules/snd/libkvisnd.cpp.patched	Mon Jan  5 19:18:20 2004
-@@ -49,7 +49,7 @@
- 	#ifdef COMPILE_OSS_SUPPORT
- 		#include <fcntl.h>
- 		#include <sys/ioctl.h>
--		#include <linux/soundcard.h>
-+		#include <sys/soundcard.h>
- 		#ifdef COMPILE_AUDIOFILE_SUPPORT
- 			#include <audiofile.h>
- 		#endif //COMPILE_AUDIOFILE_SUPPORT
+*** src/modules/snd/libkvisnd.cpp.orig	Thu Feb  5 14:07:24 2004
+--- src/modules/snd/libkvisnd.cpp	Thu Feb  5 14:07:32 2004
+***************
+*** 53,59 ****
+  			#include <linux/soundcard.h>
+  		#else
+  			// Hint by Andy Fawcett: Thnx :)
+! 			#ifdef HAVE_SYS_SOUNDCARD_H_
+  				#include <sys/soundcard.h>
+  			#else
+  				#warning "Ops.. have no soundcard.h ? ... we're going to fail here :/"
+--- 53,59 ----
+  			#include <linux/soundcard.h>
+  		#else
+  			// Hint by Andy Fawcett: Thnx :)
+! 			#ifdef HAVE_SYS_SOUNDCARD_H
+  				#include <sys/soundcard.h>
+  			#else
+  				#warning "Ops.. have no soundcard.h ? ... we're going to fail here :/"
diff --git a/irc/kvirc/files/patch-src-kvilib-file-kvi_file.h b/irc/kvirc/files/patch-src-kvilib-file-kvi_file.h
deleted file mode 100644
index f091bf246399..000000000000
--- a/irc/kvirc/files/patch-src-kvilib-file-kvi_file.h
+++ /dev/null
@@ -1,21 +0,0 @@
-*** src/kvilib/file/kvi_file.h.orig	Fri Feb 27 17:56:33 2004
---- src/kvilib/file/kvi_file.h	Fri Feb 27 17:10:05 2004
-***************
-*** 59,66 ****
-  	bool save(kvi_u8_t t){ return save((kvi_i8_t)t); };
-  	bool load(kvi_u8_t &t){ return load((kvi_i8_t)t); };;
-  
-! 	bool save(time_t t){ return save((kvi_i32_t)t); };
-! 	bool load(time_t &t){ return load((kvi_i32_t)t); };
-  
-  	bool save(const KviStr &szData);
-  	bool load(KviStr &szData);
---- 59,66 ----
-  	bool save(kvi_u8_t t){ return save((kvi_i8_t)t); };
-  	bool load(kvi_u8_t &t){ return load((kvi_i8_t)t); };;
-  
-! 	//bool save(time_t t){ return save((kvi_i32_t)t); };
-! 	//bool load(time_t &t){ return load((kvi_i32_t)t); };
-  
-  	bool save(const KviStr &szData);
-  	bool load(KviStr &szData);
diff --git a/irc/kvirc/files/patch-src-kvilib-net-kvi_dns.cpp b/irc/kvirc/files/patch-src-kvilib-net-kvi_dns.cpp
deleted file mode 100644
index 7cce3daf10cb..000000000000
--- a/irc/kvirc/files/patch-src-kvilib-net-kvi_dns.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/kvilib/net/kvi_dns.cpp.orig	Mon Jan  5 21:54:02 2004
-+++ src/kvilib/net/kvi_dns.cpp	Mon Jan  5 22:04:18 2004
-@@ -39,6 +39,12 @@
- 	#include <sys/types.h>
- 	#include <sys/socket.h>
- 	#include <netdb.h>
-+	#if __FreeBSD__
-+		#include <osreldate.h>
-+		#if __FreeBSD_version >= 500037
-+			#define	EAI_ADDRFAMILY	 1
-+		#endif
-+	#endif
- #endif
- 
- 
-@@ -101,7 +107,9 @@
- #ifndef COMPILE_ON_WINDOWS
- 		case EAI_ADDRFAMILY: return KviError_unsupportedAddressFamily; break;
- #endif
-+#if __FreeBSD_version <= 500037
- 		case EAI_NODATA:     return KviError_validNameButNoIpAddress; break;
-+#endif
- 		case EAI_FAIL:       return KviError_unrecoverableNameserverError; break;
- 		case EAI_AGAIN:      return KviError_dnsTemporaneousFault; break;
- 		// this should never happen
-- 
cgit v1.2.3