diff options
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/calligraplan/Manifest | 1 | ||||
| -rw-r--r-- | app-office/calligraplan/calligraplan-3.1.0.ebuild | 105 | ||||
| -rw-r--r-- | app-office/calligraplan/files/calligraplan-3.1.0-qca.patch | 127 | ||||
| -rw-r--r-- | app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch | 124 | ||||
| -rw-r--r-- | app-office/calligraplan/metadata.xml | 18 |
5 files changed, 375 insertions, 0 deletions
diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest new file mode 100644 index 000000000000..7ff08e554656 --- /dev/null +++ b/app-office/calligraplan/Manifest @@ -0,0 +1 @@ +DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156 diff --git a/app-office/calligraplan/calligraplan-3.1.0.ebuild b/app-office/calligraplan/calligraplan-3.1.0.ebuild new file mode 100644 index 000000000000..1ee634ee1769 --- /dev/null +++ b/app-office/calligraplan/calligraplan-3.1.0.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" +inherit kde5 + +DESCRIPTION="Project management application" +HOMEPAGE="https://www.calligra.org/" +SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="activities +holidays kwallet pim X" + +# FIXME: Disabled by upstream for good reason +# Crashes plan (https://bugs.kde.org/show_bug.cgi?id=311940) +# $(add_kdeapps_dep akonadi) +# $(add_kdeapps_dep akonadi-contacts) +# Currently upstream-disabled in plan +# =dev-libs/kproperty-3.0*:5 +# =dev-libs/kreport-3.0*:5 +DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep khtml) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep designer) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + dev-lang/perl + dev-libs/kdiagram:5 + sys-libs/zlib + activities? ( $(add_frameworks_dep kactivities) ) + holidays? ( $(add_frameworks_dep kholidays) ) + kwallet? ( + $(add_frameworks_dep kwallet) + app-crypt/qca:2[qt5(+)] + ) + pim? ( + $(add_kdeapps_dep kcalcore) + $(add_kdeapps_dep kcontacts) + ) + X? ( + $(add_qt_dep qtx11extras) + x11-libs/libX11 + ) +" +RDEPEND="${DEPEND} + !app-office/calligra[calligra_features_plan(-)] + !app-office/calligra-l10n:4 + $(add_qt_dep qtsvg) +" + +RESTRICT+=" test" + +PATCHES=( + "${FILESDIR}"/${P}-qt-5.11.patch + "${FILESDIR}"/${P}-qca.patch +) + +src_prepare() { + kde5_src_prepare + # Unconditionally disable deprecated deps + punt_bogus_dep Qt5 OpenGL + # FIXME: disable bogus deps + punt_bogus_dep KF5 KCMUtils + punt_bogus_dep Qt5 Network + punt_bogus_dep Qt5 Svg +} + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package activities KF5Activities) + $(cmake-utils_use_find_package holidays KF5Holidays) + $(cmake-utils_use_find_package pim KF5CalendarCore) + $(cmake-utils_use_find_package pim KF5Contacts) + $(cmake-utils_use_find_package kwallet Qca-qt5) + $(cmake-utils_use_find_package kwallet KF5Wallet) + ) + # Qt5DBus can't be disabled because of KF5DBusAddons dependency + + kde5_src_configure +} diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch b/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch new file mode 100644 index 000000000000..213cc9935bea --- /dev/null +++ b/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch @@ -0,0 +1,127 @@ +From 9c5eb86128da46899e719209a92a65df012c6d8e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Tue, 1 Jan 2019 19:19:19 +0100 +Subject: [PATCH] Re-add accidentally removed test for QCA, KF5Wallet is + optional + +--- + CMakeLists.txt | 18 +++++++++++++++++- + src/libs/store/CMakeLists.txt | 15 +++++++-------- + 2 files changed, 24 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eed9d3c..3cb4b63 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -128,7 +128,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED + Parts + # Sonnet + TextWidgets +- Wallet + WidgetsAddons + WindowSystem + XmlGui +@@ -260,6 +259,23 @@ set_package_properties(KChart PROPERTIES + TYPE REQUIRED + ) + ++## ++## Test for QCA2 ++## ++macro_optional_find_package(Qca-qt5 2.1.0 QUIET) ++set_package_properties(Qca-qt5 PROPERTIES ++ DESCRIPTION "Qt Cryptographic Architecture" ++ URL "https:/download.kde.org/stable/qca-qt5" ++ PURPOSE "Required for encrypted OpenDocument files and encrypted xls files support" ++ TYPE OPTIONAL ++) ++ ++find_package(KF5Wallet ${REQUIRED_KF5_VERSION}) ++ ++if(Qca-qt5_FOUND AND KF5Wallet_FOUND) ++ add_definitions( -DQCA2 ) ++endif() ++ + find_package(Perl REQUIRED) + find_package(ZLIB REQUIRED) + +diff --git a/src/libs/store/CMakeLists.txt b/src/libs/store/CMakeLists.txt +index 2c96fa7..f998264 100644 +--- a/src/libs/store/CMakeLists.txt ++++ b/src/libs/store/CMakeLists.txt +@@ -4,14 +4,8 @@ endif() + + ########### libkostore ############### + +-if( Qca-qt5_FOUND ) +- add_definitions( -DQCA2 ) +-endif() +- + set(kostore_LIB_SRCS + KoDirectoryStore.cpp +- KoEncryptedStore.cpp +- KoEncryptionChecker.cpp + KoLZF.cpp + KoStore.cpp + KoStoreDevice.cpp +@@ -23,6 +17,12 @@ set(kostore_LIB_SRCS + StoreDebug.cpp + KoNetAccess.cpp # temporary while porting + ) ++if( Qca-qt5_FOUND ) ++ set(kostore_LIB_SRCS ${kostore_LIB_SRCS} ++ KoEncryptedStore.cpp ++ KoEncryptionChecker.cpp ++ ) ++endif() + + add_library(planstore SHARED ${kostore_LIB_SRCS}) + generate_export_header(planstore BASE_NAME kostore) +@@ -35,12 +35,11 @@ target_link_libraries(planstore + PRIVATE + Qt5::Gui + KF5::Archive +- KF5::Wallet + KF5::KIOWidgets + KF5::I18n + ) + if( Qca-qt5_FOUND ) +- target_link_libraries(planstore PRIVATE qca-qt5) ++ target_link_libraries(planstore PRIVATE qca-qt5 KF5::Wallet) + endif() + + set_target_properties(planstore PROPERTIES +diff --git a/src/libs/widgets/KoDocumentInfoDlg.cpp b/src/libs/widgets/KoDocumentInfoDlg.cpp +index 1615a61..55e2c32 100644 +--- a/src/libs/widgets/KoDocumentInfoDlg.cpp ++++ b/src/libs/widgets/KoDocumentInfoDlg.cpp +@@ -26,7 +26,9 @@ + #include "KoDocumentInfo.h" + #include "KoDocumentBase.h" + #include "KoGlobal.h" ++#ifdef QCA2 + #include <KoEncryptionChecker.h> ++#endif + #include "KoPageWidgetItem.h" + //#include <KoDocumentRdfBase.h> + #include <KoIcon.h> +@@ -105,12 +107,16 @@ KoDocumentInfoDlg::KoDocumentInfoDlg(QWidget* parent, KoDocumentInfo* docInfo) + d->aboutUi = new Ui::KoDocumentInfoAboutWidget(); + QWidget *infodlg = new QWidget(); + d->aboutUi->setupUi(infodlg); ++#ifdef QCA2 + if (!KoEncryptionChecker::isEncryptionSupported()) { ++#endif + d->aboutUi->lblEncryptedDesc->setVisible(false); + d->aboutUi->lblEncrypted->setVisible(false); + d->aboutUi->pbEncrypt->setVisible(false); + d->aboutUi->lblEncryptedPic->setVisible(false); ++#ifdef QCA2 + } ++#endif + d->aboutUi->cbLanguage->addItems(KoGlobal::listOfLanguages()); + d->aboutUi->cbLanguage->setCurrentIndex(-1); + +-- +2.20.1 + diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch b/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch new file mode 100644 index 000000000000..584d14e447e7 --- /dev/null +++ b/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch @@ -0,0 +1,124 @@ +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 +--- + src/kptview.h | 1 + + src/kptviewlist.cpp | 1 + + src/libs/ui/kptaccountseditor.cpp | 1 + + src/libs/ui/kptdocumentspanel.h | 1 + + src/libs/ui/kptitemviewsettup.cpp | 2 +- + src/libs/ui/kpttaskeditor.cpp | 1 + + src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 + + src/libs/widgets/KoPageLayoutWidget.cpp | 2 ++ + 15 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/src/kptview.h b/src/kptview.h +index 44d11935e71..a98e55342db 100644 +--- a/src/kptview.h ++++ b/src/kptview.h +@@ -28,6 +28,7 @@ + #include "kptcontext.h" + #include "kptviewbase.h" + ++#include <QActionGroup> + #include <QDockWidget> + #include <QMap> + +diff --git a/src/kptviewlist.cpp b/src/kptviewlist.cpp +index f34e702e055..0e6db7b2ffe 100644 +--- a/src/kptviewlist.cpp ++++ b/src/kptviewlist.cpp +@@ -25,6 +25,7 @@ + #include <QStyle> + #include <QBrush> + #include <QContextMenuEvent> ++#include <QHeaderView> + #include <QMenu> + + #include <kmessagebox.h> +diff --git a/src/libs/ui/kptaccountseditor.cpp b/src/libs/ui/kptaccountseditor.cpp +index 7991fafd779..54e3a87c94f 100644 +--- a/src/libs/ui/kptaccountseditor.cpp ++++ b/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/src/libs/ui/kptdocumentspanel.h b/src/libs/ui/kptdocumentspanel.h +index 00ea3af80b2..491cb1ebb86 100644 +--- a/src/libs/ui/kptdocumentspanel.h ++++ b/src/libs/ui/kptdocumentspanel.h +@@ -26,6 +26,7 @@ + + #include "kptdocuments.h" + ++#include <QModelIndexList> + #include <QWidget> + #include <kundo2qstack.h> + +diff --git a/src/libs/ui/kptitemviewsettup.cpp b/src/libs/ui/kptitemviewsettup.cpp +index d1c3b1fc157..7c97a070b9a 100644 +--- a/src/libs/ui/kptitemviewsettup.cpp ++++ b/src/libs/ui/kptitemviewsettup.cpp +@@ -25,9 +25,9 @@ + + #include "KoPageLayoutWidget.h" + ++#include <QHeaderView> + #include <QPushButton> + +- + namespace KPlato + { + +diff --git a/src/libs/ui/kpttaskeditor.cpp b/src/libs/ui/kpttaskeditor.cpp +index 21546118d33..91db5acbb18 100644 +--- a/src/libs/ui/kpttaskeditor.cpp ++++ b/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/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp +index 344ebc2b599..9146f06ab8c 100644 +--- a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp ++++ b/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/src/libs/widgets/KoPageLayoutWidget.cpp b/src/libs/widgets/KoPageLayoutWidget.cpp +index c9e17b748a9..b67e9848807 100644 +--- a/src/libs/widgets/KoPageLayoutWidget.cpp ++++ b/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/calligraplan/metadata.xml b/app-office/calligraplan/metadata.xml new file mode 100644 index 000000000000..a7529db60e61 --- /dev/null +++ b/app-office/calligraplan/metadata.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <maintainer type="project"> + <email>office@gentoo.org</email> + <name>Gentoo Office project</name> + </maintainer> + <use> + <flag name="activities">Enable kactivities support</flag> + <flag name="holidays">Enable <pkg>kde-frameworks/kholidays</pkg> integration</flag> + <flag name="kwallet">Enable access to encrypted OpenDocument files with <pkg>kde-frameworks/kwallet</pkg> storage</flag> + <flag name="pim">Enable support for KDE PIM resources integration</flag> + </use> +</pkgmetadata> |