Add patch to fix compilation with gcc-4.3 and gcc-4.4 by Gene Seto <geneseto AT hotmail DOT com>; bug #251557

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 134 insertions, 6 deletions

diff --git a/net-p2p/qtella/ChangeLog b/net-p2p/qtella/ChangeLog
index 700f9a3c18ee..63712e03eb38 100644
--- a/net-p2p/qtella/ChangeLog
+++ b/net-p2p/qtella/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-p2p/qtella
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qtella/ChangeLog,v 1.31 2008/07/27 22:12:53 carlo Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qtella/ChangeLog,v 1.32 2009/06/29 00:04:59 halcy0n Exp $
+
+  28 Jun 2009; Mark Loeser <halcy0n@gentoo.org> qtella-0.7.0-r1.ebuild,
+  +files/qtella-0.7.0-gcc44.patch:
+  Add patch to fix compilation with gcc-4.3 and gcc-4.4 by Gene Seto
+  <geneseto AT hotmail DOT com>; bug #251557
 
   27 Jul 2008; Carsten Lohrke <carlo@gentoo.org> qtella-0.7.0-r1.ebuild:
   QA: Get rid of deprecated qt_min_version().Fix KDE dependency.
diff --git a/net-p2p/qtella/Manifest b/net-p2p/qtella/Manifest
index 0ad0484b50ba..562f5a8aa3d9 100644
--- a/net-p2p/qtella/Manifest
+++ b/net-p2p/qtella/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.7.0-nokde.patch 1998 RMD160 1773a31185b8c7438181a883a441b3e1ce64b3d6 SHA1 1d54479dc7bd46f9cff6df8c0a2bb5c7d2ad50a9 SHA256 0d2802d4d709868756336193daf2a9fedee4560f219d9e069fea70acc7ff2581
 AUX qtella-0.7.0-errno.patch 439 RMD160 8266aa08434b5968f9aefca8d295b666f63b5d36 SHA1 cfbdf0b3a4f10f8e5bf321b8758e3a19447aa625 SHA256 39d7e0531c7fb0de184f9c691de9a2176f5ce7356300bc3649db29be52576e72
 AUX qtella-0.7.0-gcc41.patch 1449 RMD160 24be7ce4339e588cdcd107a0a2add626c078b361 SHA1 ce5a1fd4974919722820f6e5da5e390f0e6ee246 SHA256 a98e4a1ab667179d9124f5df58fe6b52325c52559187408d3d52f9ed00900082
+AUX qtella-0.7.0-gcc44.patch 3880 RMD160 eacb88c0f122f61a32690f8b53b4f5d41d416b6b SHA1 9c442e2e686d2e0a64b58fb0dde583b9ef46c5b7 SHA256 f495a9471f5c8e2b0c84df07123988db11cc61e9759b7aa800ac5dc2624cbd05
 DIST qtella-0.7.0-libyahoo.patch.gz 3566 RMD160 ca2f94362b9d75da3c6730e8a86cfc9bb72cdab9 SHA1 9e69fdbb36ed7b722de3aba6ff08f2a8c39009fa SHA256 f6b06583e30f6189377271545ee8d1f28dda8c4dfc60c4d1bf46a229aee0414d
 DIST qtella-0.7.0.tar.gz 672916 RMD160 e642e0974891e6e96b89d53a117326530116b0c6 SHA1 5e821177a5c12f56faa4b73513eb870e5182edd6 SHA256 d985e3ee9749016c3bbc8bd90c4c01af6533bff5c88407068b25fbe3107d597c
-EBUILD qtella-0.7.0-r1.ebuild 1212 RMD160 cafed29a90d4d15fe1471eea2117b5ca57d17dfb SHA1 60d71a09f6099e55b66299b58b12fc079deadb57 SHA256 4d572bdf5834f21bdf2eb44fd86678d632cba0f0658bb18fbf57863b445e9ccd
-MISC ChangeLog 5142 RMD160 8840d9589530bb2d56c12e5f7b2e44118a43d0f1 SHA1 99dcfe61d3ff6ef6f31803188f7f4ed92a2fdba2 SHA256 c1972b3fd0397b66cc965c8ea8eb51864b61552a5d1f6964ef9000b909321d57
+EBUILD qtella-0.7.0-r1.ebuild 1254 RMD160 72e0ca60c56c3eacf553f6fddb39098f965d2d38 SHA1 657c111067427dc4aa19a170191f592c2e5948ed SHA256 41c63ce3cf391cfb5bf4a042a747bee82764ac7d1230c238ea47c8fab4946de2
+MISC ChangeLog 5366 RMD160 a5ae8f66f494c9e276715835cf2fe107a06b08d2 SHA1 641a287bca77ff0127e7053b9b698311d7e016d6 SHA256 9bec722834a3e822343e14446b22158b35ca4a0a021e3c56b045c012f8c62126
 MISC metadata.xml 160 RMD160 828887200387b28c37fc97111fc6bc3a0a2fcccd SHA1 813ef5bc57f6a8d95e7cab7a745a2a824858f49c SHA256 fe06593409e7f28665c032001005e94cb650299711a0af7f1a558bdb56c4004f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpGtBIACgkQCRZPokWLroTU1gCglQ8xVJgbX8dc7ACC2L6lUPFw
+lHEAoKKCvCAvOpxrfHa+FVzcs5wnt62A
+=TbRI
+-----END PGP SIGNATURE-----
diff --git a/net-p2p/qtella/files/qtella-0.7.0-gcc44.patch b/net-p2p/qtella/files/qtella-0.7.0-gcc44.patch
new file mode 100644
index 000000000000..a3dd3847b08b
--- /dev/null
+++ b/net-p2p/qtella/files/qtella-0.7.0-gcc44.patch
@@ -0,0 +1,111 @@
+diff -ur qtella-0.7.0-orig/include/qtella_mini_xpm.h qtella-0.7.0/include/qtella_mini_xpm.h
+--- qtella-0.7.0-orig/include/qtella_mini_xpm.h	2009-06-27 19:50:15.000000000 -0400
++++ qtella-0.7.0/include/qtella_mini_xpm.h	2009-06-27 19:39:44.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * qtella_mini_xpm[] = {
++static const char * qtella_mini_xpm[] = {
+ "16 16 141 2",
+ "  	c None",
+ ". 	c #665A5A",
+diff -ur qtella-0.7.0-orig/src/Address.cpp qtella-0.7.0/src/Address.cpp
+--- qtella-0.7.0-orig/src/Address.cpp	2009-06-27 19:50:15.000000000 -0400
++++ qtella-0.7.0/src/Address.cpp	2009-06-27 19:39:44.000000000 -0400
+@@ -7,6 +7,7 @@
+ 
+ #include <iostream>
+ #include <sstream>
++#include <cstdlib>
+ #if !defined(_WIN32)
+ #include <netdb.h>
+ #endif
+diff -ur qtella-0.7.0-orig/src/AudioGenre.cpp qtella-0.7.0/src/AudioGenre.cpp
+--- qtella-0.7.0-orig/src/AudioGenre.cpp	2009-06-27 19:50:15.000000000 -0400
++++ qtella-0.7.0/src/AudioGenre.cpp	2009-06-27 19:39:44.000000000 -0400
+@@ -2,7 +2,7 @@
+  */
+ #include "AudioGenre.h"
+ 
+-#include <string>
++#include <cstring>
+ 
+ struct genre_list_type
+ {
+diff -ur qtella-0.7.0-orig/src/BitTorrent.cpp qtella-0.7.0/src/BitTorrent.cpp
+--- qtella-0.7.0-orig/src/BitTorrent.cpp	2009-06-27 19:50:15.000000000 -0400
++++ qtella-0.7.0/src/BitTorrent.cpp	2009-06-27 19:50:47.000000000 -0400
+@@ -1,4 +1,6 @@
+ #include "BitTorrent.h"
++#include <cstdlib>
++#include <cstring>
+ #include <cstdio>
+ 
+ #undef DEBUG
+diff -ur qtella-0.7.0-orig/src/Download.cpp qtella-0.7.0/src/Download.cpp
+--- qtella-0.7.0-orig/src/Download.cpp	2009-06-27 19:50:15.000000000 -0400
++++ qtella-0.7.0/src/Download.cpp	2009-06-27 19:39:44.000000000 -0400
+@@ -31,6 +31,7 @@
+ #include <iomanip>
+ #include <sstream>
+ #include <ctime>
++#include <cstdlib>
+ 
+ Download::Download(const QueryHitEntry&      qhe, 
+ 		         DownloadManager*    parent, 
+diff -ur qtella-0.7.0-orig/src/InConnection.cpp qtella-0.7.0/src/InConnection.cpp
+--- qtella-0.7.0-orig/src/InConnection.cpp	2009-06-27 19:50:15.000000000 -0400
++++ qtella-0.7.0/src/InConnection.cpp	2009-06-27 19:39:44.000000000 -0400
+@@ -19,6 +19,7 @@
+ #include <qmessagebox.h>
+ #include <iostream>
+ #include <sstream>
++#include <cstdlib>
+ 
+ #undef _DEBUG
+ 
+diff -ur qtella-0.7.0-orig/src/MessengerThread.cpp qtella-0.7.0/src/MessengerThread.cpp
+--- qtella-0.7.0-orig/src/MessengerThread.cpp	2009-06-27 19:50:15.000000000 -0400
++++ qtella-0.7.0/src/MessengerThread.cpp	2009-06-27 19:39:44.000000000 -0400
+@@ -1,6 +1,7 @@
+ #include "MessengerThread.h"
+ #include "MessengerContacts.h"
+ #include <iostream>
++#include <cstdlib>
+ #include <netdb.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+diff -ur qtella-0.7.0-orig/src/QtellaSubConfig.cpp qtella-0.7.0/src/QtellaSubConfig.cpp
+--- qtella-0.7.0-orig/src/QtellaSubConfig.cpp	2009-06-27 19:50:15.000000000 -0400
++++ qtella-0.7.0/src/QtellaSubConfig.cpp	2009-06-27 19:39:44.000000000 -0400
+@@ -14,7 +14,7 @@
+ #include "MessengerContacts.h"
+ #include "kmdcodec.h"
+ 
+-#include <string>
++#include <cstdlib>
+ #include <fstream>
+ #include <sstream>
+ #include <iostream>
+diff -ur qtella-0.7.0-orig/src/QtellaSubMisc.cpp qtella-0.7.0/src/QtellaSubMisc.cpp
+--- qtella-0.7.0-orig/src/QtellaSubMisc.cpp	2009-06-27 19:50:15.000000000 -0400
++++ qtella-0.7.0/src/QtellaSubMisc.cpp	2009-06-27 19:39:44.000000000 -0400
+@@ -3,6 +3,8 @@
+ #include <qdatetime.h>
+ #include <qfile.h>
+ #include <qsocket.h>
++#include <cstdlib>
++
+ /*!
+  * This is not a backdoor! I just want to see whether it could
+  * be of interest to have a statistic about the number of
+diff -ur qtella-0.7.0-orig/src/RiffFile.cpp qtella-0.7.0/src/RiffFile.cpp
+--- qtella-0.7.0-orig/src/RiffFile.cpp	2009-06-27 19:50:15.000000000 -0400
++++ qtella-0.7.0/src/RiffFile.cpp	2009-06-27 19:39:44.000000000 -0400
+@@ -1,6 +1,7 @@
+ #include "RiffFile.h"
+ 
+ #include <fstream>
++#include <cstring>
+ 
+ #if !defined(_WIN32)
+ using namespace std;
diff --git a/net-p2p/qtella/qtella-0.7.0-r1.ebuild b/net-p2p/qtella/qtella-0.7.0-r1.ebuild
index b9b2d5e692e8..7e373a103cd4 100644
--- a/net-p2p/qtella/qtella-0.7.0-r1.ebuild
+++ b/net-p2p/qtella/qtella-0.7.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/qtella/qtella-0.7.0-r1.ebuild,v 1.9 2008/07/27 22:12:53 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/qtella/qtella-0.7.0-r1.ebuild,v 1.10 2009/06/29 00:04:59 halcy0n Exp $
 
 EAPI=1
 
@@ -27,6 +27,7 @@ src_unpack() {
 	fi
 	epatch "${FILESDIR}"/${P}-errno.patch
 	epatch "${FILESDIR}"/${P}-gcc41.patch
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 	epatch "${DISTDIR}"/${P}-libyahoo.patch.gz
 }