diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-06-29 11:38:31 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-06-29 11:38:31 +0100 |
commit | 90c88731bd036e5698b281fbc0a5f3aa4c9983ac (patch) | |
tree | 83fc5facb6b12be510a37bc3d241cc63e965b13a /net-p2p/retroshare | |
parent | feb0daf81d888e9160f9f94502de09b66f2a63fd (diff) |
gentoo resync : 29.06.2020
Diffstat (limited to 'net-p2p/retroshare')
-rw-r--r-- | net-p2p/retroshare/Manifest | 3 | ||||
-rw-r--r-- | net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch | 99 | ||||
-rw-r--r-- | net-p2p/retroshare/retroshare-0.6.5.ebuild | 13 |
3 files changed, 109 insertions, 6 deletions
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest index 3eb8187db26e..aee0a969f7dd 100644 --- a/net-p2p/retroshare/Manifest +++ b/net-p2p/retroshare/Manifest @@ -1,3 +1,4 @@ +AUX retroshare-0.6.5-qt-5.15.patch 2927 BLAKE2B a6e24b46af2df2592b482492b3c53049c4d089f8e4c4f6dd1d3a262945284353b1fde488c141bbae335851108887d2bda6c2e37aa91410885b1448dcfb300e4b SHA512 1b5c2debf192b9801a95d6640c079c7c3d2535cd59ca10f712e8123b1b35781cb7c0ef3fc2ff876c5582bbdb1b1c8efe7ffc666f4cfa365c1c429dd67a83ea37 DIST retroshare-0.6.5.tar.gz 29377995 BLAKE2B 3a8909227080702e42e59b42301e873d4ece806e014a959080a3ae9df7d11564a6e6d915087a9ddd6d5c66d1e5c43895fa24dea8c0042fdce391c384a54182ee SHA512 a65fefb6baff42a81880a401c9005f73ac8180a247dd992a350f9bf5bac366ee6e809bf93cbbc31e80646156147a1d434306dadfbed1f69879ab61cfae3fddeb -EBUILD retroshare-0.6.5.ebuild 3979 BLAKE2B 35db0f242692977c06de9243a4ee76862a74f38560989cca51d40fbbe1c9ba551559604d9c2bd3a1e88a111c50aceea58ee6dd3c5afb51633d625c9fa1802d34 SHA512 19edf671bd9b754d031848b8f20c068e0b41e51b95c2a6ea3f2ba85b55ccb77fd98e9c634fb4592b44cf5ae62d5be27b0115d76cbaef542aa30eb4814c0ae26a +EBUILD retroshare-0.6.5.ebuild 4113 BLAKE2B 8b7711204faba503a21083b93575069de216bd9035e344c9314387600e076d996dc3a26bcff78675a4ecaa282b0c8812ba4407010083e4083aac5cfd1e086f1d SHA512 3194e2f6b63233c981dac0451f47ee6a33a7e407063b25f08686d9e01b6f56f9eca2afde3ddcfaae46780f9f9d46f686ebc846fc235763b108d58e437514bcda MISC metadata.xml 1584 BLAKE2B 35f66764610422f5ae44273f336d84668035cea9458da32e4af81edf162ce1c83b4e6d4d4d7d17a27a2b9ed4bcef7caff9efbd05b8bcee2bb00d33860fa4b63e SHA512 353333842e9c3335e57795447850dfe56ac29865c27232080b97f293d2c1fda89c9d1a47942861428f3b2a69f8fca5b7389f9a15b3fcfa8bd89b7ea8314f3114 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 000000000000..21147a6391b0 --- /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 <retrosharephenom@gmail.com> +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 <retroshare/rstypes.h> ++ + #include <QApplication> + #if QT_VERSION >= 0x040600 + #include <QGraphicsObject> +@@ -36,9 +40,7 @@ + #include <QGraphicsItem> + #endif + #include <QList> +- +-#include <retroshare/rstypes.h> +-#include "graphwidget.h" ++#include <QPainterPath> + + 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 <QAbstractTextDocumentLayout> + #include <QApplication> + #include <QClipboard> +@@ -25,13 +31,9 @@ + #include <QMenu> + #include <QMimeData> + #include <QPainter> ++#include <QPainterPath> + #include <QTextDocument> + +-#include "gui/common/RSElidedItemDelegate.h" +-#include "gui/gxs/GxsCommentTreeWidget.h" +-#include "gui/gxs/GxsCreateCommentDialog.h" +-#include "gui/gxs/GxsIdTreeWidgetItem.h" +- + #include <iostream> + + #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 <QApplication> +-#include <QThread> +-#include <QTimerEvent> +-#include <QMutexLocker> ++#include "GxsIdDetails.h" + +-#include <math.h> +-#include "GxsIdDetails.h" + #include "retroshare-gui/RsAutoUpdatePage.h" + + #include <retroshare/rspeers.h> + +-#include <iostream> ++#include <QApplication> ++#include <QMutexLocker> + #include <QPainter> ++#include <QPainterPath> ++#include <QThread> ++#include <QTimerEvent> ++ ++#include <iostream> ++#include <cmath> + + /* 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 ab3d11026c9f..b2c53a2a2839 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() { |