[gentoo-commits] repo/gentoo:master commit in: app-office/kraft/, app-office/kraft/files/
commit: b76bf200ce9bf0e9171d53c988f91a456e8f2bf0
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Aug 26 10:30:45 2023 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Aug 31 19:19:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b76bf200
app-office/kraft: add 1.0, build w/ >=kde-apps/akonadi-contact-23.08
See also:
https://github.com/dragotin/kraft/issues/209
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/kraft/Manifest | 1 +
.../kraft/files/kraft-1.0-akonadi-23.08.patch | 161 +
app-office/kraft/files/kraft-1.0-cmake.patch | 197 +
app-office/kraft/kraft-1.0.ebuild | 54 ++
4 files changed, 413 insertions(+)
diff --git a/app-office/kraft/Manifest b/app-office/kraft/Manifest
index 0094ce821964..71a320a20c03 100644
--- a/app-office/kraft/Manifest
+++ b/app-office/kraft/Manifest
@@ -1 +1,2 @@
DIST kraft-0.98.tar.gz 968081 BLAKE2B
01221ea11e3d4793b2158f1742a2629759405aed22cc4e2c33e0c2d54862c34eb51f435af11738b383671b254e984a92a3362e9465ebb899054401156f535cba
SHA512
f8241ac00d80d45224fdc1d4847724d08ac138ea4c6a95a598b001c977002b2c3e8a9f054a1ac2ac4e86de6de8eff304b11b653a3dc3225ad757c5f5ca501850
+DIST kraft-1.0.tar.gz 3629908 BLAKE2B
b40dc2d647e2985b01d9ee241fbd8cf1eb551621c4635a79c248d69538d2ac034889828461f11e6eefc5258bafe160f421c2960ad80de2a264a8978a4687ad56
SHA512
c45b41ed6eb3eae1f29d158506ea59d55a636974bfb655b307e3045edefcbee84fd833e16cf06b7317e8f634e1efef83841a7361af86007973ab2ef234c32585
diff --git a/app-office/kraft/files/kraft-1.0-akonadi-23.08.patch
b/app-office/kraft/files/kraft-1.0-akonadi-23.08.patch
new file mode 100644
index ..40fdd6383d4a
--- /dev/null
+++ b/app-office/kraft/files/kraft-1.0-akonadi-23.08.patch
@@ -0,0 +1,161 @@
+From ba3a0e4c1d232b05daddd9ded110e15e0a3c9005 Mon Sep 17 00:00:00 2001
+From: Klaas Freitag
+Date: Tue, 29 Aug 2023 20:29:23 +0200
+Subject: [PATCH] Added Akonadi version check for some renamed components
+
+Akonadi renamed the contact viewer and editors namespace.
+---
+ CMakeLists.txt| 10 +-
+ src/CMakeLists.txt| 1 +
+ src/addressselectorwidget.cpp | 16 +++-
+ src/addressselectorwidget.h | 15 +--
+ 4 files changed, 34 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0f5541da..0cd73f99 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -109,7 +109,15 @@ set_package_properties(${AKO_PREFIX}AkonadiContact
PROPERTIES
+ TYPE OPTIONAL
+ )
+
+-if(${AKO_PREFIX}Akonadi_FOUND AND ${AKO_PREFIX}AkonadiContact_FOUND)
++find_package(${AKO_PREFIX}ContactEditor)
++set_package_properties(${AKO_PREFIX}ContactEditor PROPERTIES
++DESCRIPTION "Library for editing contacts stored in Akonadi"
++URL "https://www.kde.org/";
++PURPOSE "Optionally used for addressbook integration"
++TYPE OPTIONAL
++)
++
++if(${AKO_PREFIX}Akonadi_FOUND AND ${AKO_PREFIX}AkonadiContact_FOUND AND
${AKO_PREFIX}ContactEditor_FOUND)
+add_definitions(-DHAVE_AKONADI)
+ endif()
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index a2bc5dcf..eac624d4 100644
+--- a/src/CMakeLists.txt
b/src/CMakeLists.txt
+@@ -173,6 +173,7 @@ if(${AKO_PREFIX}Akonadi_FOUND)
+ list(APPEND KRAFT_LINK_LIBS
+ ${AKO_PREFIX}::AkonadiCore
+ ${AKO_PREFIX}::AkonadiContact
++${AKO_PREFIX}::ContactEditor
+ ${AKO_PREFIX}::AkonadiAgentBase
+ ${AKO_PREFIX}::AkonadiWidgets
+ ${AKO_PREFIX}::AkonadiXml
+diff --git a/src/addressselectorwidget.cpp b/src/addressselectorwidget.cpp
+index fd083634..504d5a6b 100644
+--- a/src/addressselectorwidget.cpp
b/src/addressselectorwidget.cpp
+@@ -235,7 +235,11 @@ KraftContactViewer::KraftContactViewer(QWidget *parent)
+ lay->setMargin(0);
+ setLayout(lay);
+ #ifdef HAVE_AKONADI
++#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 24, 0)
++_contactViewer = new ContactEditor::ContactViewer;
++#else
+ _contactViewer = new Akonadi::ContactViewer;
++#endif
+ _contactViewer->setShowQRCode(false);
+
+ lay->addWidget(_contactViewer);
+@@ -372,9 +376,12 @@ bool AddressSelectorWidget::backendUp() const
+ void AddressSelectorWidget::slotCreateNewContact()
+ {
+ #ifdef HAVE_AKONADI
+-// FIXME
+-_addressEditor.reset(new Akonadi::ContactEditorDialog(
Akonadi::ContactEditorDialog::CreateMode, this ));
+-_addressEditor->show();
++#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 24, 0)
++_addressEditor = new
ContactEditor::ContactEditorDialog(ContactEditor::ContactEditorDialog::EditMode,
this );
++#else
++_addressEditor = new
Akonadi::ContactEditorDialog(Akonadi::ContactEditorDialog::CreateMode, this );
++#endif
++_addressEditor->show();
+ #endif
+ }
+
+@@ -398,13 +405,12 @@ void
AddressSelectorWidget::slotAddresseeSelected(QModelIndex index)
+ void AddressSelectorWidget::slotEditContact()
+ {
+ #ifdef HAVE_AKONADI
+-
+
[gentoo-commits] repo/gentoo:master commit in: app-office/kraft/, app-office/kraft/files/
commit: 9b78384c0f8409c97abdb26e8930965700574d44
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Nov 19 19:27:15 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Nov 19 19:34:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b78384c
app-office/kraft: Add 0.80_pre20171115 kf5-based snapshot
Bug: https://bugs.gentoo.org/635058
Package-Manager: Portage-2.3.14, Repoman-2.3.6
app-office/kraft/Manifest | 1 +
.../kraft/files/kraft-0.80_pre20171115-deps.patch | 62 ++
app-office/kraft/kraft-0.80_pre20171115.ebuild | 48 +
app-office/kraft/metadata.xml | 5 +-
4 files changed, 115 insertions(+), 1 deletion(-)
diff --git a/app-office/kraft/Manifest b/app-office/kraft/Manifest
index 87833442293..854ce2518dc 100644
--- a/app-office/kraft/Manifest
+++ b/app-office/kraft/Manifest
@@ -1 +1,2 @@
DIST kraft-0.59.tar.xz 560116 SHA256
e05ff0b78a073bafffa5c0e41fe458461216b66fd57fc9432a1064a7be2b2034 SHA512
53576855e3a4ac054818cc3fcb5d123222c0a5839ba621ea7c1f390f1e3180b5c87b00daa09a57fbea64cbd1dc857c4cb7645c5f539635811ef236c76483dc36
WHIRLPOOL
d442c33ecbee4f0b3d8f33b358a5f7fab9f9c99d5e70019ca9d5910a3b717530008b6b09c3573132a27681f9e554f83f1798bc6b5a71d71fd10c81884692dd6e
+DIST kraft-0.80_pre20171115.tar.gz 572784 SHA256
b5ded884a9377fe88013aef9a230580e9f6fb9873764abe226736843489c1eae SHA512
7c9fa4b8c17809c36f4f6d94f4d6b900f91083c86b332d7680db1ad721904823b25cab5b8393913220dea9b16937bc90ac403af8f57fc6f963d59af41e1f51c3
WHIRLPOOL
2a62d59153a43bd473ad565baf09775b981047b6d998a2fd6f4e32ae4d57a56bb577b375e2896e67b23b2abef80f453e1cd44dc39b5dbe7c3b74a1236d1eeb87
diff --git a/app-office/kraft/files/kraft-0.80_pre20171115-deps.patch
b/app-office/kraft/files/kraft-0.80_pre20171115-deps.patch
new file mode 100644
index 000..cebf558fd35
--- /dev/null
+++ b/app-office/kraft/files/kraft-0.80_pre20171115-deps.patch
@@ -0,0 +1,62 @@
+From 63248f8004e7e0b05fe1716f6ff432b16b382e8f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner
+Date: Thu, 16 Nov 2017 22:14:05 +0100
+Subject: [PATCH] Sort deps, add implicit, and split PIM from real KF5 libs
+
+Add descriptions to PIM dependencies.
+---
+ CMakeLists.txt | 33 ++---
+ 1 file changed, 26 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 739daac..9f95ecf 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -25,21 +25,40 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII)
+
+ find_package(Qt5 CONFIG REQUIRED
+ Core
+-Network
+-Widgets
++Gui
+ Sql
++Widgets
++Xml
+ )
+
+ find_package(KF5 REQUIRED COMPONENTS
+-Contacts
++Config
++ConfigWidgets
++CoreAddons
+ I18n
++WidgetsAddons
+ XmlGui
+-OPTIONAL_COMPONENTS
+-Akonadi
+-AkonadiContact
+ )
+
+-if(KF5Akonadi_FOUND)
++find_package(KF5Contacts REQUIRED)
++
++find_package(KF5Akonadi)
++set_package_properties(KF5Akonadi PROPERTIES
++DESCRIPTION "Library for general Access to Akonadi"
++URL "https://www.kde.org/";
++PURPOSE "Optionally used for addressbook integration"
++TYPE OPTIONAL
++)
++
++find_package(KF5AkonadiContact)
++set_package_properties(KF5AkonadiContact PROPERTIES
++DESCRIPTION "Library for Accessing Contacts stored in Akonadi"
++URL "https://www.kde.org/";
++PURPOSE "Optionally used for addressbook integration"
++TYPE OPTIONAL
++)
++
++if(KF5Akonadi_FOUND AND KF5AkonadiContact_FOUND)
+add_definitions(-DHAVE_AKONADI)
+ endif()
+
diff --git a/app-office/kraft/kraft-0.80_pre20171115.ebuild
b/app-office/kraft/kraft-0.80_pre20171115.ebuild
new file mode 100644
index 000..cc3b1e38dba
--- /dev/null
+++ b/app-office/kraft/kraft-0.80_pre20171115.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=6618f5203f80a52e673cfad1a12dcee9154e2831
+KDE_HANDBOOK="forceoptional"
+inherit kde5 vcs-snapshot
+
+DESCRIPTION="Software to manage quotes and invoices in small enterprises"
+HOMEPAGE="http://www.volle-kraft-voraus.de/";
+SRC_URI="https://github.com/dragotin/${PN}/archive/${COMMIT}.tar.gz ->
${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="pim"
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_kdeapps_dep kcontacts)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtsql)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ dev-cpp/ctemplate
+ pim? (
+ $(add_kdeapps_dep akonadi)
+ $(add_kdeapps_dep akonadi-contacts)
+ )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS Changes.txt README Releasenotes.txt TODO )
+
+PATCHES=( "${FILESDIR}/${
