From b03028b9bf3b5b9c1d258b2b61f23c974fa7b194 Mon Sep 17 00:00:00 2001 From: Piraty 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 - #include - #include -+#include - #include - #include - ---- 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 - - #include -+#include - #include - - /* 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 " -license="GPL-2.0-or-later, AGPL-3.0-or-later" +maintainer="Orphaned " +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 }