summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Seiler <rizzo@gentoo.org>2004-07-13 17:03:47 +0000
committerDon Seiler <rizzo@gentoo.org>2004-07-13 17:03:47 +0000
commit54fe9fe4a6fd6b5ae6f14b851a90339853d21765 (patch)
treebe05fbca8bb22460a5570ad52a09edcfdb8bc4cf /net-im/openc6
parentVersion bump (Manifest recommit) (diff)
downloadgentoo-2-54fe9fe4a6fd6b5ae6f14b851a90339853d21765.tar.gz
gentoo-2-54fe9fe4a6fd6b5ae6f14b851a90339853d21765.tar.bz2
gentoo-2-54fe9fe4a6fd6b5ae6f14b851a90339853d21765.zip
Removing old unstable versions
Diffstat (limited to 'net-im/openc6')
-rw-r--r--net-im/openc6/ChangeLog8
-rw-r--r--net-im/openc6/files/digest-openc6-0.9.21
-rw-r--r--net-im/openc6/files/digest-openc6-0.9.3_beta11
-rw-r--r--net-im/openc6/files/digest-openc6-0.9.4_beta1
-rw-r--r--net-im/openc6/files/digest-openc6-0.9.5_beta1
-rw-r--r--net-im/openc6/files/openc6-0.9.5_beta-fixes.patch359
-rw-r--r--net-im/openc6/openc6-0.9.2.ebuild25
-rw-r--r--net-im/openc6/openc6-0.9.3_beta1.ebuild28
-rw-r--r--net-im/openc6/openc6-0.9.4_beta.ebuild24
-rw-r--r--net-im/openc6/openc6-0.9.5_beta.ebuild29
10 files changed, 7 insertions, 470 deletions
diff --git a/net-im/openc6/ChangeLog b/net-im/openc6/ChangeLog
index 2b7e4efbae10..987ffdaa581b 100644
--- a/net-im/openc6/ChangeLog
+++ b/net-im/openc6/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for net-im/openc6
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openc6/ChangeLog,v 1.7 2004/07/13 17:01:54 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/openc6/ChangeLog,v 1.8 2004/07/13 17:03:47 rizzo Exp $
+
+ 13 Jul 2004; Don Seiler <rizzo@gentoo.org>
+ -files/openc6-0.9.5_beta-fixes.patch, -openc6-0.9.2.ebuild,
+ -openc6-0.9.3_beta1.ebuild, -openc6-0.9.4_beta.ebuild,
+ -openc6-0.9.5_beta.ebuild:
+ Removing old unstable versions
*openc6-0.9.6_beta (13 Jul 2004)
diff --git a/net-im/openc6/files/digest-openc6-0.9.2 b/net-im/openc6/files/digest-openc6-0.9.2
deleted file mode 100644
index 5762dd0a3db9..000000000000
--- a/net-im/openc6/files/digest-openc6-0.9.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 16e24cab2f84d2ac0725479cb16d10bc openc6-0.9.2.tar.gz 1384897
diff --git a/net-im/openc6/files/digest-openc6-0.9.3_beta1 b/net-im/openc6/files/digest-openc6-0.9.3_beta1
deleted file mode 100644
index d40776bbd4db..000000000000
--- a/net-im/openc6/files/digest-openc6-0.9.3_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b661c44edec43cb81ca066451dbf7e5f openc6-0.9.3-1_beta.tar.gz 1502711
diff --git a/net-im/openc6/files/digest-openc6-0.9.4_beta b/net-im/openc6/files/digest-openc6-0.9.4_beta
deleted file mode 100644
index 16e3a640d2f4..000000000000
--- a/net-im/openc6/files/digest-openc6-0.9.4_beta
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3fd4ee2fa8fd818c484af3285bdc51f3 openc6-0.9.4_beta.tar.gz 2433141
diff --git a/net-im/openc6/files/digest-openc6-0.9.5_beta b/net-im/openc6/files/digest-openc6-0.9.5_beta
deleted file mode 100644
index b3a5d71ee5ff..000000000000
--- a/net-im/openc6/files/digest-openc6-0.9.5_beta
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7d1250b638bc4af4b7c238ecee42988d openc6-0.9.5_beta.tar.gz 2579464
diff --git a/net-im/openc6/files/openc6-0.9.5_beta-fixes.patch b/net-im/openc6/files/openc6-0.9.5_beta-fixes.patch
deleted file mode 100644
index d08119f5ab43..000000000000
--- a/net-im/openc6/files/openc6-0.9.5_beta-fixes.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-Index: c6.cpp
-===================================================================
-RCS file: /cvsroot/openc6/OpenC6_branch_1/c6/c6.cpp,v
-retrieving revision 1.57
-diff -u -r1.57 c6.cpp
---- c6.cpp 20 Apr 2004 09:55:55 -0000 1.57
-+++ c6.cpp 23 Apr 2004 14:46:33 -0000
-@@ -26,7 +26,7 @@
- C6Config.defaultSoundPath = commonPath + DEFAULTSOUNDPATH;
- C6Config.commonPath = commonPath;
-
-- if(signal(SIGCHLD,(void*)&sig_chld) == SIG_ERR)
-+ if(signal(SIGCHLD,sig_chld) == SIG_ERR)
- qDebug("Signal Error");
-
- #ifdef USE_KDE
-Index: c6.h
-===================================================================
-RCS file: /cvsroot/openc6/OpenC6_branch_1/c6/c6.h,v
-retrieving revision 1.40
-diff -u -r1.40 c6.h
---- c6.h 31 Mar 2004 16:36:23 -0000 1.40
-+++ c6.h 23 Apr 2004 14:46:33 -0000
-@@ -181,7 +181,7 @@
- void flashTrayIcon(bool state);
- /** No descriptions */
- QString getCurrentTimeStr();
-- void sig_chld(int signum);
-+ static void sig_chld(int signum);
- /** No descriptions */
- void trayIconFlashStop();
- /** No descriptions */
-Index: c6proto.cpp
-===================================================================
-RCS file: /cvsroot/openc6/OpenC6_branch_1/c6/c6proto.cpp,v
-retrieving revision 1.35
-diff -u -r1.35 c6proto.cpp
---- c6proto.cpp 13 Apr 2004 14:35:31 -0000 1.35
-+++ c6proto.cpp 23 Apr 2004 14:46:33 -0000
-@@ -975,6 +975,8 @@
- OutCount = 1;
- setSocket(socket);
- C6Config = config;
-+ chunck_no = 1;
-+ avg_len = 0;
- connect(this,SIGNAL(readyRead()),SLOT(socket_ReadyRead()));
- connect(this,SIGNAL(connectionClosed()),SLOT(socket_Closed()));
- connect(this,SIGNAL(error(int)),SLOT(socket_Error(int)));
-@@ -1267,12 +1269,11 @@
- */
- void C6XferProto::getNextChunk(BYTE *data)
- {
-- int len,chunk_no;
-- static int avg_len = 0;
-+ int len;
-
- QFile *fs = new QFile(C6Config->fileReceivePath+file);
-
-- WORD_READ(data,chunk_no); data+=4;
-+ data+=4;
- WORD_READ(data,len); data+=2;
-
- if (avg_len)
-@@ -1287,7 +1288,9 @@
- fs->close();
-
- if (fsize)
-- emit receiveProgress((int)((chunk_no-1)*avg_len*100/fsize));
-+ emit receiveProgress((int)(chunck_no*avg_len*100/fsize));
-+
-+ chunck_no++;
- }
-
- delete fs;
-@@ -1321,7 +1324,7 @@
- */
- void C6XferProto::endOfReceive()
- {
-- emit receiveProgress(101);
-+ emit receiveProgress(255);
- }
-
-
-@@ -1366,7 +1369,6 @@
- */
- void C6XferServer::xferAborted()
- {
--
- emit receiveAborted();
- }
-
-Index: c6proto.h
-===================================================================
-RCS file: /cvsroot/openc6/OpenC6_branch_1/c6/c6proto.h,v
-retrieving revision 1.27
-diff -u -r1.27 c6proto.h
---- c6proto.h 8 Apr 2004 09:28:03 -0000 1.27
-+++ c6proto.h 23 Apr 2004 14:46:33 -0000
-@@ -44,6 +44,7 @@
- QString file,nick;
- int OutCount;
- int chunck_no;
-+ int avg_len;
- long int fsize;
- QCString DataIn,inComing;
- public:
-Index: chat.ui
-===================================================================
-RCS file: /cvsroot/openc6/OpenC6_branch_1/c6/chat.ui,v
-retrieving revision 1.11
-diff -u -r1.11 chat.ui
---- chat.ui 17 Apr 2004 12:17:50 -0000 1.11
-+++ chat.ui 23 Apr 2004 14:46:35 -0000
-@@ -1512,25 +1512,6 @@
- <string>Aggiungi utente</string>
- </property>
- </widget>
-- <widget class="QProgressBar">
-- <property name="name">
-- <cstring>transmitBar</cstring>
-- </property>
-- <property name="enabled">
-- <bool>true</bool>
-- </property>
-- <property name="geometry">
-- <rect>
-- <x>35</x>
-- <y>358</y>
-- <width>145</width>
-- <height>16</height>
-- </rect>
-- </property>
-- <property name="backgroundOrigin">
-- <enum>AncestorOrigin</enum>
-- </property>
-- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel1_2</cstring>
-@@ -1697,22 +1678,6 @@
- <string>Interrompe la ricezione di un file</string>
- </property>
- </widget>
-- <widget class="QProgressBar">
-- <property name="name">
-- <cstring>receiveBar</cstring>
-- </property>
-- <property name="enabled">
-- <bool>true</bool>
-- </property>
-- <property name="geometry">
-- <rect>
-- <x>274</x>
-- <y>358</y>
-- <width>145</width>
-- <height>16</height>
-- </rect>
-- </property>
-- </widget>
- <widget class="QCheckBox">
- <property name="name">
- <cstring>receiveSwitch</cstring>
-@@ -1897,6 +1862,44 @@
- <enum>Anywhere</enum>
- </property>
- </widget>
-+ <widget class="QProgressBar">
-+ <property name="name">
-+ <cstring>transmitBar</cstring>
-+ </property>
-+ <property name="enabled">
-+ <bool>true</bool>
-+ </property>
-+ <property name="geometry">
-+ <rect>
-+ <x>35</x>
-+ <y>358</y>
-+ <width>145</width>
-+ <height>16</height>
-+ </rect>
-+ </property>
-+ <property name="backgroundOrigin">
-+ <enum>AncestorOrigin</enum>
-+ </property>
-+ </widget>
-+ <widget class="QProgressBar">
-+ <property name="name">
-+ <cstring>receiveBar</cstring>
-+ </property>
-+ <property name="enabled">
-+ <bool>true</bool>
-+ </property>
-+ <property name="geometry">
-+ <rect>
-+ <x>274</x>
-+ <y>358</y>
-+ <width>145</width>
-+ <height>16</height>
-+ </rect>
-+ </property>
-+ <property name="backgroundOrigin">
-+ <enum>AncestorOrigin</enum>
-+ </property>
-+ </widget>
- </widget>
- <images>
- <image name="image0">
-Index: chatview.cpp
-===================================================================
-RCS file: /cvsroot/openc6/OpenC6_branch_1/c6/chatview.cpp,v
-retrieving revision 1.35
-diff -u -r1.35 chatview.cpp
---- chatview.cpp 17 Apr 2004 12:17:50 -0000 1.35
-+++ chatview.cpp 23 Apr 2004 14:46:35 -0000
-@@ -253,7 +253,7 @@
- if (s != "")
- {
- transmitBar->setProgress(0);
-- localProgress = 0;
-+ transmitLocalProgress = 0;
- emit sendFile(s,otherNick);
- }
- }
-@@ -293,7 +293,7 @@
- connect(xferSocket,SIGNAL(connectionClosed()),this,SLOT(xferSocket_connectionClosed()));
- connect(xferSocket,SIGNAL(xferAborted()),this,SLOT(xferAborted()));
- connect(xferSocket,SIGNAL(xferProgress(int)),this,SLOT(xferProgress(int)));
-- localProgress = 0;
-+ transmitLocalProgress = 0;
- transmitFileName = filename;
- xferSocket->fire();
- }
-@@ -309,7 +309,7 @@
- void ChatView::xferSocket_connectionClosed()
- {
- QString a = getOtherNick();
-- if (localProgress < 100)
-+ if (transmitLocalProgress < 100)
- {
- xferSocket->close();
- emit transferError(a,transmitFileName,XFERABORT);
-@@ -326,14 +326,14 @@
- /** No descriptions */
- void ChatView::xferProgress(int progress)
- {
-- localProgress = progress;
-+ transmitLocalProgress = progress;
-
- if (progress == 255)
- progress = 100;
-
- transmitBar->setProgress(progress);
-
-- if (localProgress == 255)
-+ if (transmitLocalProgress == 255)
- UpdateText(END_OF_TRANSFER_MSG(transmitFileName),C6Config->ForeMessageColor);
- }
-
-@@ -348,6 +348,7 @@
- xferSocket->disconnect();
- xferSocket->close();
- delete xferSocket;
-+ xferSocket = NULL;
- }
- }
-
-@@ -357,7 +358,7 @@
- */
- void ChatView::stopTransmitButton_clicked()
- {
-- if ((xferSocket != NULL) && (xferSocket->state() == QSocket::Connected))
-+ if ((xferSocket != NULL) && (xferSocket->state() == QSocket::Connected) && (transmitLocalProgress != 255))
- {
- xferSocket->close();
- UpdateText(ABORT_TRANSFER_MSG(transmitFileName),C6Config->ForeMessageColor);
-@@ -379,10 +380,13 @@
- */
- void ChatView::activateFileServer()
- {
-- xferServer = new C6XferServer(C6Config,serverPort,this);
-- connect(xferServer,SIGNAL(receiveProgress(int)),this,SLOT(receiveProgress(int)));
-- connect(xferServer,SIGNAL(signalFileSpec(QString&,long int)),this,SLOT(receiveFileSpec(QString&, long int )));
-- connect(xferServer,SIGNAL(receiveAborted()),this,SLOT(receiveAborted()));
-+ if (!xferServer)
-+ {
-+ xferServer = new C6XferServer(C6Config,serverPort,this);
-+ connect(xferServer,SIGNAL(receiveProgress(int)),this,SLOT(receiveProgress(int)));
-+ connect(xferServer,SIGNAL(signalFileSpec(QString&,long int)),this,SLOT(receiveFileSpec(QString&, long int )));
-+ connect(xferServer,SIGNAL(receiveAborted()),this,SLOT(receiveAborted()));
-+ }
- }
-
-
-@@ -391,16 +395,14 @@
- */
- void ChatView::receiveProgress(int progress)
- {
-- int localProgress;
-+ receiveLocalProgress = progress;
-
-- localProgress = progress;
--
-- if (progress == 101)
-- progress--;
-+ if (progress == 255)
-+ progress = 100;
-
- receiveBar->setProgress(progress);
-
-- if (localProgress == 101)
-+ if (receiveLocalProgress == 255)
- UpdateText(END_OF_RECEIVE_MSG(receiveFileName,receiveFileSize),C6Config->ForeMessageColor);
- }
-
-@@ -452,5 +454,12 @@
- */
- void ChatView::stopReceiveButton_clicked()
- {
-- xferServer->stopReceive();
-+ if (xferServer && receiveLocalProgress != 255 && receiveLocalProgress)
-+ {
-+ QString a = getOtherNick();
-+
-+ xferServer->stopReceive();
-+ UpdateText(RECEIVE_ABORT_TRANSFER_MSG(receiveFileName,a),C6Config->ForeMessageColor);
-+ receiveLocalProgress = 0;
-+ }
- }
-Index: chatview.h
-===================================================================
-RCS file: /cvsroot/openc6/OpenC6_branch_1/c6/chatview.h,v
-retrieving revision 1.21
-diff -u -r1.21 chatview.h
---- chatview.h 31 Mar 2004 16:36:23 -0000 1.21
-+++ chatview.h 23 Apr 2004 14:46:35 -0000
-@@ -98,7 +98,7 @@
- QString defaultIconPath,defaultButtonPath;
- QString otherNick,myNick,transmitFileName,receiveFileName;
- C6XferProto *xferSocket;
-- int localProgress,serverPort;
-+ int transmitLocalProgress,serverPort,receiveLocalProgress;
- long int receiveFileSize;
- bool xferOnSwitch;
- C6XferServer *xferServer;
-Index: macroetc.h
-===================================================================
-RCS file: /cvsroot/openc6/OpenC6_branch_1/c6/macroetc.h,v
-retrieving revision 1.32
-diff -u -r1.32 macroetc.h
---- macroetc.h 8 Apr 2004 09:28:03 -0000 1.32
-+++ macroetc.h 23 Apr 2004 14:46:35 -0000
-@@ -158,6 +158,7 @@
- #define SEARCHWAITSTR QString("Ricerca in corso.......")
- #define END_OF_TRANSFER_MSG(filename) QString("Invio del file ")+filename+" completato con successo!"
- #define ABORT_TRANSFER_MSG(filename) QString("Invio del file ")+filename+" interrotto!"
-+#define RECEIVE_ABORT_TRANSFER_MSG(filename,nick) QString("Ricezione del file ")+filename+" da "+nick+" interrotta!"
- #define END_OF_RECEIVE_MSG(filename,filesize) QString("Ricezione del file ")+filename+" ("+QString::number(filesize)+" bytes) "+"completato con successo!"
- #define NO_USER_FOUND_MSG QString("Nessun utente trovato")
- #define ENTER_CHAT_MSG(nick) QString("Il netfriend ")+nick+QString::fromUtf8(" è appena entrato in chat")
diff --git a/net-im/openc6/openc6-0.9.2.ebuild b/net-im/openc6/openc6-0.9.2.ebuild
deleted file mode 100644
index ff766219a541..000000000000
--- a/net-im/openc6/openc6-0.9.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openc6/openc6-0.9.2.ebuild,v 1.3 2004/06/24 22:58:34 agriffis Exp $
-
-inherit kde
-
-need-kde 3.1
-need-qt 3.1
-
-DESCRIPTION="OpenC6, a free C6 client."
-HOMEPAGE="http://openc6.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openc6/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-src_compile() {
- econf || die
- emake || die
-}
-
-src_install() {
- einstall || die
-}
diff --git a/net-im/openc6/openc6-0.9.3_beta1.ebuild b/net-im/openc6/openc6-0.9.3_beta1.ebuild
deleted file mode 100644
index cf2c34a0a066..000000000000
--- a/net-im/openc6/openc6-0.9.3_beta1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openc6/openc6-0.9.3_beta1.ebuild,v 1.3 2004/06/24 22:58:34 agriffis Exp $
-
-inherit kde
-
-need-kde 3.1
-need-qt 3.1
-
-MY_PV=${PV/_beta/-}_beta
-DESCRIPTION="OpenC6, a free C6 client."
-HOMEPAGE="http://openc6.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openc6/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_compile() {
- econf || die
- emake || die
-}
-
-src_install() {
- einstall || die
-}
diff --git a/net-im/openc6/openc6-0.9.4_beta.ebuild b/net-im/openc6/openc6-0.9.4_beta.ebuild
deleted file mode 100644
index 3ecca41cd573..000000000000
--- a/net-im/openc6/openc6-0.9.4_beta.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openc6/openc6-0.9.4_beta.ebuild,v 1.4 2004/06/24 22:58:34 agriffis Exp $
-
-inherit kde
-
-need-qt 3.1
-
-DESCRIPTION="OpenC6, a free C6 client."
-HOMEPAGE="http://openc6.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openc6/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-
-src_compile() {
- econf || die
- emake || die
-}
-
-src_install() {
- einstall || die
-}
diff --git a/net-im/openc6/openc6-0.9.5_beta.ebuild b/net-im/openc6/openc6-0.9.5_beta.ebuild
deleted file mode 100644
index a52f2d77408c..000000000000
--- a/net-im/openc6/openc6-0.9.5_beta.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/openc6/openc6-0.9.5_beta.ebuild,v 1.3 2004/06/24 22:58:34 agriffis Exp $
-
-inherit kde eutils
-need-qt 3.1
-
-DESCRIPTION="An open source C6 client"
-HOMEPAGE="http://openc6.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openc6/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="kde"
-
-src_unpack() {
- unpack ${A}
- cd ${S}/c6
- epatch ${FILESDIR}/${P}-fixes.patch
-}
-src_compile() {
- econf `use_with kde` || die "./configure failed"
- emake || die
-}
-
-src_install() {
- einstall || die
-}