From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 30AD3158090 for ; Mon, 9 May 2022 00:34:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 52823E08F7; Mon, 9 May 2022 00:34:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35A0EE08F7 for ; Mon, 9 May 2022 00:34:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1EF4534142C for ; Mon, 9 May 2022 00:34:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 69E70452 for ; Mon, 9 May 2022 00:34:29 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1652056419.3b8279611688f3898c5b6c5e76e0062d7fbed123.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/kjots/, app-text/kjots/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch app-text/kjots/kjots-5.1.0-r2.ebuild X-VCS-Directories: app-text/kjots/ app-text/kjots/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 3b8279611688f3898c5b6c5e76e0062d7fbed123 X-VCS-Branch: master Date: Mon, 9 May 2022 00:34:29 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 71b03bac-ea44-424b-a244-3d6b628d6418 X-Archives-Hash: 75e7d1c9d053c00ab271aae88faa0a8d commit: 3b8279611688f3898c5b6c5e76e0062d7fbed123 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon May 9 00:32:48 2022 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon May 9 00:33:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b827961 app-text/kjots: Fix build with kde-apps/akonadi-notes-22.04.0 Closes: https://bugs.gentoo.org/840272 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> .../kjots/files/kjots-5.1.0-akonadi-22.04.0.patch | 87 ++++++++++++++++++++++ app-text/kjots/kjots-5.1.0-r2.ebuild | 1 + 2 files changed, 88 insertions(+) diff --git a/app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch b/app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch new file mode 100644 index 000000000000..a5ef2cc2cdf9 --- /dev/null +++ b/app-text/kjots/files/kjots-5.1.0-akonadi-22.04.0.patch @@ -0,0 +1,87 @@ +From b9d91006eb3ca1c6e495d0f3d1cc32775a26538c Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +Date: Tue, 1 Mar 2022 23:33:19 +0100 +Subject: [PATCH] Fix akonadi includes + +--- + src/kjotsmodel.cpp | 2 +- + src/kjotswidget.cpp | 2 +- + src/noteshared/notecreatorandselector.cpp | 2 +- + src/noteshared/standardnoteactionmanager.cpp | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + + +From 17f373bb728cbc553c5fe644563ebd015eda4075 Mon Sep 17 00:00:00 2001 +From: Wolfgang Bauer +Date: Fri, 1 Apr 2022 08:00:34 +0000 +Subject: [PATCH] Fix build with Akonadi 21.12 + +--- + src/kjotsmodel.cpp | 4 ++++ + src/kjotswidget.cpp | 6 +++++- + src/noteshared/notecreatorandselector.cpp | 4 ++++ + src/noteshared/standardnoteactionmanager.cpp | 4 ++++ + 4 files changed, 17 insertions(+), 1 deletion(-) + +diff -u a/src/kjotsmodel.cpp b/src/kjotsmodel.cpp +--- a/src/kjotsmodel.cpp ++++ b/src/kjotsmodel.cpp +@@ -21,7 +21,11 @@ + #include + #include + #endif ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) ++#include ++#else + #include ++#endif + + #include + #include +diff -u a/src/kjotswidget.cpp b/src/kjotswidget.cpp +--- a/src/kjotswidget.cpp ++++ b/src/kjotswidget.cpp +@@ -34,8 +34,12 @@ + #include + + // Akonadi +-#include + #include ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) ++#include ++#else ++#include ++#endif + #if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41) + #include + #include +diff -u a/src/noteshared/notecreatorandselector.cpp b/src/noteshared/notecreatorandselector.cpp +--- a/src/noteshared/notecreatorandselector.cpp ++++ b/src/noteshared/notecreatorandselector.cpp +@@ -24,7 +24,11 @@ + #include + #include + #endif ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) ++#include ++#else + #include ++#endif + + #include "noteshared_debug.h" + +diff -u a/src/noteshared/standardnoteactionmanager.cpp b/src/noteshared/standardnoteactionmanager.cpp +--- a/src/noteshared/standardnoteactionmanager.cpp ++++ b/src/noteshared/standardnoteactionmanager.cpp +@@ -25,7 +25,11 @@ + #include + #include + #endif ++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 19, 41) ++#include ++#else + #include ++#endif + + #include + #include diff --git a/app-text/kjots/kjots-5.1.0-r2.ebuild b/app-text/kjots/kjots-5.1.0-r2.ebuild index a948d3a45db6..7ef5fe968253 100644 --- a/app-text/kjots/kjots-5.1.0-r2.ebuild +++ b/app-text/kjots/kjots-5.1.0-r2.ebuild @@ -51,4 +51,5 @@ PATCHES=( "${FILESDIR}/${P}-missing-lib.patch" "${FILESDIR}/${P}-akonadi-21.12.0.patch" # bug 830580 "${FILESDIR}/${P}-speech-optional.patch" # bug 835128 + "${FILESDIR}/${P}-akonadi-22.04.0.patch" # bug 840272 )