From nobody Sun Apr 24 16:15:46 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4C3B51A83D02; Sun, 24 Apr 2022 16:15:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KmYCk1gGhz3nX5; Sun, 24 Apr 2022 16:15:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650816946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WQQiYjRu/8y0CJcM54gCKLEYPBOx6c3E/Ypy8y5oL/0=; b=QZvhOtmWnAQGCvkwlaHC+OGNRPrwAJI35HYZVEHK9T4BJgb3cY+SzQHuTEHCfJqRCi0W8A Aa6CQYeffU25a8KxjkFjupdFzkTlAPUqKRXg+cbSW6D6otGNZkYfZTxDW10it0ZzLP8w0f 73CLwEtY3ZyAwt/0733vZzqxoxHGx2eSG9RccB2XDWdT8WX8KOm1LIL5hjOmFmY+T+oAoS ZeAkVD4OcOIt6tEd5U9OqN0ddsaD7Vzd4DSP02dCifWJazveCS7ca9lIxRaP/60bprombq +ih//Wi2nwkJV8xLBYE78F2Z7t8yqoA/VcuRF7CmNhZztVhbqVqq8hBnPOMXSg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 19A231627; Sun, 24 Apr 2022 16:15:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23OGFko0039397; Sun, 24 Apr 2022 16:15:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23OGFkbj039396; Sun, 24 Apr 2022 16:15:46 GMT (envelope-from git) Date: Sun, 24 Apr 2022 16:15:46 GMT Message-Id: <202204241615.23OGFkbj039396@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 104f598d867e - main - finance/kraft: fix build against akonadi-contacts 22.04 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 104f598d867eac3737dfa57f378a7a471f384959 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650816946; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WQQiYjRu/8y0CJcM54gCKLEYPBOx6c3E/Ypy8y5oL/0=; b=hwhp8c0xoXqb2iL4cIyz3ItTePyK2DZUTBcbLlNBE9YgETZyYVMxmVA49StP2mKmiAc2uD Jl7crLNB2OmtLc7/+Y2MRVBKJpEMylCEsggdf+dASYT41rcC4kxrQ3SaWQnW2TcGB3p8sr PUc3ddf9VUHfK4iy2YipbKu/etjV45KSMeQtO4+uYuiOCxMbhfmJp4sZg8d5GK6d5JxpaY w8ulpTY1Mi3D+XBF9FnsFfCXwQjHSsPjksO3QCE1PZeJOzu21D7+TQj0f/yqjdtMq9vyg3 Sv1xoHymu91Nq8RbzQ5G12N501Mz3yyvXbbNobRg1tK0O/qWuNEyNKM/ndQfZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650816946; a=rsa-sha256; cv=none; b=jPBzaxvF5WG/8zF0FTrBiH4W9YIid60QBs3whkGgsIum6D4a/5lovKO8ds1OuUqDyESNwu vlJJ+U9XmiJDifV+Sxj0n+EO1gQbZ78gRwu2skq3CRiMm4MNqGY9QAvoqbvptvidkF5tAb 0kTVE7DX2hAlGlfiwYwwh0C9sE1Ts8XQG9EA0H6RSQsJPFdCmHtJKdclWdcwyWAWJAlIln kazg4NwkT0y6jZAIxkWO23iXyOHm+mh5hqLZPiOdi0D+iQKNshU9uVY8NfMmuyFnqESZyE iYpw7g+mJQLAqCLr9SAa5ctiNJmZ8DEr56qPc6bncrh6bdedPPjdbNBD/Wioag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=104f598d867eac3737dfa57f378a7a471f384959 commit 104f598d867eac3737dfa57f378a7a471f384959 Author: Tobias C. Berner AuthorDate: 2022-04-24 16:09:57 +0000 Commit: Tobias C. Berner CommitDate: 2022-04-24 16:15:29 +0000 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(-) 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 +