Add patch to fix crash in kopete chatwindow (#91423).

(Portage version: 2.0.51.19)

4 files changed, 88 insertions, 1 deletions

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index 5199ce0c27b7..9777253fbada 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.135 2005/04/03 23:37:27 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.136 2005/05/11 19:33:47 greg_g Exp $
+
+*kdenetwork-3.4.0-r2 (11 May 2005)
+
+  11 May 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/kdenetwork-3.4.0-kopete-tabbed-windows.patch,
+  +kdenetwork-3.4.0-r2.ebuild:
+  Add patch to fix crash in kopete chatwindow (#91423).
 
 *kdenetwork-3.4.0-r1 (03 Apr 2005)
 
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.4.0-r2 b/kde-base/kdenetwork/files/digest-kdenetwork-3.4.0-r2
new file mode 100644
index 000000000000..8bdd86e1c2ed
--- /dev/null
+++ b/kde-base/kdenetwork/files/digest-kdenetwork-3.4.0-r2
@@ -0,0 +1 @@
+MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
diff --git a/kde-base/kdenetwork/files/kdenetwork-3.4.0-kopete-tabbed-windows.patch b/kde-base/kdenetwork/files/kdenetwork-3.4.0-kopete-tabbed-windows.patch
new file mode 100644
index 000000000000..918787af2852
--- /dev/null
+++ b/kde-base/kdenetwork/files/kdenetwork-3.4.0-kopete-tabbed-windows.patch
@@ -0,0 +1,18 @@
+diff -Nur kdenetwork-3.4.0.orig/kopete/kopete/chatwindow/kopetechatwindow.cpp kdenetwork-3.4.0/kopete/kopete/chatwindow/kopetechatwindow.cpp
+--- kdenetwork-3.4.0.orig/kopete/kopete/chatwindow/kopetechatwindow.cpp	2005-02-23 11:30:49.000000000 +0100
++++ kdenetwork-3.4.0/kopete/kopete/chatwindow/kopetechatwindow.cpp	2005-04-04 00:12:30.000000000 +0200
+@@ -1085,6 +1085,5 @@ void KopeteChatWindow::closeEvent( QClos
+	KopeteApplication *app = static_cast<KopeteApplication *>( kapp );
+	if ( KopetePrefs::prefs()->showTray() && !app->isShuttingDown() && !app->sessionSaving() ) {
+-		hide();
+-/*		// BEGIN of code borrowed from KMainWindow::closeEvent
++		// BEGIN of code borrowed from KMainWindow::closeEvent
+		// Save settings if auto-save is enabled, and settings have changed
+		if ( settingsDirty() && autoSaveSettings() )
+@@ -1094,5 +1093,5 @@ void KopeteChatWindow::closeEvent( QClos
+			e->accept();
+		}
+-		// END of code borrowed from KMainWindow::closeEvent*/
++		// END of code borrowed from KMainWindow::closeEvent
+	}
+	else
diff --git a/kde-base/kdenetwork/kdenetwork-3.4.0-r2.ebuild b/kde-base/kdenetwork/kdenetwork-3.4.0-r2.ebuild
new file mode 100644
index 000000000000..be185c213cc7
--- /dev/null
+++ b/kde-base/kdenetwork/kdenetwork-3.4.0-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.4.0-r2.ebuild,v 1.1 2005/05/11 19:33:47 greg_g Exp $
+
+inherit kde-dist eutils
+
+DESCRIPTION="KDE network apps: kopete, kppp, kget..."
+
+KEYWORDS="~x86 ~amd64 ~sparc ~ppc"
+IUSE="rdesktop slp ssl wifi"
+
+DEPEND="~kde-base/kdebase-${PV}
+	slp? ( net-libs/openslp )
+	wifi? ( net-wireless/wireless-tools )"
+
+RDEPEND="${DEPEND}
+	rdesktop? ( >=net-misc/rdesktop-1.3.1-r1 )
+	dev-lang/perl
+	ssl? ( app-crypt/qca-tls
+	       dev-perl/IO-Socket-SSL )"
+# perl: for KSirc
+# qca-tls: for Kopete jabber plugin.
+# IO-Socket-SSL: for SSL support in KSirc.
+
+src_unpack() {
+	kde_src_unpack
+
+	# fix kde bug 91288 and 105442. Applied for 3.4.1.
+	epatch "${FILESDIR}/${P}-kopete-logout.patch"
+	epatch "${FILESDIR}/${P}-kopete-tabbed-windows.patch"
+
+	# fix kde bug 99671. Applied for 3.4.1.
+	epatch "${FILESDIR}/${P}-kopete-spaces.patch"
+}
+
+src_compile() {
+	myconf="$(use_enable slp)"
+	use wifi || export DO_NOT_COMPILE="${DO_NOT_COMPILE} wifi"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	chmod u+s ${D}/${KDEDIR}/bin/reslisa
+
+	# empty config file needed for lisa to work with default settings
+	dodir /etc
+	touch ${D}/etc/lisarc
+
+	# lisa, reslisa initscripts
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${T}/lisa
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${T}/reslisa
+	exeinto /etc/init.d
+	doexe ${T}/lisa ${T}/reslisa
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/lisa.conf lisa
+	newins ${FILESDIR}/reslisa.conf reslisa
+}