commit: b462f7a5e612e49fa906a71c53d90d94f8df303a
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 19:41:20 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 19:42:07 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b462f7a5
kde-apps/cantor: backport patch from upstream solving build failure with Qt 5.6
Gentoo-bug: 587082
Package-Manager: portage-2.3.0
kde-apps/cantor/cantor-15.12.3-r1.ebuild | 5 ++++-
kde-apps/cantor/files/cantor-15.12.3-qt56.patch | 27 +++++++++++++++++++++++++
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/kde-apps/cantor/cantor-15.12.3-r1.ebuild
b/kde-apps/cantor/cantor-15.12.3-r1.ebuild
index b01bd79..1d0a335 100644
--- a/kde-apps/cantor/cantor-15.12.3-r1.ebuild
+++ b/kde-apps/cantor/cantor-15.12.3-r1.ebuild
@@ -56,7 +56,10 @@ DEPEND="${RDEPEND}
RESTRICT="test"
-PATCHES=( "${FILESDIR}/${P}-tests.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-tests.patch"
+ "${FILESDIR}/${P}-qt56.patch"
+)
pkg_setup() {
use python && python_setup
diff --git a/kde-apps/cantor/files/cantor-15.12.3-qt56.patch
b/kde-apps/cantor/files/cantor-15.12.3-qt56.patch
new file mode 100644
index 0000000..6434f65
--- /dev/null
+++ b/kde-apps/cantor/files/cantor-15.12.3-qt56.patch
@@ -0,0 +1,27 @@
+From 683418b3663ddc588c44063cc11abb20970e8e08 Mon Sep 17 00:00:00 2001
+From: David Faure <[email protected]>
+Date: Thu, 2 Jun 2016 08:56:43 +0200
+Subject: [PATCH] Fix compilation error "qobject.h:300:9: error: static
+ assertion failed: Signal and slot arguments are not compatible."
+
+(cherry picked from commit 841b6f6e19d829d6ab9ee13a5d4b0bcc9f1ee2df)
+---
+ src/worksheettextitem.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/worksheettextitem.cpp b/src/worksheettextitem.cpp
+index 503153c..493ed48 100644
+--- a/src/worksheettextitem.cpp
++++ b/src/worksheettextitem.cpp
+@@ -180,7 +180,7 @@ void WorksheetTextItem::populateMenu(QMenu *menu, const
QPointF& pos)
+ QKeyEvent*
WorksheetTextItem::eventForStandardAction(KStandardAction::StandardAction
actionID)
+ {
+ // there must be a better way to get the shortcut...
+- QAction * action = KStandardAction::create(actionID, this, 0, this);
++ QAction * action = KStandardAction::create(actionID, this, SLOT(copy()),
this);
+ QKeySequence keySeq = action->shortcut();
+ // we do not support key sequences with multiple keys here
+ int code = keySeq[0];
+--
+2.7.3
+
