diff options
Diffstat (limited to 'net-p2p/retroshare')
| -rw-r--r-- | net-p2p/retroshare/Manifest | 1 | ||||
| -rw-r--r-- | net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch | 99 | ||||
| -rw-r--r-- | net-p2p/retroshare/metadata.xml | 4 | ||||
| -rw-r--r-- | net-p2p/retroshare/retroshare-0.6.5-r2.ebuild | 153 | ||||
| -rw-r--r-- | net-p2p/retroshare/retroshare-0.6.5-r3.ebuild | 142 | ||||
| -rw-r--r-- | net-p2p/retroshare/retroshare-0.6.6.ebuild | 122 |
6 files changed, 0 insertions, 521 deletions
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest index e636d71484b3..28864b4b5852 100644 --- a/net-p2p/retroshare/Manifest +++ b/net-p2p/retroshare/Manifest @@ -1,2 +1 @@ -DIST retroshare-0.6.5.tar.gz 29377995 BLAKE2B 3a8909227080702e42e59b42301e873d4ece806e014a959080a3ae9df7d11564a6e6d915087a9ddd6d5c66d1e5c43895fa24dea8c0042fdce391c384a54182ee SHA512 a65fefb6baff42a81880a401c9005f73ac8180a247dd992a350f9bf5bac366ee6e809bf93cbbc31e80646156147a1d434306dadfbed1f69879ab61cfae3fddeb DIST retroshare-0.6.6.tar.gz 24140207 BLAKE2B 1328f2d36f6bc2d1123dd915698f2778e771e36089d8fd8d9ec44d1a8bfa0f56c625b73f62811936e4cee5dd1eca797f9fdf16fdb8defd66706294abc4dde419 SHA512 23ed7c633426caa910a5ae6f04cfd33c523ecaedae1e4044981706420622aadd67ba2772ffd17c9cc1c6193fad508837a31fdcfabe2aab309b8b4302335ede4d 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 deleted file mode 100644 index 21147a6391b0..000000000000 --- a/net-p2p/retroshare/files/retroshare-0.6.5-qt-5.15.patch +++ /dev/null @@ -1,99 +0,0 @@ -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/metadata.xml b/net-p2p/retroshare/metadata.xml index 56985f7e44a7..7f0b4e9f7e6d 100644 --- a/net-p2p/retroshare/metadata.xml +++ b/net-p2p/retroshare/metadata.xml @@ -20,15 +20,11 @@ <use> <flag name="autologin">Enables potentially insecure autologin capability via <pkg>app-crypt/libsecret</pkg></flag> <flag name="cli">Enables terminal login support for retroshare-service</flag> - <flag name="control-socket">Enables API via Unix socket support</flag> - <flag name="gnome-keyring">Enables potentially insecure autologin capability via <pkg>gnome-base/gnome-keyring</pkg></flag> <flag name="jsonapi">Enables the new RetroShare JSON API</flag> <flag name="libupnp">Enables UPnP port forwarding via <pkg>net-libs/libupnp</pkg></flag> <flag name="miniupnp">Enables UPnP port forwarding via <pkg>net-libs/miniupnpc</pkg></flag> <flag name="service">Enables the new RetroShare service</flag> <flag name="sqlcipher">Enables GXS database encryption via SQLCipher</flag> - <flag name="webui">Enables Web interface and API support</flag> - <flag name="xapian">Enables GXS content indexing and search via <pkg>dev-libs/xapian</pkg></flag> </use> <upstream> <bugs-to>https://github.com/RetroShare/RetroShare/issues</bugs-to> diff --git a/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild b/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild deleted file mode 100644 index e4579943fbac..000000000000 --- a/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop edos2unix qmake-utils xdg-utils - -DESCRIPTION="P2P private sharing application" -HOMEPAGE="https://retroshare.cc" -SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/RetroShare-v${PV}-source-with-submodules.tar.gz -> ${P}.tar.gz" - -# pegmarkdown can also be used with MIT -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=" - || ( cli gui service ) - service? ( jsonapi )" - -RDEPEND=" - app-arch/bzip2 - dev-libs/openssl:0= - >=dev-libs/rapidjson-1.1.0 - net-libs/miniupnpc:= - sys-libs/zlib - control-socket? ( dev-qt/qtnetwork:5 ) - gnome-keyring? ( app-crypt/libsecret ) - gui? ( - dev-qt/qtcore:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtscript:5 - dev-qt/qtxml:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXScrnSaver - ) - service? ( dev-qt/qtcore:5 ) - sqlcipher? ( dev-db/sqlcipher ) - !sqlcipher? ( dev-db/sqlite:3 ) - webui? ( net-libs/libmicrohttpd ) - xapian? ( dev-libs/xapian )" - -DEPEND="${RDEPEND} - dev-qt/qtcore:5 - gui? ( dev-qt/designer:5 )" - -BDEPEND="dev-util/cmake - virtual/pkgconfig - jsonapi? ( - || ( - >=app-doc/doxygen-1.8.17 - <app-doc/doxygen-1.8.16 - ) - )" - -PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) - -S="${WORKDIR}"/RetroShare - -src_prepare() { - # CRLF endings break patch... - edos2unix retroshare-gui/src/gui/elastic/elnode.h - default -} - -src_configure() { - local qConfigs=() - - qConfigs+=( $(usex cli '' 'no_')retroshare_nogui ) - qConfigs+=( $(usex control-socket '' 'no_')libresapilocalserver ) - qConfigs+=( $(usex gnome-keyring '' 'no_')rs_autologin ) - qConfigs+=( $(usex gui '' 'no_')retroshare_gui ) - qConfigs+=( $(usex jsonapi '' 'no_')rs_jsonapi ) - qConfigs+=( $(usex service '' 'no_')retroshare_service ) - qConfigs+=( $(usex sqlcipher '' 'no_')sqlcipher ) - qConfigs+=( $(usex webui '' 'no_')libresapihttpserver ) - qConfigs+=( $(usex xapian '' 'no_')rs_deep_search ) - - eqmake5 CONFIG+="${qConfigs[*]}" \ - RS_MAJOR_VERSION=$(ver_cut 1) RS_MINOR_VERSION=$(ver_cut 2) \ - RS_MINI_VERSION=$(ver_cut 3) RS_EXTRA_VERSION="-gentoo-${PR}" \ - RS_UPNP_LIB=miniupnpc -} - -src_compile() { - use jsonapi && { - nonfatal emake || - elog "Due to a bug in RetroShare-v0.6.5 build system when JSON API is enabled, failure at first emake is normal" - } - - emake -} - -src_install() { - use cli && dobin retroshare-nogui/src/retroshare-nogui - use gui && dobin retroshare-gui/src/retroshare - use service && dobin retroshare-service/src/retroshare-service - - insinto /usr/share/retroshare - doins libbitdht/src/bitdht/bdboot.txt - - use webui && doins -r libresapi/src/webui - - dodoc README.md - make_desktop_entry retroshare - - for i in 24 48 64 128 ; do - doicon -s ${i} "data/${i}x${i}/apps/retroshare.png" - done -} - -pkg_pretend() { - if ! use sqlcipher; then - ewarn "You have disabled GXS database encryption, ${PN} will use SQLite" - ewarn "instead of SQLCipher for GXS databases." - ewarn "Builds using SQLite and builds using SQLCipher have incompatible" - ewarn "database format, so you will need to manually delete GXS" - ewarn "database (loosing all your GXS data and identities) when you" - ewarn "toggle sqlcipher USE flag." - fi -} - -pkg_preinst() { - local ver - for ver in ${REPLACING_VERSIONS}; do - if ver_test ${ver} -lt 0.5.9999; then - ewarn "You are upgrading from Retroshare 0.5.* to ${PV}" - ewarn "Version 0.6.* is backward-incompatible with 0.5 branch" - ewarn "and clients with 0.6.* can not connect to clients that have 0.5.*" - ewarn "It's recommended to drop all your configuration and either" - ewarn "generate a new certificate or import existing from a backup" - break - fi - if ver_test ${ver} -ge 0.6.0 && ver_test ${ver} -lt 0.6.4; then - elog "Main executable has been renamed upstream from RetroShare06 to retroshare" - break - fi - done -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/net-p2p/retroshare/retroshare-0.6.5-r3.ebuild b/net-p2p/retroshare/retroshare-0.6.5-r3.ebuild deleted file mode 100644 index 4a653396a8f0..000000000000 --- a/net-p2p/retroshare/retroshare-0.6.5-r3.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop edos2unix qmake-utils xdg-utils - -DESCRIPTION="P2P private sharing application" -HOMEPAGE="https://retroshare.cc" -SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/RetroShare-v${PV}-source-with-submodules.tar.gz -> ${P}.tar.gz" - -LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="autologin +gui +jsonapi +service +sqlcipher" - -REQUIRED_USE=" - || ( gui service ) - service? ( jsonapi )" - -RDEPEND=" - app-arch/bzip2 - dev-libs/openssl:0= - >=dev-libs/rapidjson-1.1.0 - net-libs/miniupnpc:= - sys-libs/zlib - autologin? ( app-crypt/libsecret ) - gui? ( - dev-qt/qtcore:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtscript:5 - dev-qt/qtxml:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXScrnSaver - ) - service? ( dev-qt/qtcore:5 ) - sqlcipher? ( dev-db/sqlcipher ) - !sqlcipher? ( dev-db/sqlite:3 )" - -DEPEND="${RDEPEND} - dev-qt/qtcore:5 - gui? ( dev-qt/designer:5 )" - -BDEPEND="dev-util/cmake - virtual/pkgconfig - jsonapi? ( app-doc/doxygen )" - -PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) - -S="${WORKDIR}"/RetroShare - -src_prepare() { - # CRLF endings break patch... - edos2unix retroshare-gui/src/gui/elastic/elnode.h - default -} - -src_configure() { - local qConfigs=() - - qConfigs+=( $(usex autologin '' 'no_')rs_autologin ) - qConfigs+=( $(usex gui '' 'no_')retroshare_gui ) - qConfigs+=( $(usex jsonapi '' 'no_')rs_jsonapi ) - qConfigs+=( $(usex service '' 'no_')retroshare_service ) - qConfigs+=( $(usex sqlcipher '' 'no_')sqlcipher ) - qConfigs+=( no_retroshare_nogui ) - qConfigs+=( no_libresapi ) - qConfigs+=( no_libresapi_settings ) - qConfigs+=( no_libresapilocalserver ) - qConfigs+=( no_libresapihttpserver ) - - eqmake5 CONFIG+="${qConfigs[*]}" \ - RS_MAJOR_VERSION=$(ver_cut 1) RS_MINOR_VERSION=$(ver_cut 2) \ - RS_MINI_VERSION=$(ver_cut 3) RS_EXTRA_VERSION="-gentoo-${PR}" \ - RS_UPNP_LIB=miniupnpc -} - -src_compile() { - use jsonapi && { - nonfatal emake || - elog "Due to a bug in RetroShare-v0.6.5 build system when JSON API is enabled, failure at first emake is normal" - } - - emake -} - -src_install() { - use gui && dobin retroshare-gui/src/retroshare - use service && dobin retroshare-service/src/retroshare-service - - insinto /usr/share/retroshare - doins libbitdht/src/bitdht/bdboot.txt - - dodoc README.md - make_desktop_entry retroshare - - for i in 24 48 64 128 ; do - doicon -s ${i} "data/${i}x${i}/apps/retroshare.png" - done -} - -pkg_pretend() { - if ! use sqlcipher; then - ewarn "You have disabled GXS database encryption, ${PN} will use SQLite" - ewarn "instead of SQLCipher for GXS databases." - ewarn "Builds using SQLite and builds using SQLCipher have incompatible" - ewarn "database format, so you will need to manually delete GXS" - ewarn "database (loosing all your GXS data and identities) when you" - ewarn "toggle sqlcipher USE flag." - fi -} - -pkg_preinst() { - local ver - for ver in ${REPLACING_VERSIONS}; do - if ver_test ${ver} -lt 0.5.9999; then - ewarn "You are upgrading from Retroshare 0.5.* to ${PV}" - ewarn "Version 0.6.* is backward-incompatible with 0.5 branch" - ewarn "and clients with 0.6.* can not connect to clients that have 0.5.*" - ewarn "It's recommended to drop all your configuration and either" - ewarn "generate a new certificate or import existing from a backup" - break - fi - if ver_test ${ver} -ge 0.6.0 && ver_test ${ver} -lt 0.6.4; then - elog "Main executable has been renamed upstream from RetroShare06 to retroshare" - break - fi - done -} - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/net-p2p/retroshare/retroshare-0.6.6.ebuild b/net-p2p/retroshare/retroshare-0.6.6.ebuild deleted file mode 100644 index d331568ada6f..000000000000 --- a/net-p2p/retroshare/retroshare-0.6.6.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop qmake-utils xdg - -DESCRIPTION="P2P private sharing application" -HOMEPAGE="https://retroshare.cc" -SRC_URI="http://download.opensuse.org/repositories/network:/retroshare/Debian_Testing/retroshare-common_${PV}.orig.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/RetroShare" - -LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="autologin cli +gui +jsonapi libupnp +miniupnp +service +sqlcipher" - -REQUIRED_USE=" - || ( gui service ) - ?? ( libupnp miniupnp ) - service? ( || ( cli jsonapi ) )" - -RDEPEND=" - app-arch/bzip2 - dev-libs/openssl:0= - >=dev-libs/rapidjson-1.1.0 - sys-libs/zlib - autologin? ( app-crypt/libsecret ) - gui? ( - dev-qt/qtcore:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtscript:5 - dev-qt/qtxml:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXScrnSaver - ) - libupnp? ( net-libs/libupnp:= ) - miniupnp? ( net-libs/miniupnpc:= ) - service? ( dev-qt/qtcore:5 ) - sqlcipher? ( dev-db/sqlcipher ) - !sqlcipher? ( dev-db/sqlite:3 )" - -DEPEND="${RDEPEND} - dev-qt/qtcore:5 - gui? ( dev-qt/designer:5 )" - -BDEPEND="dev-util/cmake - virtual/pkgconfig - jsonapi? ( app-doc/doxygen )" - -PATCHES=( "${FILESDIR}/${P}-fix-cxx17-compilation.patch" ) - -src_configure() { - local qconfigs=( - $(usex cli '' 'no_')rs_service_terminal_login - $(usex autologin '' 'no_')rs_autologin - $(usex gui '' 'no_')retroshare_gui - $(usex jsonapi '' 'no_')rs_jsonapi - $(usex service '' 'no_')retroshare_service - $(usex sqlcipher '' 'no_')sqlcipher - ) - - local qupnplibs="none" - use miniupnp && qupnplibs="miniupnpc" - use libupnp && qupnplibs="upnp ixml" - - eqmake5 CONFIG+="${qconfigs[*]}" \ - RS_MAJOR_VERSION=$(ver_cut 1) RS_MINOR_VERSION=$(ver_cut 2) \ - RS_MINI_VERSION=$(ver_cut 3) RS_EXTRA_VERSION="-gentoo-${PR}" \ - RS_UPNP_LIB="${qupnplibs}" -} - -src_install() { - use gui && dobin retroshare-gui/src/retroshare - use service && dobin retroshare-service/src/retroshare-service - - insinto /usr/share/retroshare - doins libbitdht/src/bitdht/bdboot.txt - - dodoc README.asciidoc - - if use gui; then - make_desktop_entry retroshare - - for i in 24 48 64 128 ; do - doicon -s ${i} "data/${i}x${i}/apps/retroshare.png" - done - fi -} - -pkg_preinst() { - xdg_pkg_preinst - - if ! use sqlcipher && ! has_version "net-p2p/retroshare[-sqlcipher]"; then - ewarn "You have disabled GXS database encryption, ${PN} will use SQLite" - ewarn "instead of SQLCipher for GXS databases." - ewarn "Builds using SQLite and builds using SQLCipher have incompatible" - ewarn "database format, so you will need to manually delete GXS" - ewarn "database (loosing all your GXS data and identities) when you" - ewarn "toggle sqlcipher USE flag." - fi - - if [[ ${REPLACING_VERSIONS} ]]; then - if ver_test ${REPLACING_VERSIONS} -lt 0.6; then - ewarn "You are upgrading from Retroshare 0.5.* to ${PV}" - ewarn "Version 0.6.* is backward-incompatible with 0.5 branch" - ewarn "and clients with 0.6.* can not connect to clients that have 0.5.*" - ewarn "It's recommended to drop all your configuration and either" - ewarn "generate a new certificate or import existing from a backup" - break - fi - if ver_test ${REPLACING_VERSIONS} -ge 0.6.0 && ver_test ${REPLACING_VERSIONS} -lt 0.6.4; then - elog "Main executable has been renamed upstream from RetroShare06 to retroshare" - break - fi - fi -} |