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 47E681382C5 for ; Sun, 21 Jun 2020 11:38:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83AF9E0883; Sun, 21 Jun 2020 11:38:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 6ED4FE0883 for ; Sun, 21 Jun 2020 11:38:12 +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 4BF6C34FAEC for ; Sun, 21 Jun 2020 11:38:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B38A2AD for ; Sun, 21 Jun 2020 11:38:00 +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: <1592739461.37e3998a29b4758e6a11a5c42320344f4139689b.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/fatrat/, net-misc/fatrat/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild net-misc/fatrat/files/fatrat-1.2.0_beta2_p20161204-qt-5.15.patch X-VCS-Directories: net-misc/fatrat/files/ net-misc/fatrat/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 37e3998a29b4758e6a11a5c42320344f4139689b X-VCS-Branch: master Date: Sun, 21 Jun 2020 11:38:00 +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: 4f714df6-3452-47f1-ab34-ff1a4886fcbb X-Archives-Hash: f3d84354e9ab452b79a7bfeffd1b3467 commit: 37e3998a29b4758e6a11a5c42320344f4139689b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 21 11:36:47 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jun 21 11:37:41 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37e3998a net-misc/fatrat: Fix build with Qt 5.15, EAPI-7 bump, cmake.eclass Drop superfluous vcs-snapshot.eclass Thanks-to: Zamarin Arthur gmail.com> Closes: https://bugs.gentoo.org/727166 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../fatrat/fatrat-1.2.0_beta2_p20161204.ebuild | 24 ++++++++++++++-------- .../fatrat-1.2.0_beta2_p20161204-qt-5.15.patch | 12 +++++++++++ 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild b/net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild index 6a079aa56c8..c82928e3267 100644 --- a/net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild +++ b/net-misc/fatrat/fatrat-1.2.0_beta2_p20161204.ebuild @@ -1,11 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 SNAPSHOT="14a1a146df76d70c44dcc38363848a5b41a364d5" - -inherit cmake-utils vcs-snapshot xdg-utils +inherit cmake xdg-utils DESCRIPTION="Qt5-based download/upload manager" HOMEPAGE="http://fatrat.dolezel.info/" @@ -16,6 +15,11 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="bittorrent +curl doc nls xmpp" +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" RDEPEND=" dev-qt/qtcore:5 dev-qt/qtdbus:5 @@ -34,12 +38,14 @@ RDEPEND=" " DEPEND="${RDEPEND} dev-libs/boost - dev-qt/linguist-tools:5 - virtual/pkgconfig - nls? ( sys-devel/gettext ) " -PATCHES=( "${FILESDIR}/${PN}-1.2.0_beta2_p20150803-build.patch" ) +S="${WORKDIR}/LubosD-${PN}-14a1a14" + +PATCHES=( + "${FILESDIR}/${PN}-1.2.0_beta2_p20150803-build.patch" + "${FILESDIR}/${P}-qt-5.15.patch" +) src_configure() { local mycmakeargs=( @@ -50,7 +56,7 @@ src_configure() { -DWITH_JABBER="$(usex xmpp ON OFF)" -DWITH_WEBINTERFACE=OFF ) - cmake-utils_src_configure + cmake_src_configure } pkg_postinst() { diff --git a/net-misc/fatrat/files/fatrat-1.2.0_beta2_p20161204-qt-5.15.patch b/net-misc/fatrat/files/fatrat-1.2.0_beta2_p20161204-qt-5.15.patch new file mode 100644 index 00000000000..def09bbd767 --- /dev/null +++ b/net-misc/fatrat/files/fatrat-1.2.0_beta2_p20161204-qt-5.15.patch @@ -0,0 +1,12 @@ +diff --git a/src/util/BalloonTip.cpp b/src/util/BalloonTip.cpp +index c20c0ee..67b5284 100644 +--- a/src/util/BalloonTip.cpp ++++ b/src/util/BalloonTip.cpp +@@ -2,6 +2,7 @@ + * Based on Qt source code + */ + ++#include + #include "BalloonTip.h" + #include + #include