From 2169a2bed6767e4c8d847ad6d2b6b7cb9abc90d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 28 Mar 2024 09:24:50 +0700 Subject: [PATCH] retroshare: switch to libsecret --- srcpkgs/retroshare/patches/gcc-12.patch | 16 ++++++++++++---- srcpkgs/retroshare/template | 4 ++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/srcpkgs/retroshare/patches/gcc-12.patch b/srcpkgs/retroshare/patches/gcc-12.patch index 06a95bb03ac..f16748fe6d9 100644 --- a/srcpkgs/retroshare/patches/gcc-12.patch +++ b/srcpkgs/retroshare/patches/gcc-12.patch @@ -1,7 +1,5 @@ -Index: RetroShare-0.6.6/libretroshare/src/util/rsdir.cc -=================================================================== ---- RetroShare-0.6.6.orig/libretroshare/src/util/rsdir.cc -+++ RetroShare-0.6.6/libretroshare/src/util/rsdir.cc +--- a/libretroshare/src/util/rsdir.cc ++++ b/libretroshare/src/util/rsdir.cc @@ -47,6 +47,7 @@ #include @@ -10,3 +8,13 @@ Index: RetroShare-0.6.6/libretroshare/src/util/rsdir.cc #if defined(WIN32) || defined(__CYGWIN__) #include "util/rsstring.h" +--- a/retroshare-gui/src/gui/statistics/Histogram.h ++++ b/retroshare-gui/src/gui/statistics/Histogram.h +@@ -18,6 +18,7 @@ + * * + *******************************************************************************/ + ++#include + #include + #include + diff --git a/srcpkgs/retroshare/template b/srcpkgs/retroshare/template index bb17569277a..35a2732c77f 100644 --- a/srcpkgs/retroshare/template +++ b/srcpkgs/retroshare/template @@ -1,13 +1,13 @@ # Template file for 'retroshare' pkgname=retroshare version=0.6.6 -revision=3 +revision=4 build_style=qmake #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 +makedepends="ffmpeg-devel libsecret-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"