[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-workspace/files/, kde-plasma/plasma-workspace/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     c2dd7a70701431555e8b1204bc5a332d0e0bb6de
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Nov  9 07:27:43 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Nov  9 22:22:34 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=c2dd7a70

kde-plasma/plasma-workspace: Fix dead button in drkonqi

Not nice: Getting a crash, then going through drkonqi and encountering a usability bug.

Package-Manager: portage-2.2.20.1

 .../files/plasma-workspace-5.4.3-fix-drkonqi.patch | 32 ++++++++++++++++++++++
 .../plasma-workspace/plasma-workspace-5.4.3.ebuild |  1 +
 .../plasma-workspace-5.4.49.9999.ebuild            |  1 +
 3 files changed, 34 insertions(+)

diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-fix-drkonqi.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-fix-drkonqi.patch
new file mode 100644
index 0000000..9aa89ca
--- /dev/null
+++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.4.3-fix-drkonqi.patch
@@ -0,0 +1,32 @@
+From: David Edmundson <kde@davidedmundson.co.uk>
+Date: Wed, 21 Oct 2015 16:42:01 +0000
+Subject: Don't connect to signals which don't exist
+X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=2441d350ef571329b67848f79668f3956534806e
+---
+Don't connect to signals which don't exist
+
+Fix KDialog porting
+---
+
+
+--- a/drkonqi/bugzillaintegration/reportassistantpages_bugzilla_duplicates.cpp
++++ b/drkonqi/bugzillaintegration/reportassistantpages_bugzilla_duplicates.cpp
+@@ -574,7 +574,7 @@
+                                   QIcon::fromTheme("view-refresh"),
+                                   i18nc("@info:tooltip", "Use this button to retry "
+                                                   "loading the bug report.")));
+-    connect(ui.m_retryButton, SIGNAL(clicked()), this, SLOT(reloadReport()));
++    connect(ui.m_retryButton, &QPushButton::clicked, this, &BugzillaReportInformationDialog::reloadReport);
+ 
+     m_suggestButton = new QPushButton(this);
+     ui.buttonBox->addButton(m_suggestButton, QDialogButtonBox::ActionRole);
+@@ -583,7 +583,7 @@
+                     QIcon::fromTheme("list-add"), i18nc("@info:tooltip", "Use this button to suggest that "
+                                              "the crash you experienced is related to this bug "
+                                              "report")));
+-    connect(this, SIGNAL(user1Clicked()) , this, SLOT(relatedReportClicked()));
++    connect(m_suggestButton, &QPushButton::clicked, this, &BugzillaReportInformationDialog::relatedReportClicked);
+ 
+     connect(ui.m_showOwnBacktraceCheckBox, SIGNAL(toggled(bool)), this, SLOT(toggleShowOwnBacktrace(bool)));
+ 
+

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild
index f274660..52f30c5 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.3.ebuild
@@ -126,6 +126,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
 	"${FILESDIR}/${PN}-5.4-consolekit2.patch"
+	"${FILESDIR}/${PN}-5.4.3-fix-drkonqi.patch"	#Upstream bug 354110
 )
 
 RESTRICT="test"

diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild
index f1aa325..7b58192 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.4.49.9999.ebuild
@@ -126,6 +126,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
 	"${FILESDIR}/${PN}-5.4-consolekit2.patch"
+	"${FILESDIR}/${PN}-5.4.3-fix-drkonqi.patch"	#Upstream bug 354110
 )
 
 RESTRICT="test"