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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9AB89138334 for ; Sun, 17 Nov 2019 21:54:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B139E0830; Sun, 17 Nov 2019 21:54:25 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4D80CE0830 for ; Sun, 17 Nov 2019 21:54:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 54EBD34CF1D for ; Sun, 17 Nov 2019 21:54:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A1081888 for ; Sun, 17 Nov 2019 21:54:21 +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: <1574027649.158d589c8aa05a7f1695fa6b39c94e285ccca927.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/akonadi/, kde-apps/akonadi/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/akonadi/akonadi-19.11.80.ebuild kde-apps/akonadi/files/akonadi-19.11.80-qt-5.14.patch X-VCS-Directories: kde-apps/akonadi/files/ kde-apps/akonadi/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 158d589c8aa05a7f1695fa6b39c94e285ccca927 X-VCS-Branch: master Date: Sun, 17 Nov 2019 21:54:21 +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: c529000d-1cfb-4d7e-8295-3d0b4bbfd4a8 X-Archives-Hash: 454c2ab00ac9e60e24f8f08730c570f1 commit: 158d589c8aa05a7f1695fa6b39c94e285ccca927 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Nov 17 21:54:09 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Nov 17 21:54:09 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=158d589c kde-apps/akonadi: Fix build with Qt 5.14 Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/akonadi/akonadi-19.11.80.ebuild | 6 ++- .../akonadi/files/akonadi-19.11.80-qt-5.14.patch | 46 ++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) diff --git a/kde-apps/akonadi/akonadi-19.11.80.ebuild b/kde-apps/akonadi/akonadi-19.11.80.ebuild index 886147b825..41ff83a435 100644 --- a/kde-apps/akonadi/akonadi-19.11.80.ebuild +++ b/kde-apps/akonadi/akonadi-19.11.80.ebuild @@ -37,6 +37,7 @@ COMMON_DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=dev-qt/qtcore-${QTMIN}:5= >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 @@ -69,7 +70,10 @@ RDEPEND="${COMMON_DEPEND} # some akonadi tests time out, that probably needs more work as it's ~700 tests RESTRICT+=" test" -PATCHES=( "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-18.12.2-mysql56-crash.patch" + "${FILESDIR}/${P}-qt-5.14.patch" +) pkg_setup() { # Set default storage backend in order: MySQL, PostgreSQL, SQLite diff --git a/kde-apps/akonadi/files/akonadi-19.11.80-qt-5.14.patch b/kde-apps/akonadi/files/akonadi-19.11.80-qt-5.14.patch new file mode 100644 index 0000000000..c3165698b2 --- /dev/null +++ b/kde-apps/akonadi/files/akonadi-19.11.80-qt-5.14.patch @@ -0,0 +1,46 @@ +From 1d4bb01a60548ae9a5439186fbe155f9f7d492e4 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Sun, 17 Nov 2019 18:45:49 +0100 +Subject: Fix build with Qt 5.14 + +Summary: +std::hash is already specialized in Qt 5.14 [1], so we need +to avoid redifining it with this version. + +[1] 4469e36d7203a55a4e158a50f0e9effc3f2fa3c2 in qtbase.git + +Test Plan: Builds fine with Qt 5.14.0-beta3 + +Reviewers: #kde_pim + +Subscribers: kde-pim + +Tags: #kde_pim + +Differential Revision: https://phabricator.kde.org/D25356 +--- + src/shared/akstd.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/shared/akstd.h b/src/shared/akstd.h +index 4078ee4..774c432 100644 +--- a/src/shared/akstd.h ++++ b/src/shared/akstd.h +@@ -29,6 +29,7 @@ + + namespace std { + ++#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0)) + template<> + struct hash { + using argument_type = QString; +@@ -39,6 +40,7 @@ struct hash { + return qHash(s); + } + }; ++#endif + + } + +-- +cgit v1.1