Backport patch for hang when amending bug report, bug 463168

(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)

3 files changed, 65 insertions, 1 deletions

diff --git a/kde-base/drkonqi/ChangeLog b/kde-base/drkonqi/ChangeLog
index fc5b510e5a01..1ebd6238558f 100644
--- a/kde-base/drkonqi/ChangeLog
+++ b/kde-base/drkonqi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/drkonqi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/ChangeLog,v 1.257 2013/03/06 13:41:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/ChangeLog,v 1.258 2013/03/25 22:26:14 dilfridge Exp $
+
+*drkonqi-4.10.1-r1 (25 Mar 2013)
+
+  25 Mar 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +drkonqi-4.10.1-r1.ebuild, +files/drkonqi-4.10.1-signal.patch:
+  Backport patch for hang when amending bug report, bug 463168
 
 *drkonqi-4.10.1 (06 Mar 2013)
 
diff --git a/kde-base/drkonqi/drkonqi-4.10.1-r1.ebuild b/kde-base/drkonqi/drkonqi-4.10.1-r1.ebuild
new file mode 100644
index 000000000000..17b108491cde
--- /dev/null
+++ b/kde-base/drkonqi/drkonqi-4.10.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/drkonqi/drkonqi-4.10.1-r1.ebuild,v 1.1 2013/03/25 22:26:14 dilfridge Exp $
+
+EAPI=5
+
+KMNAME="kde-runtime"
+inherit kde4-meta
+
+DESCRIPTION="KDE crash handler, gives the user feedback if a program crashed"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs)
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-signal.patch" )
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+	if ! has_version "sys-devel/gdb"; then
+		elog "For more usability consider installing following packages:"
+		elog "    sys-devel/gdb - Easier debugging support"
+	fi
+}
diff --git a/kde-base/drkonqi/files/drkonqi-4.10.1-signal.patch b/kde-base/drkonqi/files/drkonqi-4.10.1-signal.patch
new file mode 100644
index 000000000000..901f3834d3db
--- /dev/null
+++ b/kde-base/drkonqi/files/drkonqi-4.10.1-signal.patch
@@ -0,0 +1,31 @@
+From b5a8845c515fa6f6b40d58748f05b626d2356f17 Mon Sep 17 00:00:00 2001
+From: Jekyll Wu <adaptee@gmail.com>
+Date: Mon, 25 Mar 2013 11:53:35 +0800
+Subject: [PATCH] Connect to the new signal, instead of the non-existent one
+
+I made a stupid mistake in the final revised patch for review 108411,
+which makes drkonqi never realize the attachment has been successfully
+uploaded to the bugzilla.
+
+BUG:  316958
+FIXED-IN: 4.10.2
+---
+ drkonqi/reportinterface.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drkonqi/reportinterface.cpp b/drkonqi/reportinterface.cpp
+index f911b77..b29652c 100644
+--- a/drkonqi/reportinterface.cpp
++++ b/drkonqi/reportinterface.cpp
+@@ -345,7 +345,7 @@ void ReportInterface::sendUsingDefaultProduct() const
+ void ReportInterface::addedToCC()
+ {
+     //The user was added to the CC list, proceed with the attachment
+-    connect(m_bugzillaManager, SIGNAL(attachToReportSent(int,int)), this, SLOT(attachSent(int,int)));
++    connect(m_bugzillaManager, SIGNAL(attachToReportSent(int)), this, SLOT(attachSent(int)));
+     connect(m_bugzillaManager, SIGNAL(attachToReportError(QString,QString)),
+             this, SIGNAL(sendReportError(QString,QString)));
+     BugReport report = newBugReportTemplate();
+-- 
+1.8.1.5
+