diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
commit | d87262dd706fec50cd150aab3e93883b6337466d (patch) | |
tree | 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-office/calligra/files | |
parent | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-office/calligra/files')
4 files changed, 0 insertions, 263 deletions
diff --git a/app-office/calligra/files/calligra-3.1.0-doc.patch b/app-office/calligra/files/calligra-3.1.0-doc.patch deleted file mode 100644 index ad150edbf8a4..000000000000 --- a/app-office/calligra/files/calligra-3.1.0-doc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/CMakeLists.txt 2018-03-15 16:59:36.624682111 +0100 -+++ b/CMakeLists.txt 2018-03-15 17:07:02.306267220 +0100 -@@ -1160,9 +1160,7 @@ - add_subdirectory(braindump) - endif() - --if(SHOULD_BUILD_DOC) -- add_subdirectory(doc) --endif() -+add_subdirectory(doc) - - if(SHOULD_BUILD_PART_QTQUICK) - add_subdirectory(qtquick) diff --git a/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch b/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch deleted file mode 100644 index aa83ba1a3010..000000000000 --- a/app-office/calligra/files/calligra-3.1.0-no-arch-detection.patch +++ /dev/null @@ -1,17 +0,0 @@ -Avoid automagic CXXFLAG detection courtesy of dev-libs/vc. - -Gentoo-bug: 584118 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -617,10 +617,6 @@ - endif() - endmacro() - -- if (NOT PACKAGERS_BUILD) -- # Optimize the whole Calligra for current architecture -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}") -- endif () - endif() - set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} ) - 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 d63f5ccbe875..000000000000 --- 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 - 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 deleted file mode 100644 index bdbe4b6e8559..000000000000 --- a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch +++ /dev/null @@ -1,109 +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 ---- - libs/widgets/KoCsvImportDialog.cpp | 1 + - libs/widgets/KoPageLayoutWidget.cpp | 2 ++ - plugins/chartshape/dialogs/TableEditorDialog.cpp | 1 + - plugins/formulashape/FormulaToolWidget.cpp | 1 + - sheets/dialogs/LayoutDialog.cpp | 1 + - words/part/dialogs/KWAnchoringProperties.cpp | 1 + - words/part/dialogs/KWRunAroundProperties.cpp | 2 ++ - 15 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp -index 0ffdcf62a70..cdca006dc62 100644 ---- a/libs/widgets/KoCsvImportDialog.cpp -+++ b/libs/widgets/KoCsvImportDialog.cpp -@@ -21,6 +21,7 @@ - #include "KoCsvImportDialog.h" - - // Qt -+#include <QButtonGroup> - #include <QTextCodec> - #include <QTextStream> - -diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp -index f91555ca262..a3816f96d8a 100644 ---- a/libs/widgets/KoPageLayoutWidget.cpp -+++ b/libs/widgets/KoPageLayoutWidget.cpp -@@ -23,6 +23,8 @@ - - #include <KoUnit.h> - -+#include <QButtonGroup> -+ - 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 -+++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp -@@ -24,6 +24,7 @@ - - // Qt - #include <QAbstractItemModel> -+#include <QAction> - - // Calligra - #include <KoIcon.h> -diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp -index ed109192cc5..8f521779617 100644 ---- a/plugins/formulashape/FormulaToolWidget.cpp -+++ b/plugins/formulashape/FormulaToolWidget.cpp -@@ -30,6 +30,7 @@ - #include <QWidgetAction> - #include <QTableWidget> - #include <QAction> -+#include <QHeaderView> - #include <QMenu> - - FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent ) -diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp -index a0a9832ddfc..7d7db53823b 100644 ---- a/sheets/dialogs/LayoutDialog.cpp -+++ b/sheets/dialogs/LayoutDialog.cpp -@@ -36,6 +36,7 @@ - #include <math.h> - - #include <QIntValidator> -+#include <QButtonGroup> - #include <QCheckBox> - #include <QFrame> - #include <QLabel> -diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp -index d64208cbdb6..bfddb3a03f5 100644 ---- a/words/part/dialogs/KWAnchoringProperties.cpp -+++ b/words/part/dialogs/KWAnchoringProperties.cpp -@@ -35,6 +35,7 @@ - - #include <kundo2command.h> - -+#include <QButtonGroup> - #include <QComboBox> - - const int KWAnchoringProperties::vertRels[4][20] = { -diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp -index e38599a06d7..7e8b2d51ef9 100644 ---- a/words/part/dialogs/KWRunAroundProperties.cpp -+++ b/words/part/dialogs/KWRunAroundProperties.cpp -@@ -28,6 +28,8 @@ - - #include <kundo2command.h> - -+#include <QButtonGroup> -+ - KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) - : m_state(state) - { --- -2.16.2 - |