diff options
| author |   Caleb Tennis <caleb@gentoo.org> | 2004-09-02 14:38:04 +0000 |
|---|---|---|
| committer | Caleb Tennis <caleb@gentoo.org> | 2004-09-02 14:38:04 +0000 |
| commit | 30fdec8ba8eec14d198ca675147db305009dc2b5 (patch) | |
| tree | c3f1019f0abe7d09de1c34965165ad0953fb1fb7 /kde-base | |
| parent | add in VIM_PLUGIN_HELPFILES and VIM_PLUGIN_HELPTEXT support, bug 62559 (diff) | |
| download | gentoo-2-30fdec8ba8eec14d198ca675147db305009dc2b5.tar.gz gentoo-2-30fdec8ba8eec14d198ca675147db305009dc2b5.tar.bz2 gentoo-2-30fdec8ba8eec14d198ca675147db305009dc2b5.zip | |
patch to fix a crash (#62296)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kdenetwork/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kdenetwork/files/3.3.0-kget.diff | 31 | ||||
| -rw-r--r-- | kde-base/kdenetwork/kdenetwork-3.3.0.ebuild | 5 |
3 files changed, 39 insertions, 3 deletions
diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog index 8280bf25e7fd..0416e2a00aab 100644 --- a/kde-base/kdenetwork/ChangeLog +++ b/kde-base/kdenetwork/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdenetwork # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.103 2004/08/30 19:52:01 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.104 2004/09/02 14:38:04 caleb Exp $ + + 02 Sep 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.3.0.ebuild, + files/3.3.0-kget.diff: + Patch to fix a crash (#62296) 30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> kdenetwork-3.1.5.ebuild, kdenetwork-3.2.1.ebuild, kdenetwork-3.2.3.ebuild, diff --git a/kde-base/kdenetwork/files/3.3.0-kget.diff b/kde-base/kdenetwork/files/3.3.0-kget.diff new file mode 100644 index 000000000000..d72334ae598e --- /dev/null +++ b/kde-base/kdenetwork/files/3.3.0-kget.diff @@ -0,0 +1,31 @@ +--- kdenetwork-3.3.0.old/kget/kmainwidget.cpp 2004-05-23 03:50:10.000000000 +0300 ++++ kdenetwork-3.3.0/kget/kmainwidget.cpp 2004-08-20 04:26:27.000000000 +0300 +@@ -130,6 +130,7 @@ + + myTransferList = 0L; + kmain = this; ++ kdock = NULL; + + // Set log time, needed for the name of log file + QDate date = QDateTime::currentDateTime().date(); +@@ -2056,12 +2057,14 @@ + statusBar()->changeItem(i18n(" Size: %1 ").arg(KIO::convertSize(totalSize)), ID_TOTAL_SIZE); + statusBar()->changeItem(i18n(" Time: %1 ").arg(remTime.toString()), ID_TOTAL_TIME); + statusBar()->changeItem(i18n(" %1/s ").arg(KIO::convertSize(totalSpeed)), ID_TOTAL_SPEED); +- +- tmpstr = i18n(" Transfers: %1 ").arg(myTransferList->childCount()) + +- i18n(" Files: %1 ").arg(totalFiles)+ +- i18n(" Size: %1 ").arg(KIO::convertSize(totalSize))+ +- i18n(" Time: %1 %2/s").arg(remTime.toString()).arg(KIO::convertSize(totalSpeed)); +- kdock->updateToolTip( tmpstr ); ++ ++ if (kdock) { ++ tmpstr = i18n(" Transfers: %1 ").arg(myTransferList->childCount()) + ++ i18n(" Files: %1 ").arg(totalFiles)+ ++ i18n(" Size: %1 ").arg(KIO::convertSize(totalSize))+ ++ i18n(" Time: %1 %2/s").arg(remTime.toString()).arg(KIO::convertSize(totalSpeed)); ++ kdock->updateToolTip( tmpstr ); ++ } + + #ifdef _DEBUG + //sDebugOut << endl; diff --git a/kde-base/kdenetwork/kdenetwork-3.3.0.ebuild b/kde-base/kdenetwork/kdenetwork-3.3.0.ebuild index d541aab66e4a..9661f2d6a8f3 100644 --- a/kde-base/kdenetwork/kdenetwork-3.3.0.ebuild +++ b/kde-base/kdenetwork/kdenetwork-3.3.0.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.3.0.ebuild,v 1.6 2004/08/30 19:52:01 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.3.0.ebuild,v 1.7 2004/09/02 14:38:04 caleb Exp $ -inherit kde-dist +inherit kde-dist eutils DESCRIPTION="KDE network apps: kopete, kppp, kget..." @@ -19,6 +19,7 @@ DEPEND="~kde-base/kdebase-${PV} src_unpack() { kde_src_unpack + epatch ${FILESDIR}/3.3.0-kget.diff } src_compile() { |