* [gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/, app-office/calligraplan/files/
@ 2019-01-01 19:40 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2019-01-01 19:40 UTC (permalink / raw
To: gentoo-commits
commit: 8637d093d5b79d97f5ee4d27a83029845beb88d9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 1 16:17:16 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 1 19:40:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8637d093
app-office/calligraplan: New package
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/calligraplan/Manifest | 1 +
app-office/calligraplan/calligraplan-3.1.0.ebuild | 105 +++++++++++++++++
.../files/calligraplan-3.1.0-qca.patch | 127 +++++++++++++++++++++
.../files/calligraplan-3.1.0-qt-5.11.patch | 124 ++++++++++++++++++++
app-office/calligraplan/metadata.xml | 18 +++
5 files changed, 375 insertions(+)
diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
new file mode 100644
index 00000000000..7ff08e55465
--- /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 00000000000..1ee634ee176
--- /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 00000000000..213cc9935be
--- /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 00000000000..584d14e447e
--- /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 00000000000..a7529db60e6
--- /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>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/, app-office/calligraplan/files/
@ 2019-08-16 14:40 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2019-08-16 14:40 UTC (permalink / raw
To: gentoo-commits
commit: 72e3e39afb23a77afb3685a9c25db784f7874aa0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 12:47:02 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 14:40:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e3e39a
app-office/calligraplan: EAPI-7 bump, backported unused-deps patch
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../calligraplan/calligraplan-3.1.0-r1.ebuild | 97 ++++++++++++++++++++++
.../files/calligraplan-3.1.0-unused-deps.patch | 57 +++++++++++++
2 files changed, 154 insertions(+)
diff --git a/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild b/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild
new file mode 100644
index 00000000000..98cc37a7595
--- /dev/null
+++ b/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 (https://bugs.kde.org/show_bug.cgi?id=311940)
+# $(add_kdeapps_dep akonadi)
+# $(add_kdeapps_dep akonadi-contacts)
+# Currently upstream-disabled:
+# =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? (
+ <kde-apps/kcalcore-19.04.50:5
+ $(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
+ "${FILESDIR}"/${P}-missing-header.patch
+ "${FILESDIR}"/${P}-unused-deps.patch
+)
+
+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-unused-deps.patch b/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch
new file mode 100644
index 00000000000..707b6c8cdd5
--- /dev/null
+++ b/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch
@@ -0,0 +1,57 @@
+From 5924e3ad82b5dfc95acf9f6751946d5f086d9ce7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 1 Jan 2019 20:13:57 +0100
+Subject: Drop unused dependencies
+
+Test Plan: Built fine with deps removed.
+
+Reviewers: #calligra:_3.0, danders
+
+Reviewed By: #calligra:_3.0, danders
+
+Subscribers: danders
+
+Differential Revision: https://phabricator.kde.org/D17903
+---
+ CMakeLists.txt | 14 ++------------
+ 1 file changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3cb4b63..a6a3c79 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -121,7 +121,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
+ IconThemes
+ ItemViews
+ JobWidgets
+- KCMUtils
+ KIO
+ Notifications
+ # NotifyConfig
+@@ -169,22 +168,13 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED
+ COMPONENTS
+ Core
+ Gui
+- Network
+ PrintSupport
+- Svg
+ Test
+ Widgets
+ Xml
+ )
+- find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET
+- COMPONENTS
+- DBus
+- OpenGL
+- # Quick
+- # Sql
+- # WebKit
+- # WebKitWidgets
+- )
++ find_package(Qt5DBus ${REQUIRED_QT_VERSION} QUIET)
++
+ # Qt5Declarative was removed in Qt 5.6.0 so search for it in a separate call
+ # Including it in a collected find_package(Qt5 ...) call can lead to a fatal not-found error:
+ # * Qt5 (required version >= 5.3.0)
+--
+cgit v1.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/, app-office/calligraplan/files/
@ 2019-10-13 21:13 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2019-10-13 21:13 UTC (permalink / raw
To: gentoo-commits
commit: bde0ef6d982dd6b7c0c577b4a69f283cb45e7978
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 21:05:28 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 21:13:29 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bde0ef6d
app-office/calligraplan: Drop obsolete patch to fix USE=pim
After kcalendarcore was fixed properly in upstream
commit 28eab632238352ab46f6c1db11f6ebf7d3ce0690, this patch is superfluous
and apparently breaks build with first release as a Framework in 5.63.
Cleanup dependencies at the same time; with a minimum >=19.08.0, there is
no more kde-apps/kcalcore to satisfy this package.
Closes: https://bugs.gentoo.org/697660
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../calligraplan/calligraplan-3.1.0-r3.ebuild | 12 ++------
.../calligraplan-3.1.0-kcalcore-19.08-3.patch | 33 ----------------------
2 files changed, 3 insertions(+), 42 deletions(-)
diff --git a/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild b/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
index ec094bc71c2..2f0f38c3d9f 100644
--- a/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
+++ b/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
@@ -60,14 +60,8 @@ DEPEND="
app-crypt/qca:2[qt5(+)]
)
pim? (
- || (
- $(add_frameworks_dep kcalendarcore)
- $(add_kdeapps_dep kcalcore)
- )
- || (
- $(add_frameworks_dep kcontacts)
- $(add_kdeapps_dep kcontacts)
- )
+ $(add_frameworks_dep kcalendarcore)
+ $(add_frameworks_dep kcontacts)
)
X? (
$(add_qt_dep qtx11extras)
@@ -87,7 +81,7 @@ PATCHES=(
"${FILESDIR}"/${P}-qca.patch
"${FILESDIR}"/${P}-missing-header.patch
"${FILESDIR}"/${P}-unused-deps.patch
- "${FILESDIR}"/${P}-kcalcore-19.08-{1,2,3}.patch
+ "${FILESDIR}"/${P}-kcalcore-19.08-{1,2}.patch
)
src_configure() {
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-3.patch b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-3.patch
deleted file mode 100644
index 14cc70ab1c8..00000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 2f5505cf03ff865349d06e1d5c39007c52e7cd10 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Fri, 16 Aug 2019 15:49:09 +0200
-Subject: [PATCH] Fix headers after kcalcore->kcalendercore rename happened
-
----
- .../filters/icalendar/export/icalendarexport.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/plugins/filters/icalendar/export/icalendarexport.cpp b/src/plugins/filters/icalendar/export/icalendarexport.cpp
-index bb6b097d..729d6e50 100644
---- a/src/plugins/filters/icalendar/export/icalendarexport.cpp
-+++ b/src/plugins/filters/icalendar/export/icalendarexport.cpp
-@@ -31,11 +31,11 @@
- #include <kptdocuments.h>
- #include "kptdebug.h"
-
--#include <kcalcore/attendee.h>
--#include <kcalcore/attachment.h>
--#include <kcalcore/icalformat.h>
--#include <kcalcore/memorycalendar.h>
--#include <kcalcore_version.h>
-+#include <kcalendarcore/attendee.h>
-+#include <kcalendarcore/attachment.h>
-+#include <kcalendarcore/icalformat.h>
-+#include <kcalendarcore/memorycalendar.h>
-+#include <kcalendarcore_version.h>
-
- #include <QTextCodec>
- #include <QByteArray>
---
-2.22.1
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/, app-office/calligraplan/files/
@ 2021-03-08 21:14 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2021-03-08 21:14 UTC (permalink / raw
To: gentoo-commits
commit: 3809304593af6433f4ad889503383c2e05bfba75
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 8 20:40:42 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 8 21:13:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38093045
app-office/calligraplan: Drop 3.2.2-r1
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/calligraplan/Manifest | 1 -
.../calligraplan/calligraplan-3.2.2-r1.ebuild | 92 ----
.../files/calligraplan-3.2.2-no-khtml.patch | 463 ---------------------
.../files/calligraplan-3.2.2-qt-5.15.patch | 33 --
4 files changed, 589 deletions(-)
diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
index 213ef3d8027..3ce12fd9cd1 100644
--- a/app-office/calligraplan/Manifest
+++ b/app-office/calligraplan/Manifest
@@ -1,2 +1 @@
-DIST calligraplan-3.2.2.tar.xz 3415816 BLAKE2B b02248ac51c4593434f234b574c23c68fe6777787451c5679985143ddd4845ed3b3eae246dc80ead9158ad98d1896e90ca298df443e9aafc536ee15ee9f2992d SHA512 9d4c32926bc4716d881a6c70ba3e53764cd578b7d31e8fde02d8feb70996e806561149d3f34a75deae7c408ad65f8de93f6afa1b00982bcf15c23db6e6992915
DIST calligraplan-3.3.0.tar.xz 4500032 BLAKE2B 48983bcaad5f8bc60a9e689ab9347731eda6c82eae248df50fa3cdf4a2d9c1882a5f44cda503dcb7ba65452da874256ce4ec3ff2348cf0acd65a9b8a83b63aed SHA512 165bb1d846e8ac96789b5123bd8e352ad77a4ae607d7e06008916f7729a457351c35779b43774f73a6a35bf9401626852cb4dd2ccf16cbcfb38d2abce56bd936
diff --git a/app-office/calligraplan/calligraplan-3.2.2-r1.ebuild b/app-office/calligraplan/calligraplan-3.2.2-r1.ebuild
deleted file mode 100644
index 275d4ee1d2f..00000000000
--- a/app-office/calligraplan/calligraplan-3.2.2-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org
-
-DESCRIPTION="Project management application"
-HOMEPAGE="https://calligra.org/plan/"
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
- SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="activities +holidays kwallet X"
-
-# FIXME: Disabled by upstream for good reason
-# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940)
-# $(add_kdeapps_dep akonadi)
-# $(add_kdeapps_dep akonadi-contacts)
-# Currently upstream-disabled:
-# =dev-libs/kproperty-3.0*:5
-# =dev-libs/kreport-3.0*:5
-DEPEND="
- >=dev-qt/designer-${QTMIN}:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
- >=kde-frameworks/karchive-${KFMIN}:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/kglobalaccel-${KFMIN}:5
- >=kde-frameworks/kguiaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kitemviews-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/knotifications-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/ktextwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- dev-lang/perl
- dev-libs/kdiagram:5
- activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
- holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
- kwallet? (
- >=app-crypt/qca-2.3.0:2
- >=kde-frameworks/kwallet-${KFMIN}:5
- )
- X? (
- >=dev-qt/qtx11extras-${QTMIN}:5
- x11-libs/libX11
- )
-"
-RDEPEND="${DEPEND}
- !app-office/calligra[calligra_features_plan(-)]
- >=dev-qt/qtsvg-${QTMIN}:5
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}/${P}-qt-5.15.patch" # bug 741710
- "${FILESDIR}/${P}-no-khtml.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package activities KF5Activities)
- $(cmake_use_find_package holidays KF5Holidays)
- $(cmake_use_find_package kwallet Qca-qt5)
- $(cmake_use_find_package kwallet KF5Wallet)
- )
- # Qt5DBus can't be disabled because of KF5DBusAddons dependency
-
- ecm_src_configure
-}
diff --git a/app-office/calligraplan/files/calligraplan-3.2.2-no-khtml.patch b/app-office/calligraplan/files/calligraplan-3.2.2-no-khtml.patch
deleted file mode 100644
index c307e332f61..00000000000
--- a/app-office/calligraplan/files/calligraplan-3.2.2-no-khtml.patch
+++ /dev/null
@@ -1,463 +0,0 @@
-From 3097da1c42ba7fe3b6a26ccb64df64db9c5588b7 Mon Sep 17 00:00:00 2001
-From: Dag Andersen <dag.andersen@kdemail.net>
-Date: Mon, 26 Oct 2020 13:46:06 +0100
-Subject: [PATCH 1/2] Remove dependency on KHtml
-
-This also removes the introductory pages,
-but these should be cver by the documentation.
----
- CMakeLists.txt | 10 +++----
- src/CMakeLists.txt | 2 --
- src/kptmaindocument.cpp | 1 -
- src/kptmaindocument.h | 5 ----
- src/kptpart.cpp | 47 --------------------------------
- src/kptpart.h | 4 ---
- src/kptview.cpp | 53 -------------------------------------
- src/kptview.h | 10 -------
- src/libs/ui/CMakeLists.txt | 5 +---
- src/welcome/WelcomeView.cpp | 9 -------
- src/welcome/WelcomeView.h | 1 -
- src/welcome/WelcomeView.ui | 6 +----
- 12 files changed, 7 insertions(+), 146 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4348601c..13ac4d24 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -150,11 +150,11 @@ if(KF5Activities_FOUND)
- set(HAVE_KACTIVITIES TRUE)
- endif()
-
--find_package(KF5KHtml)
--set_package_properties(KF5KHtml PROPERTIES
-- PURPOSE "Required for rich text support"
-- TYPE REQUIRED
--)
-+#find_package(KF5KHtml)
-+#set_package_properties(KF5KHtml PROPERTIES
-+ #PURPOSE "Required for rich text support"
-+ #TYPE REQUIRED
-+#)
-
- find_package(KF5Holidays)
- set_package_properties(KF5Holidays PROPERTIES
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 54f1df57..ee1a6137 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -145,8 +145,6 @@ set(planprivate_LIB_SRCS
- kptinsertfiledlg.cpp
- kptloadsharedprojectsdialog.cpp
-
-- about/aboutpage.cpp
--
- KPlatoXmlLoader.cpp
- )
-
-diff --git a/src/kptmaindocument.cpp b/src/kptmaindocument.cpp
-index b4fe670f..f65f2eb0 100644
---- a/src/kptmaindocument.cpp
-+++ b/src/kptmaindocument.cpp
-@@ -257,7 +257,6 @@ void MainDocument::setProject(Project *project)
- connect(m_project, &Project::nodeChanged, this, &MainDocument::slotNodeChanged);
- connect(m_project, &Project::sigCalculationFinished, this, &MainDocument::slotCalculationFinished);
- }
-- m_aboutPage.setProject(project);
-
- QString dir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
- if (!dir.isEmpty()) {
-diff --git a/src/kptmaindocument.h b/src/kptmaindocument.h
-index 44ab931c..01ad942d 100644
---- a/src/kptmaindocument.h
-+++ b/src/kptmaindocument.h
-@@ -31,7 +31,6 @@
- #include "kptconfig.h"
- #include "kptwbsdefinition.h"
- #include "kptxmlloaderobject.h"
--#include "about/aboutpage.h"
-
- #include "KoDocument.h"
-
-@@ -130,8 +129,6 @@ public:
- bool insertProject(Project &project, Node *parent, Node *after);
- bool mergeResources(Project &project);
-
-- KPlatoAboutPage &aboutPage() { return m_aboutPage; }
--
- bool extractFiles(KoStore *store, Package *package);
- bool extractFile(KoStore *store, Package *package, const Document *doc);
-
-@@ -254,8 +251,6 @@ private:
- QList<QUrl> m_skipUrls;
- QMap<QDateTime, Project*> m_mergedPackages;
-
-- KPlatoAboutPage m_aboutPage;
--
- QDomDocument m_reports;
-
- bool m_viewlistModified;
-diff --git a/src/kptpart.cpp b/src/kptpart.cpp
-index cd31b6ce..d498f5e1 100644
---- a/src/kptpart.cpp
-+++ b/src/kptpart.cpp
-@@ -25,7 +25,6 @@
- #include "kptmaindocument.h"
- #include "kptfactory.h"
- #include "welcome/WelcomeView.h"
--#include "kpthtmlview.h"
- #include "Help.h"
- #include "calligraplansettings.h"
- #include "kptdebug.h"
-@@ -163,7 +162,6 @@ void Part::createStarUpWidget(KoMainWindow *parent)
- startUpWidget = new QStackedWidget(parent);
-
- startUpWidget->addWidget(createWelcomeView(parent));
-- startUpWidget->addWidget(createIntroductionView());
- }
-
- void Part::finish()
-@@ -188,7 +186,6 @@ QWidget *Part::createWelcomeView(KoMainWindow *mw)
-
- connect(v, &WelcomeView::loadSharedResources, doc, &MainDocument::insertResourcesFile);
- connect(v, &WelcomeView::recentProject, mw, &KoMainWindow::slotFileOpenRecent);
-- connect(v, &WelcomeView::showIntroduction, this, &Part::slotShowIntroduction);
- connect(v, &WelcomeView::projectCreated, doc, &MainDocument::slotProjectCreated);
- connect(v, &WelcomeView::finished, this, &Part::finish);
-
-@@ -197,50 +194,6 @@ QWidget *Part::createWelcomeView(KoMainWindow *mw)
- return v;
- }
-
--void Part::slotShowIntroduction()
--{
-- startUpWidget->setCurrentIndex(1);
-- slotOpenUrlRequest(static_cast<HtmlView*>(startUpWidget->currentWidget()), QUrl("about:plan/main"));
--}
--
--void Part::slotOpenUrlRequest(HtmlView *v, const QUrl &url)
--{
-- debugPlan<<url;
-- if (url.scheme() == QLatin1String("about")) {
-- if (url.url() == QLatin1String("about:close")) {
-- startUpWidget->setCurrentIndex(0);
-- return;
-- }
-- if (url.url().startsWith(QLatin1String("about:plan"))) {
-- MainDocument *doc = static_cast<MainDocument*>(document());
-- doc->aboutPage().generatePage(v->htmlPart(), url);
-- return;
-- }
-- }
-- if (url.scheme() == QLatin1String("help")) {
-- KHelpClient::invokeHelp("", url.fileName());
-- return;
-- }
-- // try to open the url
-- debugPlan<<url<<"is external, discard";
-- new KRun(url, currentMainwindow());
--}
--
--QWidget *Part::createIntroductionView()
--{
-- HtmlView *v = new HtmlView(this, document(), startUpWidget);
-- v->htmlPart().setJScriptEnabled(false);
-- v->htmlPart().setJavaEnabled(false);
-- v->htmlPart().setMetaRefreshEnabled(false);
-- v->htmlPart().setPluginsEnabled(false);
--
-- slotOpenUrlRequest(v, QUrl("about:plan/main"));
--
-- connect(v, &KPlato::HtmlView::openUrlRequest, this, &KPlato::Part::slotOpenUrlRequest);
--
-- return v;
--}
--
- void Part::configure(KoMainWindow *mw)
- {
- //debugPlan;
-diff --git a/src/kptpart.h b/src/kptpart.h
-index 90f50257..20429fe2 100644
---- a/src/kptpart.h
-+++ b/src/kptpart.h
-@@ -33,7 +33,6 @@ class QStackedWidget;
- namespace KPlato
- {
- class MainDocument;
--class HtmlView;
-
- class PLAN_EXPORT Part : public KoPart
- {
-@@ -63,8 +62,6 @@ public Q_SLOTS:
- void finish();
-
- protected Q_SLOTS:
-- void slotShowIntroduction();
-- void slotOpenUrlRequest(KPlato::HtmlView *v, const QUrl &url);
- void openTemplate(const QUrl& url) override;
- void slotOpenTemplate(const QUrl& url);
-
-@@ -74,7 +71,6 @@ protected Q_SLOTS:
- protected:
- void createStarUpWidget(KoMainWindow *parent);
- QWidget *createWelcomeView(KoMainWindow *parent);
-- QWidget *createIntroductionView();
-
- private:
- KPlato::MainDocument *m_document;
-diff --git a/src/kptview.cpp b/src/kptview.cpp
-index aa2c3dd7..7af53136 100644
---- a/src/kptview.cpp
-+++ b/src/kptview.cpp
-@@ -103,7 +103,6 @@
- #include "kptpertresult.h"
- #include "kptinsertfiledlg.h"
- #include "kptloadsharedprojectsdialog.h"
--#include "kpthtmlview.h"
- #include "about/aboutpage.h"
- #include "kptlocaleconfigmoneydialog.h"
- #include "kptflatproxymodel.h"
-@@ -196,7 +195,6 @@ View::View(KoPart *part, MainDocument *doc, QWidget *parent)
- ////////////////////////////////////////////////////////////////////////////////////////////////////
-
- // Add sub views
-- createIntroductionView();
-
- // The menu items
- // ------ File
-@@ -258,11 +256,6 @@ View::View(KoPart *part, MainDocument *doc, QWidget *parent)
- connect(actionOpenReportFile, QAction::triggered, this, &View::slotOpenReportFile);
- #endif
-
-- // ------ Help
-- actionIntroduction = new QAction(koIcon("dialog-information"), i18n("Introduction to Plan"), this);
-- actionCollection()->addAction("plan_introduction", actionIntroduction);
-- connect(actionIntroduction, &QAction::triggered, this, &View::slotIntroduction);
--
- // ------ Popup
- actionOpenNode = new QAction(koIcon("document-edit"), i18n("Edit..."), this);
- actionCollection()->addAction("node_properties", actionOpenNode);
-@@ -762,46 +755,6 @@ ViewInfo View::defaultCategoryInfo(const QString &type) const
- return vi;
- }
-
--void View::slotOpenUrlRequest(HtmlView *v, const QUrl &url)
--{
-- debugPlan<<url;
-- if (url.scheme() == QLatin1String("about")) {
-- if (url.url() == QLatin1String("about:close")) {
-- int view = m_visitedViews.count() < 2 ? qMin(m_defaultView, m_tab->count()-1) : m_visitedViews.at(m_visitedViews.count() - 2);
-- debugPlan<<"Prev:"<<view<<m_visitedViews;
-- m_tab->setCurrentIndex(view);
-- return;
-- }
-- if (url.url().startsWith(QLatin1String("about:plan"))) {
-- getPart()->aboutPage().generatePage(v->htmlPart(), url);
-- return;
-- }
-- }
-- if (url.scheme() == QLatin1String("help")) {
-- KHelpClient::invokeHelp("", url.fileName());
-- return;
-- }
-- // try to open the url
-- debugPlan<<url<<"is external, try to open";
-- new KRun(url, mainWindow());
--}
--
--ViewBase *View::createIntroductionView()
--{
-- HtmlView *v = new HtmlView(getKoPart(), getPart(), m_tab);
-- v->htmlPart().setJScriptEnabled(false);
-- v->htmlPart().setJavaEnabled(false);
-- v->htmlPart().setMetaRefreshEnabled(false);
-- v->htmlPart().setPluginsEnabled(false);
--
-- slotOpenUrlRequest(v, QUrl("about:plan/main"));
--
-- connect(v, &HtmlView::openUrlRequest, this, &View::slotOpenUrlRequest);
--
-- m_tab->addWidget(v);
-- return v;
--}
--
- ViewBase *View::createResourceAppointmentsGanttView(ViewListItem *cat, const QString &tag, const QString &name, const QString &tip, int index)
- {
- ResourceAppointmentsGanttView *v = new ResourceAppointmentsGanttView(getKoPart(), getPart(), m_tab);
-@@ -1966,12 +1919,6 @@ void View::slotDefineWBSFinished(int result)
- dia->deleteLater();
- }
-
--void View::slotIntroduction()
--{
-- m_tab->setCurrentIndex(0);
--}
--
--
- Calendar *View::currentCalendar()
- {
- ViewBase *v = dynamic_cast<ViewBase*>(m_tab->currentWidget());
-diff --git a/src/kptview.h b/src/kptview.h
-index b9242811..33b9a198 100644
---- a/src/kptview.h
-+++ b/src/kptview.h
-@@ -84,7 +84,6 @@ class ResourceGroup;
- class Relation;
- class Context;
- class ViewAdaptor;
--class HtmlView;
- class ReportView;
-
- class ReportDesignDialog;
-@@ -179,8 +178,6 @@ public Q_SLOTS:
-
- void slotCreateView();
-
-- void slotIntroduction();
--
- void openRelationDialog(KPlato::Node *par, KPlato::Node *child);
- void slotEditRelation(KPlato::Relation *rel);
- void slotAddRelation(KPlato::Node *par, KPlato::Node *child, int linkType);
-@@ -258,8 +255,6 @@ protected Q_SLOTS:
- void slotMailWorkpackage(KPlato::Node *node, KPlato::Resource *resource = nullptr);
- void slotPublishWorkpackages(const QList<KPlato::Node*> &nodes, KPlato::Resource *resource, bool mailTo);
-
-- void slotOpenUrlRequest(KPlato::HtmlView *v, const QUrl &url);
--
- void createReportView(const QDomDocument &doc);
-
- void saveTaskModule(const QUrl &url, KPlato::Project *project);
-@@ -281,8 +276,6 @@ protected:
-
- ViewBase *currentView() const;
-
-- ViewBase *createIntroductionView();
--
- private Q_SLOTS:
- void slotActionDestroyed(QObject *o);
- void slotViewListItemRemoved(KPlato::ViewListItem *item);
-@@ -383,9 +376,6 @@ private:
- // ------ Settings
- QAction *actionConfigure;
-
-- // ------ Help
-- QAction *actionIntroduction;
--
- // ------ Popup
- QAction *actionOpenNode;
- QAction *actionTaskProgress;
-diff --git a/src/libs/ui/CMakeLists.txt b/src/libs/ui/CMakeLists.txt
-index ca22f77f..15d8087c 100644
---- a/src/libs/ui/CMakeLists.txt
-+++ b/src/libs/ui/CMakeLists.txt
-@@ -96,8 +96,6 @@ set(planui_LIB_SRCS
- kptworkpackagemergedialog.cpp
- kptrecalculatedialog.cpp
-
-- kpthtmlview.cpp
--
- locale/localemon.cpp
- kptlocaleconfigmoneydialog.cpp
-
-@@ -166,13 +164,12 @@ target_link_libraries(planui
- PUBLIC
- planmain
- planmodels
-- KF5::KHtml
-+ KF5::TextWidgets
- PRIVATE
- KChart
- KF5::ItemViews
- KF5::IconThemes
- KF5::Archive
-- KF5::TextWidgets
- KF5::KIOCore
- KF5::KIOFileWidgets
- KF5::KIOWidgets
-diff --git a/src/welcome/WelcomeView.cpp b/src/welcome/WelcomeView.cpp
-index bede7f4f..b6115fd7 100644
---- a/src/welcome/WelcomeView.cpp
-+++ b/src/welcome/WelcomeView.cpp
-@@ -156,14 +156,6 @@ WelcomeView::WelcomeView(KoPart *part, KoDocument *doc, QWidget *parent)
- "<nl/>This enables you to quickly open projects you have worked on recently."
- "</para>"));
-
-- Help::add(ui.introductionBtn,
-- xi18nc("@info:whatsthis",
-- "<title>Introduction to <application>Plan</application></title>"
-- "<para>"
-- "These introductory pages gives you hints and tips on what"
-- " you can use <application>Plan</application> for, and how to use it."
-- "</para>"));
--
- Help::add(ui.contextHelp,
- xi18nc("@info:whatsthis",
- "<title>Context help</title>"
-@@ -199,7 +191,6 @@ WelcomeView::WelcomeView(KoPart *part, KoDocument *doc, QWidget *parent)
- connect(ui.newProjectBtn, &QAbstractButton::clicked, this, &WelcomeView::slotNewProject);
- connect(ui.createResourceFileBtn, &QAbstractButton::clicked, this, &WelcomeView::slotCreateResourceFile);
- connect(ui.openProjectBtn, &QAbstractButton::clicked, this, &WelcomeView::slotOpenProject);
-- connect(ui.introductionBtn, &QAbstractButton::clicked, this, &WelcomeView::showIntroduction);
-
- connect(ui.recentProjects, &QAbstractItemView::activated, this, &WelcomeView::slotRecentFileSelected);
-
-diff --git a/src/welcome/WelcomeView.h b/src/welcome/WelcomeView.h
-index a09ebe2d..be604de7 100644
---- a/src/welcome/WelcomeView.h
-+++ b/src/welcome/WelcomeView.h
-@@ -64,7 +64,6 @@ Q_SIGNALS:
- void newProject();
- void openProject();
- void recentProject(const QUrl &file, KoPart *part);
-- void showIntroduction();
- void selectDefaultView();
- void loadSharedResources(const QUrl &url, const QUrl &projects);
- void openExistingFile(const QUrl &url);
-diff --git a/src/welcome/WelcomeView.ui b/src/welcome/WelcomeView.ui
-index 7317214b..9b3363db 100644
---- a/src/welcome/WelcomeView.ui
-+++ b/src/welcome/WelcomeView.ui
-@@ -231,14 +231,10 @@
- </spacer>
- </item>
- <item>
-- <widget class="QPushButton" name="introductionBtn">
-+ <widget class="QLabel" name="label_6">
- <property name="text">
- <string>Introduction</string>
- </property>
-- <property name="icon">
-- <iconset theme="help-hint">
-- <normaloff>.</normaloff>.</iconset>
-- </property>
- </widget>
- </item>
- <item>
---
-2.29.1
-
-
-From 8aec5de56c525e71ae650abd4abfba756f5e5724 Mon Sep 17 00:00:00 2001
-From: Dag Andersen <dag.andersen@kdemail.net>
-Date: Mon, 26 Oct 2020 14:17:48 +0100
-Subject: [PATCH 2/2] User docs now on docs.kde.org
-
----
- src/welcome/WelcomeView.ui | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/welcome/WelcomeView.ui b/src/welcome/WelcomeView.ui
-index 9b3363db..741913b3 100644
---- a/src/welcome/WelcomeView.ui
-+++ b/src/welcome/WelcomeView.ui
-@@ -307,7 +307,7 @@
- <string>https://userbase.kde.org/Plan</string>
- </property>
- <property name="text">
-- <string comment="@action:button"><a href="https://userbase.kde.org/Plan">Plan user documentation</a></string>
-+ <string comment="@action:button"><a href="https://docs.kde.org/index.php?application=calligraplan">Plan user documentation</a></string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
---
-2.29.1
-
diff --git a/app-office/calligraplan/files/calligraplan-3.2.2-qt-5.15.patch b/app-office/calligraplan/files/calligraplan-3.2.2-qt-5.15.patch
deleted file mode 100644
index fd925ffee68..00000000000
--- a/app-office/calligraplan/files/calligraplan-3.2.2-qt-5.15.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f77fb06dc5d9f7930da9c757d6916f1149dc42bd Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heirecka@exherbo.org>
-Date: Sun, 29 Mar 2020 13:55:53 +0200
-Subject: [PATCH] Fix build with Qt 5.15
-
-Summary:
-QPainterPath is no longer included via qtransform.h (since
-5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
-
-Test Plan: Builds
-
-Reviewers: #calligra:_3.0, danders
-
-Differential Revision: https://phabricator.kde.org/D28403
----
- src/libs/ui/kptganttitemdelegate.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libs/ui/kptganttitemdelegate.cpp b/src/libs/ui/kptganttitemdelegate.cpp
-index 04217da4..d2f3e6d8 100644
---- a/src/libs/ui/kptganttitemdelegate.cpp
-+++ b/src/libs/ui/kptganttitemdelegate.cpp
-@@ -28,6 +28,7 @@
- #include <QModelIndex>
- #include <QApplication>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLocale>
-
- #include <KLocalizedString>
---
-GitLab
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-08 21:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-13 21:13 [gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/, app-office/calligraplan/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2021-03-08 21:14 Andreas Sturmlechner
2019-08-16 14:40 Andreas Sturmlechner
2019-01-01 19:40 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox