rpms/Miro/devel Miro.spec,1.22,1.23 Miro-gcc43.patch,1.2,1.3

[Alex Lancaster (alexlan)]

Author: alexlan

Update of /cvs/extras/rpms/Miro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17821

Modified Files:
	Miro.spec Miro-gcc43.patch 
Log Message:
* Tue Mar 11 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1.2-4
- Update GCC 4.3 patch by Christopher Aillon (#434480)



Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Miro.spec	20 Feb 2008 05:52:42 -0000	1.22
+++ Miro.spec	11 Mar 2008 12:44:29 -0000	1.23
@@ -5,7 +5,7 @@
 
 Name:           Miro
 Version:        1.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Miro - Internet TV Player
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -79,6 +79,9 @@
 
 
 %changelog
+* Tue Mar 11 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1.2-4
+- Update GCC 4.3 patch by Christopher Aillon (#434480)
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1.2-3
 - Autorebuild for GCC 4.3
 

Miro-gcc43.patch:

Index: Miro-gcc43.patch
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/Miro-gcc43.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Miro-gcc43.patch	15 Feb 2008 11:16:41 -0000	1.2
+++ Miro-gcc43.patch	11 Mar 2008 12:44:29 -0000	1.3
@@ -1,16 +1,17 @@
 diff -up Miro-1.1.2/portable/libtorrent/include/libtorrent/peer_id.hpp.fix Miro-1.1.2/portable/libtorrent/include/libtorrent/peer_id.hpp
---- Miro-1.1.2/portable/libtorrent/include/libtorrent/peer_id.hpp.fix	2008-02-15 03:45:47.000000000 -0700
+--- Miro-1.1.2/portable/libtorrent/include/libtorrent/peer_id.hpp.gcc43	2008-02-15 03:45:47.000000000 -0700
 +++ Miro-1.1.2/portable/libtorrent/include/libtorrent/peer_id.hpp	2008-02-15 03:46:00.000000000 -0700
-@@ -38,6 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
+@@ -37,7 +37,7 @@ POSSIBILITY OF SUCH DAMAGE.
+ #include <iomanip>
  #include <cctype>
  #include <algorithm>
- #include <string>
+-#include <string>
 +#include <cstring>
  
  #include "libtorrent/config.hpp"
  #include "libtorrent/assert.hpp"
-diff -up Miro-1.1.2/portable/libtorrent/src/file.cpp.fix Miro-1.1.2/portable/libtorrent/src/file.cpp
---- Miro-1.1.2/portable/libtorrent/src/file.cpp.fix	2008-02-15 04:12:42.000000000 -0700
+diff -up Miro-1.1.2/portable/libtorrent/src/file.cpp.gcc43 Miro-1.1.2/portable/libtorrent/src/file.cpp
+--- Miro-1.1.2/portable/libtorrent/src/file.cpp.gcc43	2008-02-15 04:12:42.000000000 -0700
 +++ Miro-1.1.2/portable/libtorrent/src/file.cpp	2008-02-15 04:15:19.000000000 -0700
 @@ -57,6 +57,7 @@ typedef int mode_t;
  #include <sys/stat.h>
@@ -20,3 +21,29 @@
  
  #include <boost/static_assert.hpp>
  // make sure the _FILE_OFFSET_BITS define worked
+
+diff -up Miro-1.1.2/portable/libtorrent/src/entry.cpp.gcc43 Miro-1.1.2/portable/libtorrent/src/entry.cpp
+--- Miro-1.1.2/portable/libtorrent/src/entry.cpp.gcc43	     2008-02-07 21:30:04.000000000 -0500
++++ Miro-1.1.2/portable/libtorrent/src/entry.cpp	     2008-03-02 20:32:44.000000000 -0500
+@@ -32,6 +32,7 @@ POSSIBILITY OF SUCH DAMAGE.
+ 
+ #include "libtorrent/pch.hpp"
+ 
++#include <iostream>
+ #include <algorithm>
+ #include <iomanip>
+ #include "libtorrent/entry.hpp"
+@@ -287,11 +288,11 @@ namespace libtorrent
+ 	void entry::print(std::ostream& os, int indent) const
+ 	{
+ 		TORRENT_ASSERT(indent >= 0);
+-		for (int i = 0; i < indent; ++i) os << " ";
++		for (int i = 0; i < indent; ++i) os << entry(" ");
+ 		switch (m_type)
+ 		{
+ 		case int_t:
+-			os << integer() << "\n";
++			os << integer() << entry("\n");
+ 			break;
+ 		case string_t:
+ 			{