Using non-POD types as arguments for variadic functions is invalid.

3 files changed, 39 insertions, 1 deletions

diff --git a/x11/nucleo/distinfo b/x11/nucleo/distinfo
index 9da82cf1963..ebae0e92ce5 100644
--- a/x11/nucleo/distinfo
+++ b/x11/nucleo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2011/03/28 07:57:47 wiz Exp $
+$NetBSD: distinfo,v 1.8 2012/07/09 19:06:54 joerg Exp $
 
 SHA1 (nucleo-0.7.5.tar.bz2) = 9a32d7dd1c6ad6348efa6bdc691cb46207a148c0
 RMD160 (nucleo-0.7.5.tar.bz2) = e997d319a425434b9aa32cc472d33e0d68917f8c
@@ -17,3 +17,5 @@ SHA1 (patch-ak) = b88dcb5d6cbc7e23a9b299c6e41e8e605f0bb96f
 SHA1 (patch-al) = 6684c1b1a3b85defaed2a7457fe4ef1f7c79c117
 SHA1 (patch-am) = 1abd0f40ffe2c9ea42fde983bc784d3a10d1ec02
 SHA1 (patch-an) = 775fef088e569f020c3e1d50cf0eb3627de60315
+SHA1 (patch-nucleo_network_xmpp_XmppConnection.H) = e93697fa6dc5ea1ba24142c88d452108cdacb955
+SHA1 (patch-nucleo_network_xmpp_XmppConnection.cxx) = 065d5bae6467d29a624b1c4d6950e7dba63b3cc1
diff --git a/x11/nucleo/patches/patch-nucleo_network_xmpp_XmppConnection.H b/x11/nucleo/patches/patch-nucleo_network_xmpp_XmppConnection.H
new file mode 100644
index 00000000000..a889c50a60c
--- /dev/null
+++ b/x11/nucleo/patches/patch-nucleo_network_xmpp_XmppConnection.H
@@ -0,0 +1,13 @@
+$NetBSD: patch-nucleo_network_xmpp_XmppConnection.H,v 1.1 2012/07/09 19:06:54 joerg Exp $
+
+--- nucleo/network/xmpp/XmppConnection.H.orig	2012-07-06 13:27:17.000000000 +0000
++++ nucleo/network/xmpp/XmppConnection.H
+@@ -108,7 +108,7 @@ namespace nucleo {
+     //     waitFor(-1, "stream:features", 0)
+     //     waitFor(1000, "proceed", "xmlns","urn:ietf:params:xml:ns:xmpp-tls", 0)
+     //     waitFor(-1, "", "id","uniq123", 0)
+-    XmlParser::InBox::iterator waitFor(long milliseconds, cistring tagname, ...) ;
++    XmlParser::InBox::iterator waitFor(long milliseconds, const char *tagname, ...) ;
+ 
+     XmlParser::InBox::iterator waitFor(long milliseconds) { return waitFor(milliseconds,"",0) ; }
+     XmlParser::InBox::iterator wait(void) { return waitFor(-1,"",0) ; }
diff --git a/x11/nucleo/patches/patch-nucleo_network_xmpp_XmppConnection.cxx b/x11/nucleo/patches/patch-nucleo_network_xmpp_XmppConnection.cxx
new file mode 100644
index 00000000000..afc616acdae
--- /dev/null
+++ b/x11/nucleo/patches/patch-nucleo_network_xmpp_XmppConnection.cxx
@@ -0,0 +1,23 @@
+$NetBSD: patch-nucleo_network_xmpp_XmppConnection.cxx,v 1.1 2012/07/09 19:06:54 joerg Exp $
+
+--- nucleo/network/xmpp/XmppConnection.cxx.orig	2012-07-06 13:25:25.000000000 +0000
++++ nucleo/network/xmpp/XmppConnection.cxx
+@@ -616,14 +616,16 @@ namespace nucleo {
+   // -----------------------------------------------------------------------------------------
+ 
+   XmlParser::InBox::iterator
+-  XmppConnection::waitFor(long milliseconds, cistring tagname, ...) {
++  XmppConnection::waitFor(long milliseconds, const char *tagname_, ...) {
+     if (!connection) return inbox.end() ;
+ 
++    cistring tagname(tagname_);
++
+     waiting++ ; // Stop notifying observers right now
+ 
+     std::list<XmlStructure::KeyValuePair> attribs ;
+     va_list ap ;
+-    va_start(ap,tagname) ;
++    va_start(ap,tagname_) ;
+     for (char *key=va_arg(ap, char*); key; key=va_arg(ap, char*))
+ 	 attribs.push_back(XmlStructure::KeyValuePair(key, va_arg(ap, char*))) ;
+     va_end(ap) ;