Merge 07fad8461d into a17699e166

.github/workflows/ubuntu-qt5_c-cpp.yml

@@ -29,8 +29,6 @@ jobs:
       run: |
         qmake CONFIG+=debug \
         CONFIG+=rs_autologin \
-        CONFIG+=rs_webui \
-        CONFIG+=rs_jsonapi \
         CONFIG+=wikipoos \
         CONFIG+=gxsthewire \
         CONFIG+=retroshare_plugins

.github/workflows/ubuntu-qt6_c-cpp.yml

@@ -18,11 +18,18 @@ jobs:
     - name: git init
       run: git submodule update --init --remote libbitdht/ libretroshare/ openpgpsdk/ retroshare-webui/ && git --no-pager log --max-count 1
     - name: git submodule supportlibs
-      run: git submodule update --init supportlibs/librnp supportlibs/restbed #supportlibs/rapidjson
+      run: git submodule update --init supportlibs/librnp supportlibs/restbed supportlibs/rapidjson
     - name: run apt update
       run: sudo apt-get update
     - name: apt install
-      run: sudo apt-get install g++ cmake qt6-base-dev qt6-multimedia-dev libasio-dev libbz2-dev libjson-c-dev libssl-dev libsqlcipher-dev libupnp-dev libxss-dev rapidjson-dev libbotan-2-dev doxygen qt6-5compat-dev libqt6core5compat6-dev libsecret-1-dev libxml2-dev libxslt1-dev libcurl4-openssl-dev
+      run: sudo apt-get install g++ cmake qt6-base-dev qt6-multimedia-dev libasio-dev libbz2-dev libjson-c-dev libssl-dev libsqlcipher-dev libupnp-dev libxss-dev libbotan-2-dev doxygen qt6-5compat-dev libqt6core5compat6-dev libsecret-1-dev libxml2-dev libxslt1-dev libcurl4-openssl-dev
+    - name: Install g++ 14
+      run: |
+        sudo apt update
+        sudo apt install -y g++-14
+        sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-14 100
+    - name: Check compiler version
+      run: g++ --version
     - name: print working directory
       run: pwd && ls -la
     - name: qmake
@@ -31,6 +38,7 @@ jobs:
         CONFIG+=rs_autologin \
         CONFIG+=rs_webui \
         CONFIG+=rs_jsonapi \
+        CONFIG+=rs_cppwarning \
         CONFIG+=wikipoos \
         CONFIG+=gxsthewire \
         CONFIG+=retroshare_plugins

.gitmodules

@@ -31,8 +31,10 @@
 	branch = master
 [submodule "libretroshare"]
 	path = libretroshare
-	url = https://github.com/RetroShare/libretroshare.git
-	branch = master
+	# url = https://github.com/RetroShare/libretroshare.git
+	# branch = master
+    url = https://github.com/Passw/RetroShare-libretroshare.git
+    branch = patch-2
 [submodule "retroshare-webui"]
 	path = retroshare-webui
 	url = https://github.com/RetroShare/RSNewWebUI.git

jsonapi-generator/src/jsonapi-generator.cpp

@@ -333,7 +333,8 @@ int main(int argc, char *argv[])
 					                "std::chrono::seconds(maxWait+120) );"
 					            "auto lService = weakService.lock();"
 					            "if(!lService || lService->is_down()) return;"
-					            "lService->schedule( [=]()"
+                                "auto io_context = lService->get_io_context();"
+					            "asio::post(*io_context, [=]()"
 					            "{"
 					                "auto session = weakSession.lock();"
 					                "if(session && session->is_open())"

libretroshare

@@ -1 +1 @@
-Subproject commit 96e249a06d8f30c2aace38beecc8fb7271159a88
+Subproject commit 0e59042ba78abeae0ff0d66a8e4d24df24c59c71

plugins/FeedReader/FeedReader.pro

@@ -113,7 +113,14 @@ TRANSLATIONS +=  \
 # when rapidjson is mainstream on all distribs, we will not need the sources anymore
 # in the meantime, they are part of the RS directory so that it is always possible to find them
 
-INCLUDEPATH += ../../rapidjson-1.1.0
+# INCLUDEPATH += ../../rapidjson-1.1.0
+RAPIDJSON_AVAILABLE = $$system(pkg-config --atleast-version 1.1 RapidJSON && echo yes)
+isEmpty(RAPIDJSON_AVAILABLE) {
+    message("using rapidjson from submodule FeedReader")
+    INCLUDEPATH *= $$clean_path($${PWD}/../../supportlibs/rapidjson/include)
+} else {
+    message("using system rapidjson FeedReader")
+}
 
 
 linux-* {

supportlibs/rapidjson

@@ -1 +1 @@
-Subproject commit f54b0e47a08782a6131cc3d60f94d038fa6e0a51
+Subproject commit 24b5e7a8b27f42fa16b96fc70aade9106cf7102f

supportlibs/restbed

@@ -1 +1 @@
-Subproject commit 6001a322809b5005b8bcccdf593fdda6f0173691
+Subproject commit 0246ee5d3e2d35ab2bd37a274cf21fbbbd336520