package libircclient: fix missing header

1 files changed, 43 insertions, 20 deletions

diff --git a/src/libircclient-1-fixes.patch b/src/libircclient-1-fixes.patch
index 023f284..755d0f8 100644
--- a/src/libircclient-1-fixes.patch
+++ b/src/libircclient-1-fixes.patch
@@ -3,18 +3,18 @@ See doc/index.html for further information.
 
 Contains ad hoc patches for cross building.
 
-From e7a3c62440a8c89c48914d8d45bb2e3d14b9bbd8 Mon Sep 17 00:00:00 2001
+From f959d621bbd143eba764a97605dc05c53340ea90 Mon Sep 17 00:00:00 2001
 From: mingw-cross-env
 Date: Thu, 23 Jun 2011 15:47:52 +1000
-Subject: [PATCH 1/2] IPv6 support is broken and is forced to be disabled.
+Subject: [PATCH 1/3] IPv6 support is broken and is forced to be disabled.
 
 This place is sufficient - IPv6 initialisation will now cause an error.
 
 diff --git a/src/libircclient.c b/src/libircclient.c
-index 5d266c0..1ec11c1 100644
+index 21a50de..69d2225 100644
 --- a/src/libircclient.c
 +++ b/src/libircclient.c
-@@ -194,7 +194,7 @@ int irc_connect6 (irc_session_t * session,
+@@ -239,7 +239,7 @@ int irc_connect6 (irc_session_t * session,
  			const char * username,
  			const char * realname)
  {
@@ -22,22 +22,22 @@ index 5d266c0..1ec11c1 100644
 +#if 0
  	struct sockaddr_in6 saddr;
  	struct addrinfo ainfo, *res = NULL;
- 	char portStr[32];
+ 	char portStr[32], *p;
 -- 
-1.7.3.4
+1.7.8.3
 
 
-From 78326f1af372da340197c15897b54fdd45652bf3 Mon Sep 17 00:00:00 2001
+From 86a3ef0fc754cb1fb25124414b32bcfc65d413d3 Mon Sep 17 00:00:00 2001
 From: mingw-cross-env
 Date: Thu, 23 Jun 2011 15:48:33 +1000
-Subject: [PATCH 2/2] Use the proper WIN32 define.
+Subject: [PATCH 2/3] Use the proper WIN32 define.
 
 
 diff --git a/include/libircclient.h b/include/libircclient.h
-index c78f3b1..23d1a51 100644
+index 2dcd44c..af7d769 100644
 --- a/include/libircclient.h
 +++ b/include/libircclient.h
-@@ -43,7 +43,7 @@
+@@ -44,7 +44,7 @@
  #ifndef INCLUDE_LIBIRC_H
  #define INCLUDE_LIBIRC_H
  
@@ -47,20 +47,21 @@ index c78f3b1..23d1a51 100644
  #else
  	#include <winsock2.h>
 diff --git a/src/portable.c b/src/portable.c
-index 8071c13..ab8a57b 100644
+index 81e0d7b..de85d27 100644
 --- a/src/portable.c
 +++ b/src/portable.c
-@@ -13,7 +13,7 @@
+@@ -12,7 +12,8 @@
+  * License for more details.
   */
  
- 
 -#if !defined (WIN32)
++
 +#if !defined (_WIN32)
  	#include "config.h"
  	#include <stdio.h>
  	#include <stdarg.h>
-@@ -65,7 +65,7 @@
- 
+@@ -71,7 +72,7 @@
+ #if defined (ENABLE_THREADS)
  static inline int libirc_mutex_init (port_mutex_t * mutex)
  {
 -#if defined (WIN32)
@@ -68,7 +69,7 @@ index 8071c13..ab8a57b 100644
  	InitializeCriticalSection (mutex);
  	return 0;
  #elif defined (PTHREAD_MUTEX_RECURSIVE)
-@@ -78,13 +78,13 @@ static inline int libirc_mutex_init (port_mutex_t * mutex)
+@@ -84,13 +85,13 @@ static inline int libirc_mutex_init (port_mutex_t * mutex)
  
  	return pthread_mutex_init (mutex, 0);
  
@@ -84,7 +85,7 @@ index 8071c13..ab8a57b 100644
  	DeleteCriticalSection (mutex);
  #else
  	pthread_mutex_destroy (mutex);
-@@ -94,7 +94,7 @@ static inline void libirc_mutex_destroy (port_mutex_t * mutex)
+@@ -100,7 +101,7 @@ static inline void libirc_mutex_destroy (port_mutex_t * mutex)
  
  static inline void libirc_mutex_lock (port_mutex_t * mutex)
  {
@@ -93,7 +94,7 @@ index 8071c13..ab8a57b 100644
  	EnterCriticalSection (mutex);
  #else
  	pthread_mutex_lock (mutex);
-@@ -104,7 +104,7 @@ static inline void libirc_mutex_lock (port_mutex_t * mutex)
+@@ -110,7 +111,7 @@ static inline void libirc_mutex_lock (port_mutex_t * mutex)
  
  static inline void libirc_mutex_unlock (port_mutex_t * mutex)
  {
@@ -103,7 +104,7 @@ index 8071c13..ab8a57b 100644
  #else
  	pthread_mutex_unlock (mutex);
 diff --git a/src/sockets.c b/src/sockets.c
-index c2b33f1..e73f62c 100644
+index 0925fed..0cbb14a 100644
 --- a/src/sockets.c
 +++ b/src/sockets.c
 @@ -15,7 +15,7 @@
@@ -143,5 +144,27 @@ index c2b33f1..e73f62c 100644
  #else
  	closesocket (*sock);
 -- 
-1.7.3.4
+1.7.8.3
+
+
+From 7f37c588aeeed6d3fdb7ed15c6d5e6f123b2a2a8 Mon Sep 17 00:00:00 2001
+From: mingw-cross-env
+Date: Sun, 22 Jan 2012 22:39:23 +0100
+Subject: [PATCH 3/3] fix missing header
+
+
+diff --git a/include/libircclient.h b/include/libircclient.h
+index af7d769..57c8516 100644
+--- a/include/libircclient.h
++++ b/include/libircclient.h
+@@ -131,6 +131,7 @@ typedef void (*irc_dcc_callback_t) (irc_session_t * session, irc_dcc_t id, int s
+ #include "libirc_errors.h"
+ #include "libirc_events.h"
+ #include "libirc_options.h"
++#include "libirc_rfcnumeric.h"
+ #undef IN_INCLUDE_LIBIRC_H
+ 
+ 
+-- 
+1.7.8.3