1 |
commit: b462f7a5e612e49fa906a71c53d90d94f8df303a |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 27 19:41:20 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 27 19:42:07 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b462f7a5 |
7 |
|
8 |
kde-apps/cantor: backport patch from upstream solving build failure with Qt 5.6 |
9 |
|
10 |
Gentoo-bug: 587082 |
11 |
|
12 |
Package-Manager: portage-2.3.0 |
13 |
|
14 |
kde-apps/cantor/cantor-15.12.3-r1.ebuild | 5 ++++- |
15 |
kde-apps/cantor/files/cantor-15.12.3-qt56.patch | 27 +++++++++++++++++++++++++ |
16 |
2 files changed, 31 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/kde-apps/cantor/cantor-15.12.3-r1.ebuild b/kde-apps/cantor/cantor-15.12.3-r1.ebuild |
19 |
index b01bd79..1d0a335 100644 |
20 |
--- a/kde-apps/cantor/cantor-15.12.3-r1.ebuild |
21 |
+++ b/kde-apps/cantor/cantor-15.12.3-r1.ebuild |
22 |
@@ -56,7 +56,10 @@ DEPEND="${RDEPEND} |
23 |
|
24 |
RESTRICT="test" |
25 |
|
26 |
-PATCHES=( "${FILESDIR}/${P}-tests.patch" ) |
27 |
+PATCHES=( |
28 |
+ "${FILESDIR}/${P}-tests.patch" |
29 |
+ "${FILESDIR}/${P}-qt56.patch" |
30 |
+) |
31 |
|
32 |
pkg_setup() { |
33 |
use python && python_setup |
34 |
|
35 |
diff --git a/kde-apps/cantor/files/cantor-15.12.3-qt56.patch b/kde-apps/cantor/files/cantor-15.12.3-qt56.patch |
36 |
new file mode 100644 |
37 |
index 0000000..6434f65 |
38 |
--- /dev/null |
39 |
+++ b/kde-apps/cantor/files/cantor-15.12.3-qt56.patch |
40 |
@@ -0,0 +1,27 @@ |
41 |
+From 683418b3663ddc588c44063cc11abb20970e8e08 Mon Sep 17 00:00:00 2001 |
42 |
+From: David Faure <faure@×××.org> |
43 |
+Date: Thu, 2 Jun 2016 08:56:43 +0200 |
44 |
+Subject: [PATCH] Fix compilation error "qobject.h:300:9: error: static |
45 |
+ assertion failed: Signal and slot arguments are not compatible." |
46 |
+ |
47 |
+(cherry picked from commit 841b6f6e19d829d6ab9ee13a5d4b0bcc9f1ee2df) |
48 |
+--- |
49 |
+ src/worksheettextitem.cpp | 2 +- |
50 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
51 |
+ |
52 |
+diff --git a/src/worksheettextitem.cpp b/src/worksheettextitem.cpp |
53 |
+index 503153c..493ed48 100644 |
54 |
+--- a/src/worksheettextitem.cpp |
55 |
++++ b/src/worksheettextitem.cpp |
56 |
+@@ -180,7 +180,7 @@ void WorksheetTextItem::populateMenu(QMenu *menu, const QPointF& pos) |
57 |
+ QKeyEvent* WorksheetTextItem::eventForStandardAction(KStandardAction::StandardAction actionID) |
58 |
+ { |
59 |
+ // there must be a better way to get the shortcut... |
60 |
+- QAction * action = KStandardAction::create(actionID, this, 0, this); |
61 |
++ QAction * action = KStandardAction::create(actionID, this, SLOT(copy()), this); |
62 |
+ QKeySequence keySeq = action->shortcut(); |
63 |
+ // we do not support key sequences with multiple keys here |
64 |
+ int code = keySeq[0]; |
65 |
+-- |
66 |
+2.7.3 |
67 |
+ |