Fix building of cygnal sshclient, bug #391915.

(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)

3 files changed, 100 insertions, 2 deletions

diff --git a/www-plugins/gnash/ChangeLog b/www-plugins/gnash/ChangeLog
index bca9fd865f5d..3a55fd87b074 100644
--- a/www-plugins/gnash/ChangeLog
+++ b/www-plugins/gnash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-plugins/gnash
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.68 2011/11/25 17:39:19 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/ChangeLog,v 1.69 2011/11/26 02:24:20 chithanh Exp $
+
+  26 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  gnash-0.8.9-r2.ebuild, +files/gnash-0.8.9-cygnal-sshclient.patch:
+  Fix building of cygnal sshclient, bug #391915.
 
 *gnash-0.8.9-r2 (25 Nov 2011)
 
diff --git a/www-plugins/gnash/files/gnash-0.8.9-cygnal-sshclient.patch b/www-plugins/gnash/files/gnash-0.8.9-cygnal-sshclient.patch
new file mode 100644
index 000000000000..52793e576ce9
--- /dev/null
+++ b/www-plugins/gnash/files/gnash-0.8.9-cygnal-sshclient.patch
@@ -0,0 +1,91 @@
+diff -ur a/cygnal/libnet/sshclient.cpp b/cygnal/libnet/sshclient.cpp
+--- a/cygnal/libnet/sshclient.cpp	2011-02-26 19:11:07.000000000 +0100
++++ b/cygnal/libnet/sshclient.cpp	2011-11-26 02:58:31.314227874 +0100
+@@ -103,7 +103,7 @@
+ 
+ // Read bytes from the already opened SSH connection
+ int
+-SSHClient::sshRead(amf::Buffer &buf)
++SSHClient::sshRead(cygnal::Buffer &buf)
+ {
+     GNASH_REPORT_FUNCTION;
+ 
+@@ -125,7 +125,7 @@
+ 
+ // Write bytes to the already opened SSH connection
+ int
+-SSHClient::sshWrite(amf::Buffer &buf)
++SSHClient::sshWrite(cygnal::Buffer &buf)
+ {
+     GNASH_REPORT_FUNCTION;
+ 
+@@ -401,7 +401,7 @@
+ }
+ 
+ int 
+-SSHClient::readChannel(ssh_channel channel, amf::Buffer &buf)
++SSHClient::readChannel(ssh_channel channel, cygnal::Buffer &buf)
+ {
+ //    GNASH_REPORT_FUNCTION;
+     int ret = -1;
+@@ -416,7 +416,7 @@
+ }
+ 
+ int 
+-SSHClient::writeChannel(ssh_channel channel, amf::Buffer &buf)
++SSHClient::writeChannel(ssh_channel channel, cygnal::Buffer &buf)
+ {
+ //    GNASH_REPORT_FUNCTION;
+     int ret = -1;
+diff -ur a/cygnal/libnet/sshclient.h b/cygnal/libnet/sshclient.h
+--- a/cygnal/libnet/sshclient.h	2011-02-26 19:11:07.000000000 +0100
++++ b/cygnal/libnet/sshclient.h	2011-11-26 02:58:57.203229777 +0100
+@@ -32,6 +32,7 @@
+ #include <libssh/sftp.h>
+ }
+ 
++#include "dsodefs.h"
+ #include "cque.h"
+ #include "network.h"
+ #include "buffer.h"
+@@ -56,12 +57,12 @@
+     ~SSHClient();
+ 
+     // Read bytes from the already opened SSH connection
+-    int sshRead(amf::Buffer &buf);
++    int sshRead(cygnal::Buffer &buf);
+     int sshRead(boost::uint8_t *buf, size_t length);
+     int sshRead(std::string &buf);
+ 
+     // Write bytes to the already opened SSH connection
+-    int sshWrite(amf::Buffer &buf);
++    int sshWrite(cygnal::Buffer &buf);
+     int sshWrite(const boost::uint8_t *buf, size_t length);
+     int sshWrite(std::string &buf);
+ 
+@@ -104,13 +105,13 @@
+     // Accessors
+     ssh_channel getChannel() { return _channel; };
+     ssh_session getSession() { return _session; };
+-    boost::shared_ptr<amf::Buffer> &getBuffer()  { return _buffer; };
++    boost::shared_ptr<cygnal::Buffer> &getBuffer()  { return _buffer; };
+ 
+     // Dump internal data to the screen for debugging
+     void dump();
+  protected:
+-    int readChannel (ssh_channel channel, amf::Buffer &buf);
+-    int writeChannel(ssh_channel channel, amf::Buffer &buf);
++    int readChannel (ssh_channel channel, cygnal::Buffer &buf);
++    int writeChannel(ssh_channel channel, cygnal::Buffer &buf);
+ 
+     std::string		_hostname;
+     std::string		_user;
+@@ -126,7 +127,7 @@
+     ssh_session _session;
+     ssh_channel	_channel;
+ #endif
+-    boost::shared_ptr<amf::Buffer> _buffer;
++    boost::shared_ptr<cygnal::Buffer> _buffer;
+ };
+     
+ } // end of gnash namespace
diff --git a/www-plugins/gnash/gnash-0.8.9-r2.ebuild b/www-plugins/gnash/gnash-0.8.9-r2.ebuild
index e0cb2a913916..b55a140d4234 100644
--- a/www-plugins/gnash/gnash-0.8.9-r2.ebuild
+++ b/www-plugins/gnash/gnash-0.8.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.9-r2.ebuild,v 1.1 2011/11/25 17:39:19 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.9-r2.ebuild,v 1.2 2011/11/26 02:24:20 chithanh Exp $
 
 EAPI=3
 CMAKE_REQUIRED="never"
@@ -171,6 +171,9 @@ src_prepare() {
 	# Fix building on ppc64, bug #342535
 	use ppc64 && append-flags -mminimal-toc
 
+	# Fix building of cygnal sshclient, bug #391915
+	epatch "${FILESDIR}"/${PN}-0.8.9-cygnal-sshclient.patch
+
 	# Fix kde multilib library path, bug #391283
 	epatch "${FILESDIR}"/${PN}-0.8.9-kde4-libdir.patch