Skip to content

Commit

Permalink
retroshare: Update to v0.6.7.2 (getsolus#4212)
Browse files Browse the repository at this point in the history
  • Loading branch information
malfisya authored Nov 9, 2024
2 parents d6e84ce + 2644125 commit a1d3233
Show file tree
Hide file tree
Showing 9 changed files with 3,284 additions and 1,389 deletions.
1 change: 0 additions & 1 deletion packages/r/retroshare/abi_libs
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
retroshare
retroshare-service
4,127 changes: 3,128 additions & 999 deletions packages/r/retroshare/abi_symbols

Large diffs are not rendered by default.

302 changes: 88 additions & 214 deletions packages/r/retroshare/abi_used_symbols

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions packages/r/retroshare/files/add_std_uint32_t_to_scope.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
It looks like we previously used a compiler/c++ lib that auto-exported
uint32_t to the scope. As this is no longer the case, export it manually.

upstream: No.

diff --git a/retroshare-gui/src/gui/statistics/Histogram.h b/retroshare-gui/src/gui/statistics/Histogram.h
index 3931b15db..1e07c701b 100644
--- a/retroshare-gui/src/gui/statistics/Histogram.h
+++ b/retroshare-gui/src/gui/statistics/Histogram.h
@@ -22,6 +22,9 @@
#include <iostream>
#include <cstdint>

+// ensure that uint32_t is available in the scope
+using std::uint32_t;
+
class QPainter;

class Histogram
41 changes: 0 additions & 41 deletions packages/r/retroshare/files/fix_create_directories.patch

This file was deleted.

18 changes: 18 additions & 0 deletions packages/r/retroshare/files/fix_libsam3_build_error.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
This fixes a FTBFS where the C++ compiler dies on trying to use -std=gnu99
which is a C compiler option.

For context, '-xc' forces the compiler to interpret the code as C, which
means using clang, and not clang++.

upstream: No.

diff --git a/supportlibs/libsam3/Makefile b/supportlibs/libsam3/Makefile
index 8790dcb..dbc60c1 100644
--- a/supportlibs/libsam3/Makefile
+++ b/supportlibs/libsam3/Makefile
@@ -1,4 +1,4 @@
-CFLAGS := -Wall -g -O2 -std=gnu99
+CFLAGS := -Wall -g -O2 -std=gnu99 -xc

SRCS := \
src/libsam3/libsam3.c \
6 changes: 6 additions & 0 deletions packages/r/retroshare/monitoring.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
releases:
id: 375304
rss: https://github.com/RetroShare/RetroShare/releases.atom
# No known CPE, checked 2024-11-01
security:
cpe: ~
18 changes: 14 additions & 4 deletions packages/r/retroshare/package.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name : retroshare
version : 0.6.6
release : 17
version : 0.6.7.2
release : 18
source :
- git|https://github.com/RetroShare/RetroShare.git : v0.6.6
- git|https://github.com/RetroShare/RetroShare.git : 463a25a0486557b133115147ec25e59ae59e476c
homepage : https://retroshare.cc
license : GPL-2.0-or-later
component : network.clients
summary : RetroShare is a decentralized, private and secure commmunication and sharing platform
Expand All @@ -24,8 +25,17 @@ builddeps :
- pkgconfig(sqlcipher)
- pkgconfig(x11)
- pkgconfig(xscrnsaver)
environment: |
export CC=clang
export CXX=clang++
setup : |
%patch -p1 -i $pkgfiles/fix_create_directories.patch
# This fixes a FTBFS due to std::uint32_t from C++11 <cstdint>
# not being exported to the scope automagically by the compiler we use
%patch -p1 -i $pkgfiles/add_std_uint32_t_to_scope.patch
# Make supportlibs/libsam3 compile as C instead of C++
%patch -p1 -i $pkgfiles/fix_libsam3_build_error.patch
%qmake LIB_DIR=%libdir% CONFIG-=debug CONFIG+=release
build : |
%make
Expand Down
141 changes: 11 additions & 130 deletions packages/r/retroshare/pspec_x86_64.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<PISI>
<Source>
<Name>retroshare</Name>
<Homepage>https://retroshare.cc</Homepage>
<Packager>
<Name>Reilly Brogan</Name>
<Email>solus@reillybrogan.com</Email>
<Name>Rune Morling</Name>
<Email>ermo@serpentos.com</Email>
</Packager>
<License>GPL-2.0-or-later</License>
<PartOf>network.clients</PartOf>
<Summary xml:lang="en">RetroShare is a decentralized, private and secure commmunication and sharing platform</Summary>
<Description xml:lang="en">RetroShare is a decentralized, private and secure commmunication and sharing platform. RetroShare provides filesharing, chat, messages, forums and channels.
</Description>
<Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
<Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://sources.getsol.us/README.Solus</Archive>
</Source>
<Package>
<Name>retroshare</Name>
Expand All @@ -20,6 +21,7 @@
<PartOf>network.clients</PartOf>
<Files>
<Path fileType="executable">/usr/bin/retroshare</Path>
<Path fileType="executable">/usr/bin/retroshare-friendserver</Path>
<Path fileType="executable">/usr/bin/retroshare-service</Path>
<Path fileType="data">/usr/share/applications/retroshare.desktop</Path>
<Path fileType="data">/usr/share/icons/hicolor/128x128/apps/retroshare.png</Path>
Expand All @@ -28,128 +30,7 @@
<Path fileType="data">/usr/share/icons/hicolor/64x64/apps/retroshare.png</Path>
<Path fileType="data">/usr/share/pixmaps/retroshare.xpm</Path>
<Path fileType="data">/usr/share/retroshare/bdboot.txt</Path>
<Path fileType="data">/usr/share/retroshare/qss/blacknight/check_sel.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/blacknight/check_unsel.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/blacknight/clbg.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/blacknight/down.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/blacknight/radio_sel.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/blacknight/radio_unsel.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/blacknight/up.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/blue.qss</Path>
<Path fileType="data">/usr/share/retroshare/qss/blue/blue.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/blue/blue2.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/blue/tab1.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/blue/tab_hover.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/blue/tabselected.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/groove.qss</Path>
<Path fileType="data">/usr/share/retroshare/qss/orangesurfer.qss</Path>
<Path fileType="data">/usr/share/retroshare/qss/orangesurfer/border.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/orangesurfer/main.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/orangesurfer/main2.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/orangesurfer/sizegrip.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/orangesurfer/tab_hover.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/orangesurfer/tab_normal.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/orangesurfer/tab_pressed.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/orangesurfer/toolbar.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle-v2.qss</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle.qss</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/Hmovetoolbar.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/Hsepartoolbar.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/Vmovetoolbar.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/Vsepartoolbar.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/branch_closed-on.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/branch_closed.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/branch_open-on.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/branch_open.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/checkbox.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/close.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/down_arrow.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/down_arrow_disabled.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/left_arrow.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/left_arrow_disabled.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/Hmovetoolbar.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/Hsepartoolbar.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/Vmovetoolbar.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/Vsepartoolbar.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/branch_closed-on.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/branch_closed.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/branch_open-on.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/branch_open.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/checkbox_checked.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/[email protected]</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/checkbox_checked_disabled.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/[email protected]</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/checkbox_checked_focus.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/[email protected]</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/checkbox_indeterminate.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/[email protected]</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/checkbox_indeterminate_disabled.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/[email protected]</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/checkbox_indeterminate_focus.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/[email protected]</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/checkbox_unchecked.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/[email protected]</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/checkbox_unchecked_disabled.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/[email protected]</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/checkbox_unchecked_focus.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/[email protected]</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/close-hover.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/close-pressed.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/close.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/down_arrow.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/down_arrow_disabled.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/left_arrow.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/left_arrow_disabled.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/radio_checked.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/[email protected]</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/radio_checked_disabled.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/[email protected]</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/radio_checked_focus.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/[email protected]</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/radio_unchecked.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/[email protected]</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/radio_unchecked_disabled.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/[email protected]</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/radio_unchecked_focus.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/[email protected]</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/right_arrow.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/right_arrow_disabled.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/sizegrip.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/stylesheet-branch-end.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/stylesheet-branch-more.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/stylesheet-vline.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/transparent.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/undock.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/up_arrow.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/rc/up_arrow_disabled.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/right_arrow.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/right_arrow_disabled.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/sizegrip.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/stylesheet-branch-end.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/stylesheet-branch-more.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/stylesheet-vline.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/transparent.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/undock.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/up_arrow.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qdarkstyle/up_arrow_disabled.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qlive.qss</Path>
<Path fileType="data">/usr/share/retroshare/qss/qlive/qb.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/qlive/qb2.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/redscorpion.qss</Path>
<Path fileType="data">/usr/share/retroshare/qss/redscorpion/red.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/redscorpion/red2.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/silver.qss</Path>
<Path fileType="data">/usr/share/retroshare/qss/silver/silver.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/silver/silver2.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/uus.qss</Path>
<Path fileType="data">/usr/share/retroshare/qss/uus/uus.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/uus/uus2.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/yaba.qss</Path>
<Path fileType="data">/usr/share/retroshare/qss/yaba/yaba.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/yaba/yaba2.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/yaba/yaba3.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/yeah.qss</Path>
<Path fileType="data">/usr/share/retroshare/qss/yeah/yeah.png</Path>
<Path fileType="data">/usr/share/retroshare/qss/retroclassic.qss</Path>
<Path fileType="data">/usr/share/retroshare/sounds/alert.wav</Path>
<Path fileType="data">/usr/share/retroshare/sounds/chat1.wav</Path>
<Path fileType="data">/usr/share/retroshare/sounds/chat2.wav</Path>
Expand Down Expand Up @@ -510,12 +391,12 @@
</Files>
</Package>
<History>
<Update release="17">
<Date>2023-08-21</Date>
<Version>0.6.6</Version>
<Update release="18">
<Date>2024-11-01</Date>
<Version>0.6.7.2</Version>
<Comment>Packaging update</Comment>
<Name>Reilly Brogan</Name>
<Email>solus@reillybrogan.com</Email>
<Name>Rune Morling</Name>
<Email>ermo@serpentos.com</Email>
</Update>
</History>
</PISI>

0 comments on commit a1d3233

Please sign in to comment.