[gentoo-commits] gentoo-x86 commit in www-plugins/gnash/files: gnash-0.8.9-cygnal-sshclient.patch

[Chi-Thanh Christopher Nguyen (chithanh)]

chithanh    11/11/26 02:24:20

  Added:                gnash-0.8.9-cygnal-sshclient.patch
  Log:
  Fix building of cygnal sshclient, bug #391915.
  
  (Portage version: 2.2.0_alpha77/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  www-plugins/gnash/files/gnash-0.8.9-cygnal-sshclient.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/gnash/files/gnash-0.8.9-cygnal-sshclient.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-plugins/gnash/files/gnash-0.8.9-cygnal-sshclient.patch?rev=1.1&content-type=text/plain

Index: gnash-0.8.9-cygnal-sshclient.patch
===================================================================
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