rpms/museek+/devel museek+-gcc43.patch, NONE, 1.1 museek+.spec, 1.3, 1.4

[Julian Sikorski (belegdol)]

Author: belegdol

Update of /cvs/extras/rpms/museek+/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10830

Modified Files:
	museek+.spec 
Added Files:
	museek+-gcc43.patch 
Log Message:
* Sat Feb  9 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.1.13-2
- Fixed gcc-4.3 build


museek+-gcc43.patch:

--- NEW FILE museek+-gcc43.patch ---
--- Muhelp/string_ext.hh.gcc43	2008-02-09 14:10:18.000000000 +0100
+++ Muhelp/string_ext.hh	2008-02-09 14:10:45.000000000 +0100
@@ -50,6 +50,7 @@
 #include <cctype>
 #include <vector>
 #include <list>
+#include <cstdlib>
 
 // Split a string into a list of strings
 inline unsigned int split(const std::string &src, 
--- Tools/scanner.cc.gcc43	2008-02-09 14:12:33.000000000 +0100
+++ Tools/scanner.cc	2008-02-09 14:13:19.000000000 +0100
@@ -18,6 +18,8 @@
  */
 
 #include <system.h>
+
+#include <cstdlib>
 
 extern "C" {
 # include "mp3.h"
--- Muhelp/Mulog.cc.gcc43	2008-02-09 14:35:42.000000000 +0100
+++ Muhelp/Mulog.cc	2008-02-09 14:36:09.000000000 +0100
@@ -19,6 +19,8 @@
 
 #include <system.h>
 #include <syslog.h>
+
+#include <cstdlib>
 
 #include <Muhelp/Mulog.hh>
 
--- Museek/PeerManager.hh.gcc43	2006-07-06 20:23:50.000000000 +0200
+++ Museek/PeerManager.hh	2008-02-09 14:47:17.000000000 +0100
@@ -95,7 +95,7 @@
 	inline Transfer* uploading() const { return mUploading; }
 	inline void set_uploading(Transfer* uploading) { mUploading = uploading; }
 	
-	void push_download(uint path, const std::wstring& path);
+	void push_download(uint path1, const std::wstring& path);
 	void flush_downloads();
 	
 private:
--- Tools/muscan.cc.gcc43	2007-08-25 18:10:19.000000000 +0200
+++ Tools/muscan.cc	2008-02-09 14:56:17.000000000 +0100
@@ -26,6 +26,7 @@
 #include <Muhelp/Mulog.hh>
 
 #include <iostream>
+#include <cstdlib>
 
 using std::vector;
 using std::string;
--- Museek/Museek.cc.gcc43	2007-04-27 03:05:51.000000000 +0200
+++ Museek/Museek.cc	2008-02-09 15:13:05.000000000 +0100
@@ -36,6 +36,7 @@
 #include <string>
 #include <queue>
 #include <vector>
+#include <cstdlib>
 
 using std::string;
 using std::wstring;
--- Tools/muscand.cc.gcc43	2007-08-25 18:10:19.000000000 +0200
+++ Tools/muscand.cc	2008-02-09 15:30:45.000000000 +0100
@@ -8,6 +8,8 @@
 #include <Muhelp/Mulog.hh>
 
 #include <iostream>
+#include <cstdlib>
+#include <algorithm>
 
 using std::string;
 using std::map;
--- Museek/DistribManager.cc.gcc43	2006-05-26 21:47:57.000000000 +0200
+++ Museek/DistribManager.cc	2008-02-09 15:30:06.000000000 +0100
@@ -27,6 +27,8 @@
 #define MULOG_DOMAIN "Museek.DM"
 #include <Muhelp/Mulog.hh>
 
+#include <algorithm>
+
 using std::vector;
 
 DistribManager::DistribManager(Museek *museek)
--- Museek/PeerManager.cc.gcc43	2006-07-23 00:29:40.000000000 +0200
+++ Museek/PeerManager.cc	2008-02-09 15:35:07.000000000 +0100
@@ -32,6 +32,7 @@
 #include <map>
 #include <queue>
 #include <vector>
+#include <algorithm>
 
 using std::string;
 using std::wstring;
--- Museek/TransferManager.cc.gcc43	2007-04-06 20:02:45.000000000 +0200
+++ Museek/TransferManager.cc	2008-02-09 15:39:05.000000000 +0100
@@ -36,6 +36,7 @@
 #include <sstream>
 #include <vector>
 #include <iostream>
+#include <algorithm>
 
 using std::string;
 using std::wstring;
--- museekd/IfaceConnection.cc.gcc43	2007-02-11 02:07:30.000000000 +0100
+++ museekd/IfaceConnection.cc	2008-02-09 15:43:17.000000000 +0100
@@ -28,6 +28,7 @@
 #include <string>
 #include <map>
 #include <vector>
+#include <cstdlib>
 
 #define MULOG_DOMAIN "museekd.IL"
 #include <Muhelp/Mulog.hh>
--- museekd/main.cc.gcc43	2007-08-25 18:10:19.000000000 +0200
+++ museekd/main.cc	2008-02-09 15:48:09.000000000 +0100
@@ -25,6 +25,7 @@
 #define MULOG_DOMAIN "museekd.MA"
 #include <Muhelp/Mulog.hh>
 #include <fstream>
+#include <cstdlib>
 
 using std::string;
 


Index: museek+.spec
===================================================================
RCS file: /cvs/extras/rpms/museek+/devel/museek+.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- museek+.spec	26 Aug 2007 07:52:34 -0000	1.3
+++ museek+.spec	9 Feb 2008 14:58:24 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:           museek+
 Version:        0.1.13
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Soulseek filesharing client
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://museek-plus.sourceforge.net/
 Source0:        http://dl.sourceforge.net/museek-plus/%{name}-%{version}.tar.bz2
+Patch0:         museek+-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .gcc43
 
 
 %build
@@ -103,6 +105,9 @@
 
 
 %changelog
+* Sat Feb  9 2008 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.1.13-2
+- Fixed gcc-4.3 build
+
 * Tue Aug 25 2007 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.1.13-1
 - Updated to 0.1.13
 - Fixed License tag as per latest guidelines