[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/

[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/

[Andreas Sturmlechner]

commit:     4b63ff19b2fff1a48a920987c16c3ca121732fcb
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 10:40:33 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 12:15:01 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b63ff19

app-office/calligra: Update patch after upstream review

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../calligra/files/calligra-3.1.0-qt-5.11.patch    | 45 ++++++++++++----------
 1 file changed, 25 insertions(+), 20 deletions(-)

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
index e49f5747699..09236c41de0 100644
--- 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
@@ -1,8 +1,13 @@
-From c52295c8dc90b964d26567d6750f46fd202145ae Mon Sep 17 00:00:00 2001
+From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001
 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
 Date: Sun, 18 Mar 2018 11:56:57 +0100
 Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
 
+Reviewers: #calligra:_3.0
+
+Tags: #calligra:_3.0
+
+Differential Revision: https://phabricator.kde.org/D11454
 ---
  libs/widgets/KoCsvImportDialog.cpp                         | 1 +
  libs/widgets/KoPageLayoutWidget.cpp                        | 2 ++
@@ -34,18 +39,18 @@ index 0ffdcf62a70..cdca006dc62 100644
  #include <QTextStream>
  
 diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp
-index f91555ca262..2b9d04450b3 100644
+index f91555ca262..a3816f96d8a 100644
 --- a/libs/widgets/KoPageLayoutWidget.cpp
 +++ b/libs/widgets/KoPageLayoutWidget.cpp
-@@ -19,6 +19,8 @@
+@@ -23,6 +23,8 @@
  
- #include "KoPageLayoutWidget.h"
+ #include <KoUnit.h>
  
 +#include <QButtonGroup>
 +
- #include <ui_KoPageLayoutWidget.h>
- 
- #include <KoUnit.h>
+ class Q_DECL_HIDDEN KoPageLayoutWidget::Private
+ {
+ public:
 diff --git a/plan/src/kptview.h b/plan/src/kptview.h
 index 44d11935e71..a98e55342db 100644
 --- a/plan/src/kptview.h
@@ -110,7 +115,7 @@ index d1c3b1fc157..7c97a070b9a 100644
  {
  
 diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp
-index 5f79abfd917..d08d7f231f4 100644
+index 21546118d33..91db5acbb18 100644
 --- a/plan/src/libs/ui/kpttaskeditor.cpp
 +++ b/plan/src/libs/ui/kpttaskeditor.cpp
 @@ -45,6 +45,7 @@
@@ -134,18 +139,18 @@ index 344ebc2b599..9146f06ab8c 100644
  #include <QStandardItemModel>
  #include <QModelIndex>
 diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
-index c9e17b748a9..3abc81b939e 100644
+index c9e17b748a9..b67e9848807 100644
 --- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp
 +++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
-@@ -21,6 +21,8 @@
+@@ -23,6 +23,8 @@
  
- #include <ui_KoPageLayoutWidget.h>
+ #include <KoUnit.h>
  
 +#include <QButtonGroup>
 +
- #include <KoUnit.h>
- 
  class Q_DECL_HIDDEN KoPageLayoutWidget::Private
+ {
+ public:
 diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp
 index c0d5136f09e..d2a772e83c2 100644
 --- a/plugins/chartshape/dialogs/TableEditorDialog.cpp
@@ -195,18 +200,18 @@ index d64208cbdb6..bfddb3a03f5 100644
  
  const int KWAnchoringProperties::vertRels[4][20] = {
 diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp
-index e38599a06d7..d96df6405a5 100644
+index e38599a06d7..7e8b2d51ef9 100644
 --- a/words/part/dialogs/KWRunAroundProperties.cpp
 +++ b/words/part/dialogs/KWRunAroundProperties.cpp
-@@ -17,6 +17,8 @@
-  * Boston, MA 02110-1301, USA.
-  */
+@@ -28,6 +28,8 @@
+ 
+ #include <kundo2command.h>
  
 +#include <QButtonGroup>
 +
- #include "KWRunAroundProperties.h"
- #include "KWFrameDialog.h"
- #include "KWDocument.h"
+ KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state)
+         : m_state(state)
+ {
 -- 
 2.16.2
 

[gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/

[Andreas Sturmlechner]

commit:     e872c7f40b402f97f45da4f99a756284025ce3df
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Feb  8 15:59:49 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb  9 09:52:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e872c7f4

app-office/calligra: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11009
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/calligra-3.1.0-plan-qt-5.11.patch        | 124 ---------------------
 1 file changed, 124 deletions(-)

diff --git a/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch
deleted file mode 100644
index d63f5ccbe87..00000000000
--- a/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 18 Mar 2018 11:56:57 +0100
-Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
-
-Reviewers: #calligra:_3.0
-
-Tags: #calligra:_3.0
-
-Differential Revision: https://phabricator.kde.org/D11454
----
- plan/src/kptview.h                                         | 1 +
- plan/src/kptviewlist.cpp                                   | 1 +
- plan/src/libs/ui/kptaccountseditor.cpp                     | 1 +
- plan/src/libs/ui/kptdocumentspanel.h                       | 1 +
- plan/src/libs/ui/kptitemviewsettup.cpp                     | 2 +-
- plan/src/libs/ui/kpttaskeditor.cpp                         | 1 +
- plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 +
- plan/src/libs/widgets/KoPageLayoutWidget.cpp               | 2 ++
- 15 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/plan/src/kptview.h b/plan/src/kptview.h
-index 44d11935e71..a98e55342db 100644
---- a/plan/src/kptview.h
-+++ b/plan/src/kptview.h
-@@ -28,6 +28,7 @@
- #include "kptcontext.h"
- #include "kptviewbase.h"
- 
-+#include <QActionGroup>
- #include <QDockWidget>
- #include <QMap>
- 
-diff --git a/plan/src/kptviewlist.cpp b/plan/src/kptviewlist.cpp
-index f34e702e055..0e6db7b2ffe 100644
---- a/plan/src/kptviewlist.cpp
-+++ b/plan/src/kptviewlist.cpp
-@@ -25,6 +25,7 @@
- #include <QStyle>
- #include <QBrush>
- #include <QContextMenuEvent>
-+#include <QHeaderView>
- #include <QMenu>
- 
- #include <kmessagebox.h>
-diff --git a/plan/src/libs/ui/kptaccountseditor.cpp b/plan/src/libs/ui/kptaccountseditor.cpp
-index 7991fafd779..54e3a87c94f 100644
---- a/plan/src/libs/ui/kptaccountseditor.cpp
-+++ b/plan/src/libs/ui/kptaccountseditor.cpp
-@@ -40,6 +40,7 @@
- #include <QContextMenuEvent>
- #include <QMenu>
- #include <QAction>
-+#include <QHeaderView>
- 
- #include <KLocalizedString>
- #include <kactioncollection.h>
-diff --git a/plan/src/libs/ui/kptdocumentspanel.h b/plan/src/libs/ui/kptdocumentspanel.h
-index 00ea3af80b2..491cb1ebb86 100644
---- a/plan/src/libs/ui/kptdocumentspanel.h
-+++ b/plan/src/libs/ui/kptdocumentspanel.h
-@@ -26,6 +26,7 @@
- 
- #include "kptdocuments.h"
- 
-+#include <QModelIndexList>
- #include <QWidget>
- #include <kundo2qstack.h>
- 
-diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp b/plan/src/libs/ui/kptitemviewsettup.cpp
-index d1c3b1fc157..7c97a070b9a 100644
---- a/plan/src/libs/ui/kptitemviewsettup.cpp
-+++ b/plan/src/libs/ui/kptitemviewsettup.cpp
-@@ -25,9 +25,9 @@
- 
- #include "KoPageLayoutWidget.h"
- 
-+#include <QHeaderView>
- #include <QPushButton>
- 
--
- namespace KPlato
- {
- 
-diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp
-index 21546118d33..91db5acbb18 100644
---- a/plan/src/libs/ui/kpttaskeditor.cpp
-+++ b/plan/src/libs/ui/kpttaskeditor.cpp
-@@ -45,6 +45,7 @@
- #include <QVBoxLayout>
- #include <QDragMoveEvent>
- #include <QAction>
-+#include <QHeaderView>
- #include <QMenu>
- 
- #include <kactionmenu.h>
-diff --git a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-index 344ebc2b599..9146f06ab8c 100644
---- a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-+++ b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-@@ -31,6 +31,7 @@
- #include <KFile>
- 
- #include <QAction>
-+#include <QHeaderView>
- #include <QTreeView>
- #include <QStandardItemModel>
- #include <QModelIndex>
-diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
-index c9e17b748a9..b67e9848807 100644
---- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp
-+++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
-@@ -23,6 +23,8 @@
- 
- #include <KoUnit.h>
- 
-+#include <QButtonGroup>
-+
- class Q_DECL_HIDDEN KoPageLayoutWidget::Private
- {
- public:
--- 
-2.16.2
-