* [PR PATCH] retroshare: update to 0.6.6.
@ 2022-01-05 21:02 Piraty
2022-01-05 23:35 ` [PR PATCH] [Merged]: " Piraty
0 siblings, 1 reply; 2+ messages in thread
From: Piraty @ 2022-01-05 21:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1224 bytes --]
There is a new pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages retroshare-0.6.6
https://github.com/void-linux/void-packages/pull/34877
retroshare: update to 0.6.6.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34877.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroshare-0.6.6-34877.patch --]
[-- Type: text/x-diff, Size: 9586 bytes --]
From b03028b9bf3b5b9c1d258b2b61f23c974fa7b194 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Tue, 4 Jan 2022 19:43:28 +0100
Subject: [PATCH] retroshare: update to 0.6.6.
---
.../retroshare/patches/mhd_result_enum.patch | 96 -------------------
srcpkgs/retroshare/patches/qt5.15.patch | 20 ----
srcpkgs/retroshare/template | 25 +++--
3 files changed, 11 insertions(+), 130 deletions(-)
delete mode 100644 srcpkgs/retroshare/patches/mhd_result_enum.patch
delete mode 100644 srcpkgs/retroshare/patches/qt5.15.patch
diff --git a/srcpkgs/retroshare/patches/mhd_result_enum.patch b/srcpkgs/retroshare/patches/mhd_result_enum.patch
deleted file mode 100644
index dbcd974a7f82..000000000000
--- a/srcpkgs/retroshare/patches/mhd_result_enum.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- a/libresapi/src/api/ApiServerMHD.cpp 2021-05-04 08:25:21.960601037 -0700
-+++ b/libresapi/src/api/ApiServerMHD.cpp 2021-05-04 08:26:27.071424663 -0700
-@@ -113,7 +113,7 @@
- // return MHD_NO to terminate connection
- // return MHD_YES otherwise
- // this function will get called by MHD until a response was queued
-- virtual int handleRequest( struct MHD_Connection *connection,
-+ virtual enum MHD_Result handleRequest( struct MHD_Connection *connection,
- const char *url, const char *method, const char *version,
- const char *upload_data, size_t *upload_data_size) = 0;
- };
-@@ -125,7 +125,7 @@
- MHDUploadHandler(ApiServer* s): mState(BEGIN), mApiServer(s){}
- virtual ~MHDUploadHandler(){}
- // return MHD_NO or MHD_YES
-- virtual int handleRequest( struct MHD_Connection *connection,
-+ virtual enum MHD_Result handleRequest( struct MHD_Connection *connection,
- const char */*url*/, const char *method, const char */*version*/,
- const char *upload_data, size_t *upload_data_size)
- {
-@@ -184,7 +184,7 @@
- MHDApiHandler(ApiServer* s): mState(BEGIN), mApiServer(s){}
- virtual ~MHDApiHandler(){}
- // return MHD_NO or MHD_YES
-- virtual int handleRequest( struct MHD_Connection *connection,
-+ virtual enum MHD_Result handleRequest( struct MHD_Connection *connection,
- const char *url, const char *method, const char */*version*/,
- const char *upload_data, size_t *upload_data_size)
- {
-@@ -265,7 +265,7 @@
- uint64_t mSize;
-
- // return MHD_NO or MHD_YES
-- virtual int handleRequest( struct MHD_Connection *connection,
-+ virtual enum MHD_Result handleRequest( struct MHD_Connection *connection,
- const char *url, const char */*method*/, const char */*version*/,
- const char */*upload_data*/, size_t */*upload_data_size*/)
- {
-@@ -327,7 +327,7 @@
- #endif // ENABLE_FILESTREAMER
-
- // MHD will call this for each element of the http header
--static int _extract_host_header_it_cb(void *cls,
-+static enum MHD_Result _extract_host_header_it_cb(void *cls,
- enum MHD_ValueKind kind,
- const char *key,
- const char *value)
-@@ -522,12 +522,12 @@
- mDaemon = 0;
- }
-
--int ApiServerMHD::static_acceptPolicyCallback(void *cls, const sockaddr *addr, socklen_t addrlen)
-+enum MHD_Result ApiServerMHD::static_acceptPolicyCallback(void *cls, const sockaddr *addr, socklen_t addrlen)
- {
- return ((ApiServerMHD*)cls)->acceptPolicyCallback(addr, addrlen);
- }
-
--int ApiServerMHD::static_accessHandlerCallback(void* cls, struct MHD_Connection * connection,
-+enum MHD_Result ApiServerMHD::static_accessHandlerCallback(void* cls, struct MHD_Connection * connection,
- const char *url, const char *method, const char *version,
- const char *upload_data, size_t *upload_data_size,
- void **con_cls)
-@@ -543,13 +543,13 @@
- }
-
-
--int ApiServerMHD::acceptPolicyCallback(const sockaddr* /*addr*/, socklen_t /*addrlen*/)
-+enum MHD_Result ApiServerMHD::acceptPolicyCallback(const sockaddr* /*addr*/, socklen_t /*addrlen*/)
- {
- // accept all connetions
- return MHD_YES;
- }
-
--int ApiServerMHD::accessHandlerCallback(MHD_Connection *connection,
-+enum MHD_Result ApiServerMHD::accessHandlerCallback(MHD_Connection *connection,
- const char *url, const char *method, const char *version,
- const char *upload_data, size_t *upload_data_size,
- void **con_cls)
---- a/libresapi/src/api/ApiServerMHD.h 2021-05-04 08:25:24.368594515 -0700
-+++ b/libresapi/src/api/ApiServerMHD.h 2021-05-04 08:25:25.942590251 -0700
-@@ -58,11 +58,11 @@
-
- private:
- // static callbacks for libmicrohttpd, they call the members below
-- static int static_acceptPolicyCallback(void* cls, const struct sockaddr * addr, socklen_t addrlen);
-- static int static_accessHandlerCallback(void* cls, struct MHD_Connection * connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls);
-+ static enum MHD_Result static_acceptPolicyCallback(void* cls, const struct sockaddr * addr, socklen_t addrlen);
-+ static enum MHD_Result static_accessHandlerCallback(void* cls, struct MHD_Connection * connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls);
- static void static_requestCompletedCallback(void *cls, struct MHD_Connection* connection, void **con_cls, enum MHD_RequestTerminationCode toe);
-- int acceptPolicyCallback(const struct sockaddr * addr, socklen_t addrlen);
-- int accessHandlerCallback(struct MHD_Connection * connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls);
-+ enum MHD_Result acceptPolicyCallback(const struct sockaddr * addr, socklen_t addrlen);
-+ enum MHD_Result accessHandlerCallback(struct MHD_Connection * connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls);
- void requestCompletedCallback(struct MHD_Connection *connection, void **con_cls, MHD_RequestTerminationCode toe);
- bool mConfigOk;
- std::string mRootDir;
diff --git a/srcpkgs/retroshare/patches/qt5.15.patch b/srcpkgs/retroshare/patches/qt5.15.patch
deleted file mode 100644
index 988e1190411c..000000000000
--- a/srcpkgs/retroshare/patches/qt5.15.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp 2019-02-11 15:16:57.000000000 +0100
-+++ b/retroshare-gui/src/gui/gxs/GxsCommentTreeWidget.cpp 2019-02-11 15:16:57.000000000 +0100
-@@ -24,6 +24,7 @@
- #include <QDateTime>
- #include <QMenu>
- #include <QMimeData>
-+#include <QPainterPath>
- #include <QPainter>
- #include <QTextDocument>
-
---- a/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp 2019-02-11 15:16:57.000000000 +0100
-+++ b/retroshare-gui/src/gui/gxs/GxsIdDetails.cpp 2019-02-11 15:16:57.000000000 +0100
-@@ -30,6 +30,7 @@
- #include <retroshare/rspeers.h>
-
- #include <iostream>
-+#include <QPainterPath>
- #include <QPainter>
-
- /* Images for tag icons */
diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template
index e65594a4b16e..8a72be9ca3fa 100644
--- a/srcpkgs/retroshare/template
+++ b/srcpkgs/retroshare/template
@@ -1,33 +1,30 @@
# Template file for 'retroshare'
pkgname=retroshare
-version=0.6.5
-revision=6
+version=0.6.6
+revision=1
wrksrc="RetroShare-${version}"
build_style=qmake
-configure_args="RS_UPNP_LIB=miniupnpc"
+#XXX broadcast feature requires an ancient udp-discovery-cpp which either needs
+# to be fetched+patched (FTBFS) here or packaged :/
+configure_args="RS_UPNP_LIB=miniupnpc CONFIG+=no_rs_broadcast_discovery"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
makedepends="ffmpeg-devel libgnome-keyring-devel libmicrohttpd-devel
libopencv-devel libssh-devel miniupnpc-devel libXScrnSaver-devel libxslt-devel
pulseaudio-devel qt5-multimedia-devel qt5-tools-devel qt5-x11extras-devel
speex-devel sqlcipher-devel sqlite-devel rapidjson"
short_desc="Decentralized, private and secure commmunication and sharing platform"
-maintainer="Abel Vdo <vdo@greyfaze.net>"
-license="GPL-2.0-or-later, AGPL-3.0-or-later"
+maintainer="Orphaned <orphan@voidlinux.org>"
+license="AGPL-3.0-only, AGPL-3.0-or-later, Apache-2.0, CC-BY-SA-4.0, CC0-1.0, GPL-3.0-or-later, LGPL-3.0-or-later, MIT"
homepage="https://retroshare.cc"
distfiles="https://github.com/RetroShare/RetroShare/archive/v${version}.tar.gz"
-checksum=901a1d1f282e04118fbe0e24190355b4a8f355a806cc5448738b1d691b46f5d5
+checksum=c545b9249ac7dbfef72a2d636bc0f8b729c7ce05f21a54dd9284b2a387592d4a
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
makedepends+=" libatomic-devel"
fi
-post_patch() {
- # upnputil.c includes a C++ header, so make sure qmake recognizes it as C++
- mv libretroshare/src/upnp/upnputil.{c,cc}
- vsed -i libretroshare/src/libretroshare.pro \
- -e 's,\bupnp/upnputil.c\b,upnp/upnputil.cc,'
-}
-
post_install() {
- vlicense LICENSE.txt
+ for l in COPYING LICENSES/*; do
+ vlicense "$l"
+ done
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: retroshare: update to 0.6.6.
2022-01-05 21:02 [PR PATCH] retroshare: update to 0.6.6 Piraty
@ 2022-01-05 23:35 ` Piraty
0 siblings, 0 replies; 2+ messages in thread
From: Piraty @ 2022-01-05 23:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1066 bytes --]
There's a merged pull request on the void-packages repository
retroshare: update to 0.6.6.
https://github.com/void-linux/void-packages/pull/34877
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-05 23:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-05 21:02 [PR PATCH] retroshare: update to 0.6.6 Piraty
2022-01-05 23:35 ` [PR PATCH] [Merged]: " Piraty
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).