add a patch to fix a nasty kget crash

5 files changed, 92 insertions, 2 deletions

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 8b0a40dc5ca7..0ae106d0522c 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,13 @@
 # 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.112 2004/11/05 19:03:49 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.113 2004/11/05 19:13:53 caleb Exp $
+
+*kdenetwork-3.3.1-r1 (05 Nov 2004)
+
+  05 Nov 2004; Caleb Tennis <caleb@gentoo.org> +files/3.3.1-kget.diff,
+  +kdenetwork-3.3.1-r1.ebuild:
+  do a rev bump here, fixes a nasty kget crash
+  I'm going to keep sparc as stable, because the patch is pretty unobtrusive.
 
   05 Nov 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.3.1.ebuild:
   x86 stable
diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index 22992a85b0fb..00af4a491bbe 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -2,18 +2,21 @@ MD5 bc9a8ef963f846d204e3deb605482fe9 kdenetwork-3.1.5.ebuild 897
 MD5 0ec2c51c6328a9c2d4f77b6c6e64a007 kdenetwork-3.2.3.ebuild 1243
 MD5 15ba8e503304d746e65dedba1b142f03 kdenetwork-3.3.1.ebuild 1225
 MD5 8ca1ddb44e1789e711218d60395307b3 kdenetwork-3.2.0.ebuild 1182
+MD5 b9df7a935f1030b8e81f63f0a5dfa52d kdenetwork-3.3.1-r1.ebuild 1264
 MD5 3bece517a429d8a402d85ffc30a37427 kdenetwork-3.2.2.ebuild 1276
 MD5 01567182a1024587ce102e345b27a9b9 kdenetwork-3.3.0.ebuild 1290
 MD5 2ebf1e1662cf3fb9e7dd2c400672793c kdenetwork-3.2.3-r1.ebuild 1319
-MD5 51141a2885d8fb3a319e4f94808d76b2 ChangeLog 14678
+MD5 08a05ee146ff7ea3bc8fa6c86e2aa85a ChangeLog 14942
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
 MD5 732cc856c1e48585781d79173f5d271b files/lisa 538
 MD5 28c3ba792f8a0ce436216062cefa7908 files/reslisa 549
 MD5 93d1b5a88409a2adfec615de70dcaf70 files/linuxwirelesswidget.cpp.diff 796
 MD5 3939e85ee43aba114cc3ece4194145b6 files/reslisa.conf 340
 MD5 d97100af0cb95f733660b7a61492d71f files/lisa.conf 452
+MD5 8dcaf6114da2b32d2bce63e39a38758e files/3.3.1-kget.diff 1321
 MD5 805378603d34bf14a7b856f30374428b files/3.3.0-kopete.diff 566
 MD5 72eca9b8637e868d730399e0becc045d files/digest-kdenetwork-3.2.3-r1 70
+MD5 a0086a72d069c5606f1e2ea81b98fea8 files/digest-kdenetwork-3.3.1-r1 70
 MD5 8dcaf6114da2b32d2bce63e39a38758e files/3.3.0-kget.diff 1321
 MD5 a32555833318266feb7ea1f68742fdf7 files/yahoo-fix-connect-062404.patch 1139
 MD5 419e4285f4c61e2c2f5cb24cfc3c6145 files/digest-kdenetwork-3.1.5 70
diff --git a/kde-base/kdenetwork/files/3.3.1-kget.diff b/kde-base/kdenetwork/files/3.3.1-kget.diff
new file mode 100644
index 000000000000..d72334ae598e
--- /dev/null
+++ b/kde-base/kdenetwork/files/3.3.1-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/files/digest-kdenetwork-3.3.1-r1 b/kde-base/kdenetwork/files/digest-kdenetwork-3.3.1-r1
new file mode 100644
index 000000000000..d05ef66ae2bc
--- /dev/null
+++ b/kde-base/kdenetwork/files/digest-kdenetwork-3.3.1-r1
@@ -0,0 +1 @@
+MD5 4b35a9e23ef555b47e9423082856ca80 kdenetwork-3.3.1.tar.bz2 6970170
diff --git a/kde-base/kdenetwork/kdenetwork-3.3.1-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.3.1-r1.ebuild
new file mode 100644
index 000000000000..edf9e0efddfb
--- /dev/null
+++ b/kde-base/kdenetwork/kdenetwork-3.3.1-r1.ebuild
@@ -0,0 +1,48 @@
+# 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.1-r1.ebuild,v 1.1 2004/11/05 19:13:53 caleb Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE network apps: kopete, kppp, kget..."
+
+KEYWORDS="x86 ~amd64 ~ppc64 sparc ~ppc ~hppa ~alpha"
+IUSE="slp samba wifi ssl"
+
+DEPEND="~kde-base/kdebase-${PV}
+	slp? ( net-libs/openslp )
+	samba? ( net-fs/samba )
+	ssl? ( app-crypt/qca-tls )
+	!net-im/kopete
+	wifi? ( net-wireless/wireless-tools )
+	!net-misc/ksambaplugin"
+
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/3.3.1-kget.diff
+}
+
+src_compile() {
+	myconf="$myconf `use_enable slp`"
+	use wifi || DO_NOT_COMPILE="$DO_NOT_COMPILE wifi"
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	chmod +s ${D}/${KDEDIR}/bin/reslisa
+
+	# empty config file needed for lisa to work with default settings
+	touch ${D}/etc/lisarc
+
+	# lisa, reslisa initscripts
+	dodir /etc/init.d
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${D}/etc/init.d/lisa
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${D}/etc/init.d/reslisa
+	chmod +x ${D}/etc/init.d/*
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/lisa.conf lisa
+	newins ${FILESDIR}/reslisa.conf reslisa
+}