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 85BCB1382C5 for ; Mon, 22 Jun 2020 08:16:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A9D5BE08C4; Mon, 22 Jun 2020 08:16:36 +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 8193AE08C4 for ; Mon, 22 Jun 2020 08:16:36 +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 E28A334EF9E for ; Mon, 22 Jun 2020 08:16:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 53BA022B for ; Mon, 22 Jun 2020 08:16:33 +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: <1592813755.124fe3d1d0285a7420e52fb4c530e4c702f93a1b.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/, net-p2p/retroshare/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch net-p2p/retroshare/retroshare-0.6.5.ebuild X-VCS-Directories: net-p2p/retroshare/files/ net-p2p/retroshare/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 124fe3d1d0285a7420e52fb4c530e4c702f93a1b X-VCS-Branch: master Date: Mon, 22 Jun 2020 08:16:33 +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: 0ff6ad01-e28a-4ded-a7cf-f9a17585b0ce X-Archives-Hash: 8d83c91cdc0135b54d2ed3b57f7bbff7 commit: 124fe3d1d0285a7420e52fb4c530e4c702f93a1b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jun 21 16:45:26 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jun 22 08:15:55 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=124fe3d1 net-p2p/retroshare: Fix build with Qt 5.15 Upstream patch needed quite some modifications to apply. Closes: https://bugs.gentoo.org/728836 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/retroshare-0.6.5-qt-5.15.patch | 99 ++++++++++++++++++++++ net-p2p/retroshare/retroshare-0.6.5.ebuild | 13 +-- 2 files changed, 107 insertions(+), 5 deletions(-) diff --git a/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch b/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch new file mode 100644 index 00000000000..21147a6391b --- /dev/null +++ b/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch @@ -0,0 +1,99 @@ +From bbaad838572b5fba6109bc7d3b5c55c2c68e6cdc Mon Sep 17 00:00:00 2001 +From: Phenom +Date: Mon, 1 Jun 2020 13:44:43 +0200 +Subject: [PATCH] Fix build with Qt 5.15+ + +--- + retroshare-gui/src/gui/elastic/elnode.h | 8 +++++--- + .../src/gui/gxs/GxsCommentTreeWidget.cpp | 16 +++++++++------- + retroshare-gui/src/gui/gxs/GxsIdDetails.cpp | 18 ++++++++++-------- + 3 files changed, 24 insertions(+), 18 deletions(-) + +diff --git a/retroshare-gui/src/gui/elastic/elnode.h b/retroshare-gui/src/gui/elastic/elnode.h +index 1e0edd1a87..33043ddab3 100644 +--- a/retroshare-gui/src/gui/elastic/elnode.h ++++ b/retroshare-gui/src/gui/elastic/elnode.h +@@ -26,6 +26,10 @@ + #ifndef ELNODE_H + #define ELNODE_H + ++#include "graphwidget.h" ++ ++#include ++ + #include + #if QT_VERSION >= 0x040600 + #include +@@ -36,9 +40,7 @@ + #include + #endif + #include +- +-#include +-#include "graphwidget.h" ++#include + + class Edge; + QT_BEGIN_NAMESPACE +--- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp ++++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp +@@ -18,6 +18,12 @@ + * * + *******************************************************************************/ + ++#include "GxsCommentTreeWidget.h" ++ ++#include "gui/common/RSElidedItemDelegate.h" ++#include "gui/gxs/GxsCreateCommentDialog.h" ++#include "gui/gxs/GxsIdTreeWidgetItem.h" ++ + #include + #include + #include +@@ -25,13 +31,9 @@ + #include + #include + #include ++#include + #include + +-#include "gui/common/RSElidedItemDelegate.h" +-#include "gui/gxs/GxsCommentTreeWidget.h" +-#include "gui/gxs/GxsCreateCommentDialog.h" +-#include "gui/gxs/GxsIdTreeWidgetItem.h" +- + #include + + #define PCITEM_COLUMN_COMMENT 0 +diff --git a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp +--- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp ++++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp +@@ -18,19 +18,21 @@ + * * + *******************************************************************************/ + +-#include +-#include +-#include +-#include ++#include "GxsIdDetails.h" + +-#include +-#include "GxsIdDetails.h" + #include "retroshare-gui/RsAutoUpdatePage.h" + + #include + +-#include ++#include ++#include + #include ++#include ++#include ++#include ++ ++#include ++#include + + /* Images for tag icons */ + #define IMAGE_LOADING ":/images/folder-draft.png" diff --git a/net-p2p/retroshare/retroshare-0.6.5.ebuild b/net-p2p/retroshare/retroshare-0.6.5.ebuild index ab3d11026c9..b2c53a2a283 100644 --- a/net-p2p/retroshare/retroshare-0.6.5.ebuild +++ b/net-p2p/retroshare/retroshare-0.6.5.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit desktop qmake-utils xdg-utils +inherit desktop eutils qmake-utils xdg-utils DESCRIPTION="P2P private sharing application" HOMEPAGE="https://retroshare.cc" @@ -13,7 +13,6 @@ SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/Retro LICENSE="AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-3" SLOT="0" KEYWORDS="amd64 x86" - IUSE="cli control-socket gnome-keyring +gui +jsonapi service +sqlcipher webui +xapian" REQUIRED_USE=" @@ -60,10 +59,14 @@ BDEPEND="dev-util/cmake ) )" -src_unpack() { - default +PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) - mv RetroShare ${P} || die +S="${WORKDIR}"/RetroShare + +src_prepare() { + # CRLF endings break patch... + edos2unix retroshare-gui/src/gui/elastic/elnode.h + default } src_configure() {