From 1ea18a583f7d547a2360f2ce81d5e7f892d18f74 Mon Sep 17 00:00:00 2001 From: Petr Date: Mon, 15 May 2023 22:07:30 +0200 Subject: [PATCH 1/3] Remove `fsitem.h` from the list of headers It is now a part of libretroshare. --- retroshare-friendserver/src/retroshare-friendserver.pro | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/retroshare-friendserver/src/retroshare-friendserver.pro b/retroshare-friendserver/src/retroshare-friendserver.pro index a566a0927..eda1f35cb 100644 --- a/retroshare-friendserver/src/retroshare-friendserver.pro +++ b/retroshare-friendserver/src/retroshare-friendserver.pro @@ -29,8 +29,7 @@ SOURCES += retroshare-friendserver.cc \ network.cc HEADERS += friendserver.h \ - network.h \ - fsitem.h + network.h ################################# Linux ########################################## From b9e4bac510bd62a32d631f75e185d637fa770066 Mon Sep 17 00:00:00 2001 From: Petr Date: Mon, 15 May 2023 22:14:07 +0200 Subject: [PATCH 2/3] Add various build artifacts to .gitignore --- .gitignore | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.gitignore b/.gitignore index 777ba9433..b4dfddcac 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,22 @@ Thumbs.db .kdev4 *.kdev4 +.qmake.stash + !supportlibs/libsam3/Makefile # QtCreator cruft *CMakeLists.txt.user + +# Build artifacts +/jsonapi-generator/src/jsonapi-generator +/jsonapi-generator/src/jsonapi-generator-doxygen-final.conf +/jsonapi-generator/src/jsonapi-includes.inl +/jsonapi-generator/src/jsonapi-wrappers.inl +/jsonapi-generator/src/xml/ +/retroshare-friendserver/src/retroshare-friendserver +/retroshare-gui/src/include/ +/retroshare-gui/src/retroshare +/retroshare-gui/src/temp/ +/retroshare-service/src/retroshare-service +/*.tar.?z From 44e04ea0c17f7e1187754a8a852e43a322dbf37b Mon Sep 17 00:00:00 2001 From: Petr Date: Tue, 16 May 2023 10:47:54 +0200 Subject: [PATCH 3/3] Advance submodule `retroshare-webui` to its latest `master` version As mentioned in https://github.com/RetroShare/RetroShare/issues/2732#issuecomment-1549228796. --- retroshare-webui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-webui b/retroshare-webui index 5cc37b3e5..b0ddb0918 160000 --- a/retroshare-webui +++ b/retroshare-webui @@ -1 +1 @@ -Subproject commit 5cc37b3e5ad6b64b247e9d2066a9b6c8acae67ce +Subproject commit b0ddb09184e8fff86bd3325e00c6d4b329ae1790