From 104f598d867eac3737dfa57f378a7a471f384959 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Sun, 24 Apr 2022 18:09:57 +0200 Subject: finance/kraft: fix build against akonadi-contacts 22.04 Move old one from PATCHFILES to files/ and rebase against the tag for easier patch application. --- finance/kraft/Makefile | 3 - finance/kraft/distinfo | 2 - .../files/patch-git_0001_14906b37-akonadi-5.19 | 92 ++++++++++++++++++++++ .../patch-git_0002_e492e3d7-akonadi-contacts-22.04 | 69 ++++++++++++++++ 4 files changed, 161 insertions(+), 5 deletions(-) create mode 100644 finance/kraft/files/patch-git_0001_14906b37-akonadi-5.19 create mode 100644 finance/kraft/files/patch-git_0002_e492e3d7-akonadi-contacts-22.04 (limited to 'finance') diff --git a/finance/kraft/Makefile b/finance/kraft/Makefile index 8ed87f93f268..8546aafa3673 100644 --- a/finance/kraft/Makefile +++ b/finance/kraft/Makefile @@ -3,9 +3,6 @@ DISTVERSIONPREFIX= v DISTVERSION= 0.97 CATEGORIES= finance kde -PATCH_SITES= https://github.com/dragotin/kraft/commit/ -PATCHFILES= 14906b37cd58136b8f16592e6f62ac147c3e2e71.patch:-p1 - MAINTAINER= kde@FreeBSD.org COMMENT= Manage invoices and documents for small companies diff --git a/finance/kraft/distinfo b/finance/kraft/distinfo index 89ea7791f502..70ac0d617f94 100644 --- a/finance/kraft/distinfo +++ b/finance/kraft/distinfo @@ -1,5 +1,3 @@ TIMESTAMP = 1639155611 SHA256 (dragotin-kraft-v0.97_GH0.tar.gz) = 9d16c259e2eb44adfcc0682b0e9a09ad5c9dd249db16f3f56c1fee9236fe9af5 SIZE (dragotin-kraft-v0.97_GH0.tar.gz) = 907640 -SHA256 (14906b37cd58136b8f16592e6f62ac147c3e2e71.patch) = 263a66316e7d4416a15bd83fad25cdac529a4c454c3b36bca17f86947e774818 -SIZE (14906b37cd58136b8f16592e6f62ac147c3e2e71.patch) = 2697 diff --git a/finance/kraft/files/patch-git_0001_14906b37-akonadi-5.19 b/finance/kraft/files/patch-git_0001_14906b37-akonadi-5.19 new file mode 100644 index 000000000000..bb2d20d9d35c --- /dev/null +++ b/finance/kraft/files/patch-git_0001_14906b37-akonadi-5.19 @@ -0,0 +1,92 @@ +From 3894d1d013310d9212c1df42dbde2161dec16645 Mon Sep 17 00:00:00 2001 +From: Klaas Freitag +Date: Sat, 9 Oct 2021 12:00:44 +0200 +Subject: [PATCH 1/2] Merge pull request #116 from + kossebau/prepareforakonadi2112 + +Adapt to new Akonadi includes in Akonadi 5.19 +--- + src/addressprovider_akonadi.cpp | 15 ++++++++++++++- + src/addressprovider_akonadi.h | 8 +++++++- + src/addressselectorwidget.cpp | 6 ++++++ + 3 files changed, 27 insertions(+), 2 deletions(-) + +diff --git src/addressprovider_akonadi.cpp src/addressprovider_akonadi.cpp +index edb9d0c..4a809a8 100644 +--- src/addressprovider_akonadi.cpp ++++ src/addressprovider_akonadi.cpp +@@ -21,16 +21,29 @@ + #include + + #ifdef HAVE_AKONADI ++#include "akonadi/contact/contactsearchjob.h" ++#include ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include ++#include ++ ++#include ++ ++#include ++#include ++#include ++#include ++#else + #include + #include + +-#include "akonadi/contact/contactsearchjob.h" + #include + + #include + #include + #include + #include ++#endif + + using namespace Akonadi; + #endif +diff --git src/addressprovider_akonadi.h src/addressprovider_akonadi.h +index fde0f44..14f6aa2 100644 +--- src/addressprovider_akonadi.h ++++ src/addressprovider_akonadi.h +@@ -25,9 +25,15 @@ + + #ifdef HAVE_AKONADI + #include ++#include ++#include ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include ++#include ++#else + #include + #include +-#include ++#endif + #endif + + class QAbstractItemModel; +diff --git src/addressselectorwidget.cpp src/addressselectorwidget.cpp +index ad450c9..bf0c95d 100644 +--- src/addressselectorwidget.cpp ++++ src/addressselectorwidget.cpp +@@ -37,9 +37,15 @@ + #include + + #ifdef HAVE_AKONADI ++#include ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) ++#include ++#include ++#else + #include + #include + #endif ++#endif + + /* ==================================================================== */ + AddressSortProxyModel::AddressSortProxyModel(AddressProvider *provider, QObject *parent) +-- +2.36.0 + diff --git a/finance/kraft/files/patch-git_0002_e492e3d7-akonadi-contacts-22.04 b/finance/kraft/files/patch-git_0002_e492e3d7-akonadi-contacts-22.04 new file mode 100644 index 000000000000..ec5e40bef965 --- /dev/null +++ b/finance/kraft/files/patch-git_0002_e492e3d7-akonadi-contacts-22.04 @@ -0,0 +1,69 @@ +From e492e3d78520ff02aa4626f447ab2eea97cab2cc Mon Sep 17 00:00:00 2001 +From: "Tobias C. Berner" +Date: Sun, 24 Apr 2022 17:45:57 +0200 +Subject: [PATCH 2/2] Fix build with akonadi-contacts 22.04 + +--- + src/addressprovider_akonadi.cpp | 7 ++++++- + src/addressprovider_akonadi.h | 5 +++++ + src/addressselectorwidget.h | 7 ++++++- + 3 files changed, 17 insertions(+), 2 deletions(-) + +diff --git src/addressprovider_akonadi.cpp src/addressprovider_akonadi.cpp +index 4a809a8..33e232a 100644 +--- src/addressprovider_akonadi.cpp ++++ src/addressprovider_akonadi.cpp +@@ -21,7 +21,12 @@ + #include + + #ifdef HAVE_AKONADI +-#include "akonadi/contact/contactsearchjob.h" ++#include ++#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 20, 0) ++#include ++#else ++#include ++#endif + #include + #if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) + #include +diff --git src/addressprovider_akonadi.h src/addressprovider_akonadi.h +index 14f6aa2..4130f8a 100644 +--- src/addressprovider_akonadi.h ++++ src/addressprovider_akonadi.h +@@ -25,7 +25,12 @@ + + #ifdef HAVE_AKONADI + #include ++#include ++#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 20, 0) ++#include ++#else + #include ++#endif + #include + #if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) + #include +diff --git src/addressselectorwidget.h src/addressselectorwidget.h +index cb3428e..7a661c6 100644 +--- src/addressselectorwidget.h ++++ src/addressselectorwidget.h +@@ -23,9 +23,14 @@ + #include + + #ifdef HAVE_AKONADI ++#include ++#if AKONADICONTACT_VERSION >= QT_VERSION_CHECK(5, 20, 0) ++#include ++#include ++#else + #include + #include +- ++#endif + #endif + + #include +-- +2.36.0 + -- cgit v1.2.3