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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2E36115812D for ; Fri, 03 Jan 2025 16:56:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21C0DE083B; Fri, 03 Jan 2025 16:56:29 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 09187E083B for ; Fri, 03 Jan 2025 16:56:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E9978335D2B for ; Fri, 03 Jan 2025 16:56:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4E4A911B5 for ; Fri, 03 Jan 2025 16:56:26 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1735923335.de321b8b2d7039960c0725e8efb87cec1dcccd1c.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/files/, net-p2p/retroshare/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/retroshare/files/retroshare-0.6.7_fix-old-rapidjson.patch net-p2p/retroshare/retroshare-0.6.7-r3.ebuild X-VCS-Directories: net-p2p/retroshare/files/ net-p2p/retroshare/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: de321b8b2d7039960c0725e8efb87cec1dcccd1c X-VCS-Branch: master Date: Fri, 03 Jan 2025 16:56:26 +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: 4956c0d2-7d4e-41df-99a9-4b9682fbf9ba X-Archives-Hash: 12bb9419bdfebc57d15e38adfd75aa1e commit: de321b8b2d7039960c0725e8efb87cec1dcccd1c Author: Filip Kobierski pm me> AuthorDate: Mon Nov 25 19:44:27 2024 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Fri Jan 3 16:55:35 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de321b8b net-p2p/retroshare: Patch bundled libraries, improve ebuild - port a patch from bundled rapidjson - use upstream .desktop file - avoid evaluating `uselibupnp` if USE=miniupnp (default) Signed-off-by: Filip Kobierski pm.me> Closes: https://github.com/gentoo/gentoo/pull/39471 Signed-off-by: Joonas Niilola gentoo.org> .../files/retroshare-0.6.7_fix-old-rapidjson.patch | 24 ++++ net-p2p/retroshare/retroshare-0.6.7-r3.ebuild | 136 +++++++++++++++++++++ 2 files changed, 160 insertions(+) diff --git a/net-p2p/retroshare/files/retroshare-0.6.7_fix-old-rapidjson.patch b/net-p2p/retroshare/files/retroshare-0.6.7_fix-old-rapidjson.patch new file mode 100644 index 000000000000..90c973c53493 --- /dev/null +++ b/net-p2p/retroshare/files/retroshare-0.6.7_fix-old-rapidjson.patch @@ -0,0 +1,24 @@ +This fixes a c23 issue in the rapidjson library: + + error: assignment of read-only member 'rapidjson::GenericStringRef::length' + +This was fixed upstream in 2016 and this patch combines two commit from PR +https://github.com/Tencent/rapidjson/pull/719 +We are using OpenBuildService as the tarball source and it bundles libraries that old. + +For Gentoo details see https://bugs.gentoo.org/945721 +--- a/supportlibs/rapidjson/include/rapidjson/document.h ++++ b/supportlibs/rapidjson/include/rapidjson/document.h +@@ -316,10 +316,10 @@ + + GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {} + +- GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; } +- + //! implicit conversion to plain CharType pointer + operator const Ch *() const { return s; } ++ //! Copy assignment operator not permitted - immutable type ++ GenericStringRef& operator=(const GenericStringRef& rhs) /* = delete */; + + const Ch* const s; //!< plain CharType pointer + const SizeType length; //!< length of the string (excluding the trailing NULL terminator) diff --git a/net-p2p/retroshare/retroshare-0.6.7-r3.ebuild b/net-p2p/retroshare/retroshare-0.6.7-r3.ebuild new file mode 100644 index 000000000000..a9cec116ed37 --- /dev/null +++ b/net-p2p/retroshare/retroshare-0.6.7-r3.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic desktop qmake-utils xdg + +DESCRIPTION="Friend to Friend secure communication and sharing application" +HOMEPAGE="https://retroshare.cc" +SRC_URI="https://download.opensuse.org/repositories/network:/retroshare/Debian_Testing/retroshare-common_${PV}.orig.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/RetroShare" +# NOTE: GitHub releases/archive is impractical to build so we use the OBS repo +# but they squash point releases and include 3rd party libraries in the tarball + +LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cli +gui +jsonapi keyring libupnp +miniupnp plugins +service +sqlcipher" + +REQUIRED_USE=" + || ( gui service ) + ?? ( libupnp miniupnp ) + plugins? ( gui ) + service? ( || ( cli jsonapi ) ) +" +RDEPEND=" + app-arch/bzip2 + dev-libs/openssl:0= + sys-libs/zlib + gui? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + x11-libs/libX11 + x11-libs/libXScrnSaver + ) + keyring? ( app-crypt/libsecret ) + libupnp? ( net-libs/libupnp:= ) + miniupnp? ( net-libs/miniupnpc:= ) + plugins? ( + media-libs/speex + media-libs/speexdsp +