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

Package-Manager: portage-2.0.51.19

6 files changed, 97 insertions, 4 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/Manifest b/kde-base/kdenetwork/Manifest
index 3e87306e65eb..181dafe693b6 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -1,9 +1,11 @@
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 55a0e3505463c3505deee74cc8907398 kdenetwork-3.4.0-r1.ebuild 1534
-MD5 c40c0bac1cdd187a93ef5f1040477ce8 ChangeLog 17465
+MD5 183c08ce0965a8cdbcc0cbe0f1bb2d03 ChangeLog 17694
 MD5 fc193fdc9c2f4ed3191665ec65521aa6 kdenetwork-3.2.3-r1.ebuild 1305
 MD5 ef1e3eb9e3060247262db53c06c1e4af kdenetwork-3.3.2.ebuild 1217
+MD5 baf2290d2f7225baeaaddc2dabf9a7b3 kdenetwork-3.4.0-r2.ebuild 1600
 MD5 71fccce18dbad84d8054b36d08c0ba2c kdenetwork-3.2.3.ebuild 1226
+MD5 622d3497792334fa87e483e249da693d files/digest-kdenetwork-3.4.0-r2 70
 MD5 72eca9b8637e868d730399e0becc045d files/digest-kdenetwork-3.2.3-r1 70
 MD5 622d3497792334fa87e483e249da693d files/digest-kdenetwork-3.4.0-r1 70
 MD5 c72f00859a8536c527d040173f92d3f4 files/kdenetwork-3.4.0-kopete-logout.patch 20923
@@ -11,6 +13,7 @@ MD5 8dae5eac25d478ebf23279132c4a0ead files/digest-kdenetwork-3.3.2 70
 MD5 3939e85ee43aba114cc3ece4194145b6 files/reslisa.conf 340
 MD5 72eca9b8637e868d730399e0becc045d files/digest-kdenetwork-3.2.3 70
 MD5 f8624841efe576b99f71c604af307bbf files/kdenetwork-3.4.0-kopete-spaces.patch 8084
+MD5 7f7cb8ecd40f9a5a0a6a76599e445227 files/kdenetwork-3.4.0-kopete-tabbed-windows.patch 1029
 MD5 d97100af0cb95f733660b7a61492d71f files/lisa.conf 452
 MD5 732cc856c1e48585781d79173f5d271b files/lisa 538
 MD5 a32555833318266feb7ea1f68742fdf7 files/yahoo-fix-connect-062404.patch 1139
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
+}
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index a250efd08090..0023fdb7176e 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -1,6 +1,9 @@
-MD5 5a5210c90c0b0f484d4604465841b76b ChangeLog 1710
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 ef94c45bf13388fe31fb2fdcacb292db kopete-3.4.0-r1.ebuild 656
+MD5 b23fd061804fb6ac964342ce70cd5fb6 ChangeLog 1924
+MD5 2e22484df793188e8913a38e710a77db kopete-3.4.0-r2.ebuild 746
 MD5 c72f00859a8536c527d040173f92d3f4 files/kdenetwork-3.4.0-kopete-logout.patch 20923
-MD5 622d3497792334fa87e483e249da693d files/digest-kopete-3.4.0-r1 70
 MD5 f8624841efe576b99f71c604af307bbf files/kdenetwork-3.4.0-kopete-spaces.patch 8084
+MD5 7f7cb8ecd40f9a5a0a6a76599e445227 files/kdenetwork-3.4.0-kopete-tabbed-windows.patch 1029
+MD5 622d3497792334fa87e483e249da693d files/digest-kopete-3.4.0-r1 70
+MD5 622d3497792334fa87e483e249da693d files/digest-kopete-3.4.0-r2 70