From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9E1DC1382C5 for ; Sat, 24 Mar 2018 06:42:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7DB78E086A; Sat, 24 Mar 2018 06:42:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4096AE086A for ; Sat, 24 Mar 2018 06:42:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0D0F8335C09 for ; Sat, 24 Mar 2018 06:42:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7676C265 for ; Sat, 24 Mar 2018 06:42:51 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1521873737.11ee88aed98350f2c08ed36c1daa802182c10a38.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/calligra/files/, app-office/calligra/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/calligra/calligra-3.1.0-r2.ebuild app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch app-office/calligra/files/calligra-3.1.0-qt-5.11.patch X-VCS-Directories: app-office/calligra/files/ app-office/calligra/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 11ee88aed98350f2c08ed36c1daa802182c10a38 X-VCS-Branch: master Date: Sat, 24 Mar 2018 06:42:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 03a2babe-14fc-4a63-99e9-b74a993d9a9c X-Archives-Hash: c7701b90ec02d6d9193b916d6a374b84 commit: 11ee88aed98350f2c08ed36c1daa802182c10a38 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Mar 24 06:42:17 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Mar 24 06:42:17 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ee88ae app-office/calligra: Fix build w/o plan Closes: https://bugs.gentoo.org/651318 Package-Manager: Portage-2.3.24, Repoman-2.3.6 app-office/calligra/calligra-3.1.0-r2.ebuild | 2 + ....11.patch => calligra-3.1.0-plan-qt-5.11.patch} | 93 ------------------ .../calligra/files/calligra-3.1.0-qt-5.11.patch | 108 --------------------- 3 files changed, 2 insertions(+), 201 deletions(-) diff --git a/app-office/calligra/calligra-3.1.0-r2.ebuild b/app-office/calligra/calligra-3.1.0-r2.ebuild index 2084d5f44db..b1da5f43076 100644 --- a/app-office/calligra/calligra-3.1.0-r2.ebuild +++ b/app-office/calligra/calligra-3.1.0-r2.ebuild @@ -159,6 +159,8 @@ src_prepare() { sed -e "/add_subdirectory(plan)/s/#//" \ -e "/^calligra_disable_product(APP_PLAN/s/^/#/" \ -i CMakeLists.txt || die + + eapply "${FILESDIR}"/${P}-plan-qt-5.11.patch fi kde5_src_prepare diff --git a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch b/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch similarity index 54% copy from app-office/calligra/files/calligra-3.1.0-qt-5.11.patch copy to app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch index 09236c41de0..d63f5ccbe87 100644 --- a/app-office/calligra/files/calligra-3.1.0-qt-5.11.patch +++ b/app-office/calligra/files/calligra-3.1.0-plan-qt-5.11.patch @@ -9,8 +9,6 @@ Tags: #calligra:_3.0 Differential Revision: https://phabricator.kde.org/D11454 --- - libs/widgets/KoCsvImportDialog.cpp | 1 + - libs/widgets/KoPageLayoutWidget.cpp | 2 ++ plan/src/kptview.h | 1 + plan/src/kptviewlist.cpp | 1 + plan/src/libs/ui/kptaccountseditor.cpp | 1 + @@ -19,38 +17,8 @@ Differential Revision: https://phabricator.kde.org/D11454 plan/src/libs/ui/kpttaskeditor.cpp | 1 + plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 + plan/src/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 - #include - #include - -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 - -+#include -+ - 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 @@ -151,67 +119,6 @@ index c9e17b748a9..b67e9848807 100644 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 -+#include - - // Calligra - #include -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 - #include - #include -+#include - #include - - 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 - - #include -+#include - #include - #include - #include -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 - -+#include - #include - - 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 - -+#include -+ - KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state) - : m_state(state) - { -- 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 index 09236c41de0..bdbe4b6e855 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 @@ -11,14 +11,6 @@ Differential Revision: https://phabricator.kde.org/D11454 --- libs/widgets/KoCsvImportDialog.cpp | 1 + libs/widgets/KoPageLayoutWidget.cpp | 2 ++ - 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 ++ plugins/chartshape/dialogs/TableEditorDialog.cpp | 1 + plugins/formulashape/FormulaToolWidget.cpp | 1 + sheets/dialogs/LayoutDialog.cpp | 1 + @@ -46,106 +38,6 @@ index f91555ca262..a3816f96d8a 100644 #include -+#include -+ - 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 -+++ b/plan/src/kptview.h -@@ -28,6 +28,7 @@ - #include "kptcontext.h" - #include "kptviewbase.h" - -+#include - #include - #include - -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 - #include - #include -+#include - #include - - #include -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 - #include - #include -+#include - - #include - #include -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 - #include - #include - -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 - #include - -- - 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 - #include - #include -+#include - #include - - #include -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 - - #include -+#include - #include - #include - #include -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 - +#include + class Q_DECL_HIDDEN KoPageLayoutWidget::Private