| 1 |
commit: 4b63ff19b2fff1a48a920987c16c3ca121732fcb |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 22 10:40:33 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 22 12:15:01 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b63ff19 |
| 7 |
|
| 8 |
app-office/calligra: Update patch after upstream review |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
.../calligra/files/calligra-3.1.0-qt-5.11.patch | 45 ++++++++++++---------- |
| 13 |
1 file changed, 25 insertions(+), 20 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch |
| 16 |
index e49f5747699..09236c41de0 100644 |
| 17 |
--- a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch |
| 18 |
+++ b/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch |
| 19 |
@@ -1,8 +1,13 @@ |
| 20 |
-From c52295c8dc90b964d26567d6750f46fd202145ae Mon Sep 17 00:00:00 2001 |
| 21 |
+From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001 |
| 22 |
From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 23 |
Date: Sun, 18 Mar 2018 11:56:57 +0100 |
| 24 |
Subject: [PATCH] Fix build with Qt 5.11 (missing headers) |
| 25 |
|
| 26 |
+Reviewers: #calligra:_3.0 |
| 27 |
+ |
| 28 |
+Tags: #calligra:_3.0 |
| 29 |
+ |
| 30 |
+Differential Revision: https://phabricator.kde.org/D11454 |
| 31 |
--- |
| 32 |
libs/widgets/KoCsvImportDialog.cpp | 1 + |
| 33 |
libs/widgets/KoPageLayoutWidget.cpp | 2 ++ |
| 34 |
@@ -34,18 +39,18 @@ index 0ffdcf62a70..cdca006dc62 100644 |
| 35 |
#include <QTextStream> |
| 36 |
|
| 37 |
diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp |
| 38 |
-index f91555ca262..2b9d04450b3 100644 |
| 39 |
+index f91555ca262..a3816f96d8a 100644 |
| 40 |
--- a/libs/widgets/KoPageLayoutWidget.cpp |
| 41 |
+++ b/libs/widgets/KoPageLayoutWidget.cpp |
| 42 |
-@@ -19,6 +19,8 @@ |
| 43 |
+@@ -23,6 +23,8 @@ |
| 44 |
|
| 45 |
- #include "KoPageLayoutWidget.h" |
| 46 |
+ #include <KoUnit.h> |
| 47 |
|
| 48 |
+#include <QButtonGroup> |
| 49 |
+ |
| 50 |
- #include <ui_KoPageLayoutWidget.h> |
| 51 |
- |
| 52 |
- #include <KoUnit.h> |
| 53 |
+ class Q_DECL_HIDDEN KoPageLayoutWidget::Private |
| 54 |
+ { |
| 55 |
+ public: |
| 56 |
diff --git a/plan/src/kptview.h b/plan/src/kptview.h |
| 57 |
index 44d11935e71..a98e55342db 100644 |
| 58 |
--- a/plan/src/kptview.h |
| 59 |
@@ -110,7 +115,7 @@ index d1c3b1fc157..7c97a070b9a 100644 |
| 60 |
{ |
| 61 |
|
| 62 |
diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp |
| 63 |
-index 5f79abfd917..d08d7f231f4 100644 |
| 64 |
+index 21546118d33..91db5acbb18 100644 |
| 65 |
--- a/plan/src/libs/ui/kpttaskeditor.cpp |
| 66 |
+++ b/plan/src/libs/ui/kpttaskeditor.cpp |
| 67 |
@@ -45,6 +45,7 @@ |
| 68 |
@@ -134,18 +139,18 @@ index 344ebc2b599..9146f06ab8c 100644 |
| 69 |
#include <QStandardItemModel> |
| 70 |
#include <QModelIndex> |
| 71 |
diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp b/plan/src/libs/widgets/KoPageLayoutWidget.cpp |
| 72 |
-index c9e17b748a9..3abc81b939e 100644 |
| 73 |
+index c9e17b748a9..b67e9848807 100644 |
| 74 |
--- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp |
| 75 |
+++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp |
| 76 |
-@@ -21,6 +21,8 @@ |
| 77 |
+@@ -23,6 +23,8 @@ |
| 78 |
|
| 79 |
- #include <ui_KoPageLayoutWidget.h> |
| 80 |
+ #include <KoUnit.h> |
| 81 |
|
| 82 |
+#include <QButtonGroup> |
| 83 |
+ |
| 84 |
- #include <KoUnit.h> |
| 85 |
- |
| 86 |
class Q_DECL_HIDDEN KoPageLayoutWidget::Private |
| 87 |
+ { |
| 88 |
+ public: |
| 89 |
diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp |
| 90 |
index c0d5136f09e..d2a772e83c2 100644 |
| 91 |
--- a/plugins/chartshape/dialogs/TableEditorDialog.cpp |
| 92 |
@@ -195,18 +200,18 @@ index d64208cbdb6..bfddb3a03f5 100644 |
| 93 |
|
| 94 |
const int KWAnchoringProperties::vertRels[4][20] = { |
| 95 |
diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp |
| 96 |
-index e38599a06d7..d96df6405a5 100644 |
| 97 |
+index e38599a06d7..7e8b2d51ef9 100644 |
| 98 |
--- a/words/part/dialogs/KWRunAroundProperties.cpp |
| 99 |
+++ b/words/part/dialogs/KWRunAroundProperties.cpp |
| 100 |
-@@ -17,6 +17,8 @@ |
| 101 |
- * Boston, MA 02110-1301, USA. |
| 102 |
- */ |
| 103 |
+@@ -28,6 +28,8 @@ |
| 104 |
+ |
| 105 |
+ #include <kundo2command.h> |
| 106 |
|
| 107 |
+#include <QButtonGroup> |
| 108 |
+ |
| 109 |
- #include "KWRunAroundProperties.h" |
| 110 |
- #include "KWFrameDialog.h" |
| 111 |
- #include "KWDocument.h" |
| 112 |
+ KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) |
| 113 |
+ : m_state(state) |
| 114 |
+ { |
| 115 |
-- |
| 116 |
2.16.2 |
Archives