r13621 - in packages/trunk/libclaw/debian: . patches

[Dmitrijs Ledkovs]

Author: xnox
Date: 2012-05-27 16:35:35 +0000 (Sun, 27 May 2012)
New Revision: 13621

Added:
   packages/trunk/libclaw/debian/patches/ftbfs-gcc-4.7.diff
Modified:
   packages/trunk/libclaw/debian/changelog
   packages/trunk/libclaw/debian/patches/series
Log:
* Team upload
* Fix build failure with GCC 4.7, thanks to Matthias Klose (Closes: #671475)

Modified: packages/trunk/libclaw/debian/changelog
===================================================================
--- packages/trunk/libclaw/debian/changelog	2012-05-27 16:22:14 UTC (rev 13620)
+++ packages/trunk/libclaw/debian/changelog	2012-05-27 16:35:35 UTC (rev 13621)
@@ -1,3 +1,10 @@
+libclaw (1.7.0-3) unstable; urgency=low
+
+  * Team upload
+  * Fix build failure with GCC 4.7, thanks to Matthias Klose (Closes: #671475)
+
+ -- Dmitrijs Ledkovs <xnox at debian.org>  Sun, 27 May 2012 17:10:02 +0100
+
 libclaw (1.7.0-2) unstable; urgency=low
 
   * Upload in unstable

Added: packages/trunk/libclaw/debian/patches/ftbfs-gcc-4.7.diff
===================================================================
--- packages/trunk/libclaw/debian/patches/ftbfs-gcc-4.7.diff	                        (rev 0)
+++ packages/trunk/libclaw/debian/patches/ftbfs-gcc-4.7.diff	2012-05-27 16:35:35 UTC (rev 13621)
@@ -0,0 +1,56 @@
+Index: libclaw-1.7.0/claw/impl/socket_stream.tpp
+===================================================================
+--- libclaw-1.7.0.orig/claw/impl/socket_stream.tpp	2012-05-04 11:19:54.732395906 +0000
++++ libclaw-1.7.0/claw/impl/socket_stream.tpp	2012-05-04 11:20:47.852397882 +0000
+@@ -39,7 +39,7 @@
+ ( int read_delay )
+   : m_buffer(read_delay)
+ {
+-  init(&m_buffer);
++  this->init(&m_buffer);
+ } // basic_socket_stream::basic_socket_stream()
+ 
+ /*----------------------------------------------------------------------------*/
+@@ -55,7 +55,7 @@
+ ( const char* address, int port, int read_delay )
+   : m_buffer(read_delay)
+ {
+-  init(&m_buffer);
++  this->init(&m_buffer);
+   open(address, port);
+ } // basic_socket_stream::basic_socket_stream()
+ 
+--- libclaw-1.7.0.orig/claw/impl/basic_socketbuf.tpp
++++ libclaw-1.7.0/claw/impl/basic_socketbuf.tpp
+@@ -178,7 +178,7 @@
+ 		       length, 0 );
+ 
+   if ( write_count >= 0 )
+-    setp( m_output_buffer, m_output_buffer + m_output_buffer_size );
++    this->setp( m_output_buffer, m_output_buffer + m_output_buffer_size );
+   else
+     result = -1;
+ 
+@@ -214,11 +214,11 @@
+ 
+   if ( read_count > 0 )
+     {
+-      setg( m_input_buffer, m_input_buffer, m_input_buffer + read_count);
++      this->setg( m_input_buffer, m_input_buffer, m_input_buffer + read_count);
+       result = this->sgetc();
+     }
+   else
+-    setg( m_input_buffer, m_input_buffer + m_input_buffer_size,
++    this->setg( m_input_buffer, m_input_buffer + m_input_buffer_size,
+           m_input_buffer + m_input_buffer_size );
+ 
+   return result;
+@@ -243,7 +243,7 @@
+       result = traits_type::not_eof(c);
+ 
+       if ( !traits_type::eq_int_type(c, traits_type::eof()) )
+-        sputc(c);
++        this->sputc(c);
+     }
+ 
+   return result;

Modified: packages/trunk/libclaw/debian/patches/series
===================================================================
--- packages/trunk/libclaw/debian/patches/series	2012-05-27 16:22:14 UTC (rev 13620)
+++ packages/trunk/libclaw/debian/patches/series	2012-05-27 16:35:35 UTC (rev 13621)
@@ -1,2 +1,3 @@
 html-doc-paths.diff
 libpng1.5-transition.diff
+ftbfs-gcc-4.7.diff