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

Package-Manager: portage-2.0.51.19

4 files changed, 48 insertions, 1 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index a89bcdbcf065..2e3fc0e207f5 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.9 2005/04/27 21:46:16 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.10 2005/05/11 19:36:10 greg_g Exp $
+
+*kopete-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,
+  +kopete-3.4.0-r2.ebuild:
+  Add patch to fix crash in chatwindow (#91423).
 
   27 Apr 2005; Markus Rothe <corsair@gentoo.org> kopete-3.4.0-r1.ebuild:
   Added ~ppc64 to KEYWORDS
diff --git a/kde-base/kopete/files/digest-kopete-3.4.0-r2 b/kde-base/kopete/files/digest-kopete-3.4.0-r2
new file mode 100644
index 000000000000..8bdd86e1c2ed
--- /dev/null
+++ b/kde-base/kopete/files/digest-kopete-3.4.0-r2
@@ -0,0 +1 @@
+MD5 47a8d21ce486426caf56bf6129ce993f kdenetwork-3.4.0.tar.bz2 7327047
diff --git a/kde-base/kopete/files/kdenetwork-3.4.0-kopete-tabbed-windows.patch b/kde-base/kopete/files/kdenetwork-3.4.0-kopete-tabbed-windows.patch
new file mode 100644
index 000000000000..918787af2852
--- /dev/null
+++ b/kde-base/kopete/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/kopete/kopete-3.4.0-r2.ebuild b/kde-base/kopete/kopete-3.4.0-r2.ebuild
new file mode 100644
index 000000000000..7214907a5e0c
--- /dev/null
+++ b/kde-base/kopete/kopete-3.4.0-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.4.0-r2.ebuild,v 1.1 2005/05/11 19:36:10 greg_g Exp $
+
+KMNAME=kdenetwork
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="KDE multi-protocol IM client"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~ppc64"
+IUSE="ssl"
+
+RDEPEND="ssl? ( app-crypt/qca-tls )"
+
+# fix kde bug 91288 and 105442. Applied for 3.4.1.
+PATCHES1="${FILESDIR}/kdenetwork-3.4.0-kopete-logout.patch"
+PATCHES1="${PATCHES1} ${FILESDIR}/kdenetwork-3.4.0-kopete-tabbed-windows.patch"
+
+# fix kde bug 99671. Applied for 3.4.1.
+PATCHES1="${PATCHES1} ${FILESDIR}/kdenetwork-3.4.0-kopete-spaces.patch"