[fatrat] workaround bug in gloox

[jvcelak]

commit 1dd7b54870f1b6b5749190d764e5920828dddaa4
Author: Jan Vcelak <jvcelak at fedoraproject.org>
Date:   Tue Nov 26 20:41:30 2013 +0100

    workaround bug in gloox

 fatrat-workaround-gloox-bug.patch |   48 +++++++++++++++++++++++++++++++++++++
 fatrat.spec                       |    7 ++++-
 2 files changed, 54 insertions(+), 1 deletions(-)
---
diff --git a/fatrat-workaround-gloox-bug.patch b/fatrat-workaround-gloox-bug.patch
new file mode 100644
index 0000000..df38928
--- /dev/null
+++ b/fatrat-workaround-gloox-bug.patch
@@ -0,0 +1,48 @@
+Current version of Gloox in Fedora contains a bug in header file causing compilation to fail.
+
+error: call of overloaded ‘send(std::string)’ is ambiguous
+
+/usr/include/gloox/messagesession.h:
+virtual void send( const std::string& message );
+virtual void send( const std::string& message, const std::string& subject = EmptyString, const StanzaExtensionList& sel = StanzaExtensionList() );
+
+Author: Jan Vcelak <jvcelak at fedoraproject.org>
+
+---
+ src/remote/JabberService.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/remote/JabberService.cpp b/src/remote/JabberService.cpp
+index 58b13a4..d2bb964 100644
+--- a/src/remote/JabberService.cpp
++++ b/src/remote/JabberService.cpp
+@@ -290,7 +290,7 @@ void JabberService::handleMessageGeneric(gloox::Stanza* stanza, gloox::MessageSe
+ 			else
+ 				msg = tr("Password rejected.");
+ 		}
+-		session->send( qstring2stdstring(msg) );
++		session->send( qstring2stdstring(msg), gloox::EmptyString );
+ 	}
+ 	else
+ 	{
+@@ -298,7 +298,7 @@ void JabberService::handleMessageGeneric(gloox::Stanza* stanza, gloox::MessageSe
+ 		{
+ 			msg = tr("Bye.");
+ 			conn->chatState->setChatState(gloox::ChatStateGone);
+-			session->send( msg.toStdString() );
++			session->send( msg.toStdString(), gloox::EmptyString );
+ 			m_pClient->disposeMessageSession(session);
+ 			
+ 			Logger::global()->enterLogMessage("Jabber", tr("%1 logged out").arg(from.full().c_str()));
+@@ -309,7 +309,7 @@ void JabberService::handleMessageGeneric(gloox::Stanza* stanza, gloox::MessageSe
+ 		{
+ 			msg = processCommand(conn, message);
+ 			if(!msg.isEmpty())
+-				session->send( qstring2stdstring(msg) );
++				session->send( qstring2stdstring(msg), gloox::EmptyString );
+ 		}
+ 	}
+ }
+-- 
+1.8.4.2
+
diff --git a/fatrat.spec b/fatrat.spec
index 099d77d..e13190c 100644
--- a/fatrat.spec
+++ b/fatrat.spec
@@ -2,7 +2,7 @@
 
 Name: fatrat
 Version: 1.2.0
-Release: 0.15.beta2%{?dist}
+Release: 0.16.beta2%{?dist}
 Epoch: 1
 Summary: Feature-rich download manager
 Group: Applications/Internet
@@ -11,6 +11,7 @@ URL: http://fatrat.dolezel.info
 Source0: http://www.dolezel.info/download/data/fatrat/fatrat-%{version}_beta2.tar.xz
 
 Patch0: fatrat-headers.patch
+Patch1: fatrat-workaround-gloox-bug.patch
 
 Patch10: fatrat-remove-java-applet.patch
 
@@ -56,6 +57,7 @@ This package contains header files needed for development of FatRat plugins.
 %prep
 %setup -q -n %{name}-%{version}_beta2
 %patch0 -p1
+%patch1 -p1
 
 # remove Java web-interface applet
 rm -rf data/remote/applet.html data/remote/applet/
@@ -108,6 +110,9 @@ install -d -m 0755 %{buildroot}%{_libdir}/fatrat/plugins
 %{_includedir}/fatrat
 
 %changelog
+* Tue Nov 26 2013 Jan Vcelak <jvcelak at fedoraproject.org> 1:1.2.0-0.16.beta2
+- workaround bug in gloox header file, fixes compilation
+
 * Sun Nov 17 2013 Jan Vcelak <jvcelak at fedoraproject.org> 1:1.2.0-0.15.beta2
 - rebuild due to broken deps
 - update unversioned doc dir