summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schwabbauer <cybersystem@gentoo.org>2002-10-08 12:00:20 +0000
committerSascha Schwabbauer <cybersystem@gentoo.org>2002-10-08 12:00:20 +0000
commit9c5158867909e03a0d1ade24cbe14111a4015847 (patch)
tree0895f1bdaa5987ca180e953cbe14d74b3d1524ac /net-p2p/knapster2
parentSmall fix for bug 8463 (diff)
downloadgentoo-2-9c5158867909e03a0d1ade24cbe14111a4015847.tar.gz
gentoo-2-9c5158867909e03a0d1ade24cbe14111a4015847.tar.bz2
gentoo-2-9c5158867909e03a0d1ade24cbe14111a4015847.zip
added a patch to knapster2
Diffstat (limited to 'net-p2p/knapster2')
-rw-r--r--net-p2p/knapster2/ChangeLog10
-rw-r--r--net-p2p/knapster2/files/knapster2-0.4-gcc3.2.diff524
-rw-r--r--net-p2p/knapster2/knapster2-0.4.ebuild10
3 files changed, 541 insertions, 3 deletions
diff --git a/net-p2p/knapster2/ChangeLog b/net-p2p/knapster2/ChangeLog
index 846d97899537..e243c961ccb8 100644
--- a/net-p2p/knapster2/ChangeLog
+++ b/net-p2p/knapster2/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for net-p2p/knapster2
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# /space/gentoo/cvsroot/gentoo-x86/net-p2p/knapster2/ChangeLog,v 1.0
-2002/07/17 17:53:00 cybersystem
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/knapster2/ChangeLog,v 1.2 2002/10/08 12:00:20 cybersystem Exp $
+
+*knapster2-0.4 (08 Oct 2002)
+
+ 08 Oct 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ChangeLog, knapster2-0.4.ebuild, files/knapster2-0.4-gcc3.2.diff :
+
+ Added a patch, so that it compiles with gcc 3.2 now..
+ thanks to Tomasz Sterna <tomek@smoczy.net>..
*knapster2-0.4 (17 July 2002)
diff --git a/net-p2p/knapster2/files/knapster2-0.4-gcc3.2.diff b/net-p2p/knapster2/files/knapster2-0.4-gcc3.2.diff
new file mode 100644
index 000000000000..e38596f986cb
--- /dev/null
+++ b/net-p2p/knapster2/files/knapster2-0.4-gcc3.2.diff
@@ -0,0 +1,524 @@
+diff -EbBcr knapster2-0.4/knapster2/incomingconnection.cpp knapster2-0.4s/knapster2/incomingconnection.cpp
+*** knapster2-0.4/knapster2/incomingconnection.cpp 2002-04-13 11:29:43.000000000 +0200
+--- knapster2-0.4s/knapster2/incomingconnection.cpp 2002-10-08 00:36:13.000000000 +0200
+***************
+*** 4,9 ****
+--- 4,10 ----
+ */
+ #include "incomingconnection.h"
+ #include <iostream>
++ using namespace std;
+ #include "support_funcs.h"
+
+ #include <ksock.h>
+diff -EbBcr knapster2-0.4/knapster2/knap_adduserdlg.cpp knapster2-0.4s/knapster2/knap_adduserdlg.cpp
+*** knapster2-0.4/knapster2/knap_adduserdlg.cpp 2002-04-13 11:29:43.000000000 +0200
+--- knapster2-0.4s/knapster2/knap_adduserdlg.cpp 2002-10-08 00:35:34.000000000 +0200
+***************
+*** 18,23 ****
+--- 18,24 ----
+ //#include <qwhatsthis.h>
+
+ #include <iostream>
++ using namespace std;
+ /*
+ * Constructs a KNAP_AddUserDlg which is a child of 'parent', with the
+ * name 'name' and widget flags set to 'f'
+diff -EbBcr knapster2-0.4/knapster2/knap_chanlist.cpp knapster2-0.4s/knapster2/knap_chanlist.cpp
+*** knapster2-0.4/knapster2/knap_chanlist.cpp 2002-04-13 11:29:43.000000000 +0200
+--- knapster2-0.4s/knapster2/knap_chanlist.cpp 2002-10-08 00:34:41.000000000 +0200
+***************
+*** 17,22 ****
+--- 17,23 ----
+ #include "support_funcs.h"
+
+ #include <iostream>
++ using namespace std;
+ /*
+ * Constructs a KNAP_Channellist which is a child of 'parent', with the
+ * name 'name' and widget flags set to 'f'
+diff -EbBcr knapster2-0.4/knapster2/knap_chanpanel.cpp knapster2-0.4s/knapster2/knap_chanpanel.cpp
+*** knapster2-0.4/knapster2/knap_chanpanel.cpp 2002-04-14 05:22:33.000000000 +0200
+--- knapster2-0.4s/knapster2/knap_chanpanel.cpp 2002-10-08 00:33:40.000000000 +0200
+***************
+*** 32,37 ****
+--- 32,38 ----
+ #include "speedbad.xpm"
+
+ #include <iostream>
++ using namespace std;
+
+ KNAP_ChanPanel::KNAP_ChanPanel(QWidget *parent,const char *name)
+ : QFrame(parent,name)
+diff -EbBcr knapster2-0.4/knapster2/knap_connectdlg.cpp knapster2-0.4s/knapster2/knap_connectdlg.cpp
+*** knapster2-0.4/knapster2/knap_connectdlg.cpp 2002-04-14 03:26:42.000000000 +0200
+--- knapster2-0.4s/knapster2/knap_connectdlg.cpp 2002-10-08 00:32:40.000000000 +0200
+***************
+*** 17,22 ****
+--- 17,23 ----
+ #include "knap_preferences.h"
+
+ #include <iostream>
++ using namespace std;
+
+ /*
+ * Constructs a KNAP_ConnectDlg which is a child of 'parent', with the
+diff -EbBcr knapster2-0.4/knapster2/knap_homepanel.cpp knapster2-0.4s/knapster2/knap_homepanel.cpp
+*** knapster2-0.4/knapster2/knap_homepanel.cpp 2002-04-13 11:29:43.000000000 +0200
+--- knapster2-0.4s/knapster2/knap_homepanel.cpp 2002-10-08 00:31:51.000000000 +0200
+***************
+*** 4,13 ****
+ #include <qwidget.h>
+
+ #include <iostream>
+
+ //#include "welcome-html.h"
+
+! KNAP_HomePanel::KNAP_HomePanel(QWidget *parent,const char *name=0)
+ : QWidget(parent,name)
+ {
+
+--- 4,14 ----
+ #include <qwidget.h>
+
+ #include <iostream>
++ using namespace std;
+
+ //#include "welcome-html.h"
+
+! KNAP_HomePanel::KNAP_HomePanel(QWidget *parent,const char *name)
+ : QWidget(parent,name)
+ {
+
+diff -EbBcr knapster2-0.4/knapster2/knap_hotlistpanel.cpp knapster2-0.4s/knapster2/knap_hotlistpanel.cpp
+*** knapster2-0.4/knapster2/knap_hotlistpanel.cpp 2002-04-14 03:36:59.000000000 +0200
+--- knapster2-0.4s/knapster2/knap_hotlistpanel.cpp 2002-10-08 00:29:30.000000000 +0200
+***************
+*** 19,24 ****
+--- 19,25 ----
+ #include "songinfo.h"
+
+ #include <iostream>
++ using namespace std;
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
+***************
+*** 362,368 ****
+
+ if(user == song->user)
+ {
+! QString s_time = QString().setNum(floor(song->seconds / 60));
+ cerr << "KNAP_HotlistPanel::addSong(): time is " << song->seconds << endl;
+ s_time += ":";
+ int sec = song->seconds % 60;
+--- 363,369 ----
+
+ if(user == song->user)
+ {
+! QString s_time = QString().setNum((int)floor((double)(song->seconds / 60)));
+ cerr << "KNAP_HotlistPanel::addSong(): time is " << song->seconds << endl;
+ s_time += ":";
+ int sec = song->seconds % 60;
+diff -EbBcr knapster2-0.4/knapster2/knap_librarypanel.cpp knapster2-0.4s/knapster2/knap_librarypanel.cpp
+*** knapster2-0.4/knapster2/knap_librarypanel.cpp 2002-04-13 12:13:51.000000000 +0200
+--- knapster2-0.4s/knapster2/knap_librarypanel.cpp 2002-10-08 00:26:13.000000000 +0200
+***************
+*** 35,41 ****
+
+ #include "songinfo.h"
+
+! #include <iostream.h>
+
+ #include <qdir.h>
+ #include <qfile.h>
+--- 35,42 ----
+
+ #include "songinfo.h"
+
+! #include <iostream>
+! using namespace std;
+
+ #include <qdir.h>
+ #include <qfile.h>
+***************
+*** 236,242 ****
+ // put the item in the listview
+ // field 6 is invisible & holds the FULL path name of the song
+
+! QString s_time = QString().setNum(floor(seconds / 60));
+ s_time += ":";
+ int sec = seconds % 60;
+ if (sec < 10) s_time += "0";
+--- 237,243 ----
+ // put the item in the listview
+ // field 6 is invisible & holds the FULL path name of the song
+
+! QString s_time = QString().setNum((int)floor((double)(seconds / 60)));
+ s_time += ":";
+ int sec = seconds % 60;
+ if (sec < 10) s_time += "0";
+diff -EbBcr knapster2-0.4/knapster2/knap_listview.cpp knapster2-0.4s/knapster2/knap_listview.cpp
+*** knapster2-0.4/knapster2/knap_listview.cpp 2002-04-13 12:14:19.000000000 +0200
+--- knapster2-0.4s/knapster2/knap_listview.cpp 2002-10-08 00:06:06.000000000 +0200
+***************
+*** 27,33 ****
+ #include <qheader.h>
+ #include <qstring.h>
+
+! #include <iostream.h>
+ //#include <stdlib.h>
+
+ static int stricmp(const char *s1, const char *s2)
+--- 27,33 ----
+ #include <qheader.h>
+ #include <qstring.h>
+
+! #include <iostream>
+ //#include <stdlib.h>
+
+ static int stricmp(const char *s1, const char *s2)
+diff -EbBcr knapster2-0.4/knapster2/knap_player.cpp knapster2-0.4s/knapster2/knap_player.cpp
+*** knapster2-0.4/knapster2/knap_player.cpp 2002-04-14 05:51:34.000000000 +0200
+--- knapster2-0.4s/knapster2/knap_player.cpp 2002-10-08 00:22:09.000000000 +0200
+***************
+*** 3,8 ****
+--- 3,10 ----
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <errno.h>
++ #include <iostream>
++ using namespace std;
+
+ #include "knap_player.h"
+ #include <klocale.h>
+diff -EbBcr knapster2-0.4/knapster2/knap_playlist.cpp knapster2-0.4s/knapster2/knap_playlist.cpp
+*** knapster2-0.4/knapster2/knap_playlist.cpp 2002-04-13 11:29:43.000000000 +0200
+--- knapster2-0.4s/knapster2/knap_playlist.cpp 2002-10-08 00:19:24.000000000 +0200
+***************
+*** 13,18 ****
+--- 13,19 ----
+ #include <qtextstream.h>
+
+ #include <iostream>
++ using namespace std;
+
+ #include "support_funcs.h"
+
+diff -EbBcr knapster2-0.4/knapster2/knap_preferencesdlg.cpp knapster2-0.4s/knapster2/knap_preferencesdlg.cpp
+*** knapster2-0.4/knapster2/knap_preferencesdlg.cpp 2002-04-13 11:29:43.000000000 +0200
+--- knapster2-0.4s/knapster2/knap_preferencesdlg.cpp 2002-10-08 00:18:19.000000000 +0200
+***************
+*** 36,41 ****
+--- 36,42 ----
+ #include <kfiledialog.h>
+
+ #include <iostream>
++ using namespace std;
+
+ static const char* const image0_data[] = {
+ "48 48 30 1",
+diff -EbBcr knapster2-0.4/knapster2/knap_searchpanel.cpp knapster2-0.4s/knapster2/knap_searchpanel.cpp
+*** knapster2-0.4/knapster2/knap_searchpanel.cpp 2002-04-13 11:39:41.000000000 +0200
+--- knapster2-0.4s/knapster2/knap_searchpanel.cpp 2002-10-08 00:16:54.000000000 +0200
+***************
+*** 36,42 ****
+ #include "songinfo.h"
+ #include "support_funcs.h"
+
+! #include <iostream.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
+--- 36,43 ----
+ #include "songinfo.h"
+ #include "support_funcs.h"
+
+! #include <iostream>
+! using namespace std;
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
+***************
+*** 421,427 ****
+ char buf[10];
+ sprintf(buf,"%05d",song->speed);
+
+! QString s_time = QString().setNum(floor(song->seconds / 60));
+ s_time += ":";
+ int sec = song->seconds % 60;
+ if (sec < 10) s_time += "0";
+--- 422,428 ----
+ char buf[10];
+ sprintf(buf,"%05d",song->speed);
+
+! QString s_time = QString().setNum((int)floor((long double)(song->seconds / 60)));
+ s_time += ":";
+ int sec = song->seconds % 60;
+ if (sec < 10) s_time += "0";
+diff -EbBcr knapster2-0.4/knapster2/knapster2.cpp knapster2-0.4s/knapster2/knapster2.cpp
+*** knapster2-0.4/knapster2/knapster2.cpp 2002-05-19 06:12:13.000000000 +0200
+--- knapster2-0.4s/knapster2/knapster2.cpp 2002-10-08 00:08:03.000000000 +0200
+***************
+*** 1,4 ****
+--- 1,5 ----
+ #include <iostream>
++ using namespace std;
+ #include <stdio.h> // for sscanf
+
+ #include <klocale.h>
+diff -EbBcr knapster2-0.4/knapster2/knap_transferpanel.cpp knapster2-0.4s/knapster2/knap_transferpanel.cpp
+*** knapster2-0.4/knapster2/knap_transferpanel.cpp 2002-05-19 06:21:50.000000000 +0200
+--- knapster2-0.4s/knapster2/knap_transferpanel.cpp 2002-10-08 00:12:58.000000000 +0200
+***************
+*** 44,50 ****
+
+ #include <qtimer.h>
+
+! #include <iostream.h>
+
+ #include <qpainter.h>
+ #include <qcursor.h>
+--- 44,51 ----
+
+ #include <qtimer.h>
+
+! #include <iostream>
+! using namespace std;
+
+ #include <qpainter.h>
+ #include <qcursor.h>
+***************
+*** 84,91 ****
+ ret=""; // i18n("Unknown");
+ return ret;
+ }
+! int hours = (int)floor(timeleft / 3600);
+! int minutes = (int)floor((timeleft % 3600) / 60);
+ int seconds = timeleft % 60;
+ ret = QString().setNum(hours).rightJustify(2, '0') + ":" +
+ QString().setNum(minutes).rightJustify(2, '0') + ":" +
+--- 85,92 ----
+ ret=""; // i18n("Unknown");
+ return ret;
+ }
+! int hours = (int)floor((long double)(timeleft / 3600));
+! int minutes = (int)floor((long double)((timeleft % 3600) / 60));
+ int seconds = timeleft % 60;
+ ret = QString().setNum(hours).rightJustify(2, '0') + ":" +
+ QString().setNum(minutes).rightJustify(2, '0') + ":" +
+diff -EbBcr knapster2-0.4/knapster2/napsterconnection.cpp knapster2-0.4s/knapster2/napsterconnection.cpp
+*** knapster2-0.4/knapster2/napsterconnection.cpp 2002-04-13 11:29:44.000000000 +0200
+--- knapster2-0.4s/knapster2/napsterconnection.cpp 2002-10-08 00:48:01.000000000 +0200
+***************
+*** 24,29 ****
+--- 24,30 ----
+ /*
+ #include <netdb.h>
+ */
++ #include <sys/types.h>
+ #include <sys/socket.h>
+
+ #include <sys/time.h>
+***************
+*** 41,47 ****
+
+ #include <kapp.h>
+
+! #include <iostream.h>
+
+ #include "songinfo.h"
+ // for doing looping inbetween parts set this 0- not that it makes much difference
+--- 42,53 ----
+
+ #include <kapp.h>
+
+! #include <iostream>
+! using namespace std;
+! //namespace std {
+! // extern int connect(int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen);
+! // int close(int fd);
+! //} // namespace std
+
+ #include "songinfo.h"
+ // for doing looping inbetween parts set this 0- not that it makes much difference
+***************
+*** 178,187 ****
+ // kapp->processEvents(1000);
+ #endif
+
+! if(std::connect(_napstersock,(sockaddr
+ *)&_sockaddr,sizeof(struct sockaddr))<0)
+ {
+! std::close(_napstersock);
+ _napstersock=-1;
+ cerr<<"NapsterConnection::open(): Can't connect!\n"<<flush;
+ _lasterror=NAP_NO_CONNECT;
+--- 184,193 ----
+ // kapp->processEvents(1000);
+ #endif
+
+! if(::connect(_napstersock,(sockaddr
+ *)&_sockaddr,sizeof(struct sockaddr))<0)
+ {
+! ::close(_napstersock);
+ _napstersock=-1;
+ cerr<<"NapsterConnection::open(): Can't connect!\n"<<flush;
+ _lasterror=NAP_NO_CONNECT;
+***************
+*** 398,404 ****
+ }
+ // kill from list
+ else
+! std::close(i->getSocket());
+
+ incominglist.removeRef(i);
+ }
+--- 404,410 ----
+ }
+ // kill from list
+ else
+! ::close(i->getSocket());
+
+ incominglist.removeRef(i);
+ }
+***************
+*** 918,924 ****
+ #ifdef DEBUG_1
+ cerr<< "bind error in connection listener\n"<<flush;
+ #endif
+! std::close(local);
+ local=-1;
+ _lasterror=NAP_NO_BIND;
+ return false;
+--- 924,930 ----
+ #ifdef DEBUG_1
+ cerr<< "bind error in connection listener\n"<<flush;
+ #endif
+! ::close(local);
+ local=-1;
+ _lasterror=NAP_NO_BIND;
+ return false;
+diff -EbBcr knapster2-0.4/knapster2/napsterconnection.h knapster2-0.4s/knapster2/napsterconnection.h
+*** knapster2-0.4/knapster2/napsterconnection.h 2002-04-13 11:29:44.000000000 +0200
+--- knapster2-0.4s/knapster2/napsterconnection.h 2002-10-07 23:33:06.000000000 +0200
+***************
+*** 22,28 ****
+ *@author jade
+ */
+
+! #include <iostream.h>
+ //#include <string>
+
+ #include <ksock.h> // FIXME
+--- 22,28 ----
+ *@author jade
+ */
+
+! #include <iostream>
+ //#include <string>
+
+ #include <ksock.h> // FIXME
+diff -EbBcr knapster2-0.4/knapster2/napsterdownload1.cpp knapster2-0.4s/knapster2/napsterdownload1.cpp
+*** knapster2-0.4/knapster2/napsterdownload1.cpp 2002-04-13 11:29:44.000000000 +0200
+--- knapster2-0.4s/knapster2/napsterdownload1.cpp 2002-10-08 00:04:46.000000000 +0200
+***************
+*** 36,42 ****
+
+ #include <stdio.h>
+ #include <stdlib.h>
+! #include <iostream.h>
+
+ #include <ksock.h>
+
+--- 36,43 ----
+
+ #include <stdio.h>
+ #include <stdlib.h>
+! #include <iostream>
+! using namespace std;
+
+ #include <ksock.h>
+
+diff -EbBcr knapster2-0.4/knapster2/napsterdownload1.h knapster2-0.4s/knapster2/napsterdownload1.h
+*** knapster2-0.4/knapster2/napsterdownload1.h 2002-04-13 11:29:44.000000000 +0200
+--- knapster2-0.4s/knapster2/napsterdownload1.h 2002-10-07 23:11:24.000000000 +0200
+***************
+*** 36,42 ****
+ {
+ // friend NapsterConnection;
+ // friend Knapster2;
+! friend KNAP_TransferPanel;
+ // char _buffer[2048];
+
+ int _sock;
+--- 36,42 ----
+ {
+ // friend NapsterConnection;
+ // friend Knapster2;
+! friend class KNAP_TransferPanel;
+ // char _buffer[2048];
+
+ int _sock;
+diff -EbBcr knapster2-0.4/knapster2/napsterupload.cpp knapster2-0.4s/knapster2/napsterupload.cpp
+*** knapster2-0.4/knapster2/napsterupload.cpp 2002-04-13 11:29:44.000000000 +0200
+--- knapster2-0.4s/knapster2/napsterupload.cpp 2002-10-08 00:04:55.000000000 +0200
+***************
+*** 39,45 ****
+
+ #include <qfile.h>
+
+! #include <iostream.h>
+
+ #include "support_funcs.h"
+
+--- 39,46 ----
+
+ #include <qfile.h>
+
+! #include <iostream>
+! using namespace std;
+
+ #include "support_funcs.h"
+
+diff -EbBcr knapster2-0.4/knapster2/napsterupload.h knapster2-0.4s/knapster2/napsterupload.h
+*** knapster2-0.4/knapster2/napsterupload.h 2002-04-13 11:29:44.000000000 +0200
+--- knapster2-0.4s/knapster2/napsterupload.h 2002-10-07 23:10:43.000000000 +0200
+***************
+*** 28,34 ****
+
+ class NapsterUpload : public NapsterTransfer
+ {
+! friend KNAP_TransferPanel;
+
+ char _buffer[1024+2];
+
+--- 28,34 ----
+
+ class NapsterUpload : public NapsterTransfer
+ {
+! friend class KNAP_TransferPanel;
+
+ char _buffer[1024+2];
+
+diff -EbBcr knapster2-0.4/knapster2/songinfo.cpp knapster2-0.4s/knapster2/songinfo.cpp
+*** knapster2-0.4/knapster2/songinfo.cpp 2002-04-13 11:29:44.000000000 +0200
+--- knapster2-0.4s/knapster2/songinfo.cpp 2002-10-07 23:14:31.000000000 +0200
+***************
+*** 19,25 ****
+
+ #include "md5.h"
+
+! #include <iostream.h>
+
+ #include <qdir.h>
+ #include <qfile.h>
+--- 19,25 ----
+
+ #include "md5.h"
+
+! #include <iostream>
+
+ #include <qdir.h>
+ #include <qfile.h>
+
diff --git a/net-p2p/knapster2/knapster2-0.4.ebuild b/net-p2p/knapster2/knapster2-0.4.ebuild
index 0aa6be46466c..81a06d91e8fa 100644
--- a/net-p2p/knapster2/knapster2-0.4.ebuild
+++ b/net-p2p/knapster2/knapster2-0.4.ebuild
@@ -7,9 +7,17 @@ inherit kde-base || die
need-kde 3
LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="x86 ppc"
+SLOT="0"
S="${WORKDIR}/${P}"
DESCRIPTION="Napster Client for Linux"
SRC_URI="mirror://sourceforge/knapster/${P}.tar.gz"
HOMEPAGE="http://knapster.sourceforge.net"
+
+src_unpack() {
+ cd ${WORKDIR}
+ unpack ${A}
+ cd ${S}
+ patch -p1 < ${FILESDIR}/${P}-gcc3.2.diff || die
+}