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 B38C0138350 for ; Sat, 18 Apr 2020 19:33:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 78F2AE0974; Sat, 18 Apr 2020 19:33:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 602B4E0974 for ; Sat, 18 Apr 2020 19:33:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 0FFA834F071 for ; Sat, 18 Apr 2020 19:33:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 95D781DE for ; Sat, 18 Apr 2020 19:33:06 +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: <1587238367.88f036d302734f8ca783fa807788786ceba04240.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/falkon/files/, www-client/falkon/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/falkon/falkon-3.1.0-r1.ebuild www-client/falkon/files/falkon-3.1.0-qt-5.15.patch X-VCS-Directories: www-client/falkon/ www-client/falkon/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 88f036d302734f8ca783fa807788786ceba04240 X-VCS-Branch: master Date: Sat, 18 Apr 2020 19:33:06 +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: 55cc232d-682f-4379-bfdf-0e3ad9ddb8f6 X-Archives-Hash: 9bb5dd074a9c1a96d5eaebcd02b2b143 commit: 88f036d302734f8ca783fa807788786ceba04240 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Apr 18 19:09:21 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Apr 18 19:32:47 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88f036d3 www-client/falkon: Fix build with Qt 5.15 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> www-client/falkon/falkon-3.1.0-r1.ebuild | 1 + www-client/falkon/files/falkon-3.1.0-qt-5.15.patch | 26 ++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/www-client/falkon/falkon-3.1.0-r1.ebuild b/www-client/falkon/falkon-3.1.0-r1.ebuild index 687be8779fb..3534c91a317 100644 --- a/www-client/falkon/falkon-3.1.0-r1.ebuild +++ b/www-client/falkon/falkon-3.1.0-r1.ebuild @@ -63,6 +63,7 @@ PATCHES=( "${FILESDIR}/${P}-use-cmake-find-intl.patch" "${FILESDIR}/${P}-fix-warn-registering-schemes.patch" "${FILESDIR}/${P}-qt-5.14.patch" + "${FILESDIR}/${P}-qt-5.15.patch" ) # bug 653046 diff --git a/www-client/falkon/files/falkon-3.1.0-qt-5.15.patch b/www-client/falkon/files/falkon-3.1.0-qt-5.15.patch new file mode 100644 index 00000000000..2ca9783f2ac --- /dev/null +++ b/www-client/falkon/files/falkon-3.1.0-qt-5.15.patch @@ -0,0 +1,26 @@ +From 2ca83509dbc72dfdfa9cc7103c2b29db31e07f3a Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Sun, 29 Mar 2020 12:53:00 +0200 +Subject: Fix build with Qt 5.15 + +QPainterPath is no longer included via qtransform.h (since +5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git). +--- + src/lib/tools/qztools.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib/tools/qztools.cpp b/src/lib/tools/qztools.cpp +index 499b225..04f19b7 100644 +--- a/src/lib/tools/qztools.cpp ++++ b/src/lib/tools/qztools.cpp +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +cgit v1.1 +