From d526715377fecc7dbe52aaab0d3384839008109e Mon Sep 17 00:00:00 2001 From: R4SAS Date: Mon, 15 Feb 2021 19:24:54 +0300 Subject: [PATCH 1/6] fix race condition when building i2pd libs Signed-off-by: R4SAS --- i2pd_qt.pro | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/i2pd_qt.pro b/i2pd_qt.pro index 87f1aba..4913733 100644 --- a/i2pd_qt.pro +++ b/i2pd_qt.pro @@ -92,19 +92,20 @@ FORMS += \ LIBS += $$PWD/src/i2pd/libi2pd.a $$PWD/src/i2pd/libi2pdclient.a -lz -libi2pd.commands = @echo Building i2pd libraries -libi2pd.target = $$PWD/src/i2pd/libi2pd.a -libi2pd.depends = i2pd FORCE +# doing that way due to race condition made by make +i2pd_client.commands = cd $$PWD/src/i2pd/ && mkdir -p obj/libi2pd obj/libi2pd_client && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) USE_UPNP=yes $$I2PDMAKE mk_obj_dir api_client +i2pd_client.target = $$PWD/src/i2pd/libi2pdclient.a +i2pd_client.depends = i2pd FORCE -i2pd.commands = cd $$PWD/src/i2pd/ && mkdir -p obj/libi2pd obj/libi2pd_client && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) USE_UPNP=yes $$I2PDMAKE mk_obj_dir api_client -i2pd.target += $$PWD/src/i2pd/libi2pdclient.a +i2pd.commands = cd $$PWD/src/i2pd/ && mkdir -p obj/libi2pd obj/libi2pd_client && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) USE_UPNP=yes $$I2PDMAKE mk_obj_dir api +i2pd.target += $$PWD/src/i2pd/libi2pd.a i2pd.depends = FORCE cleani2pd.commands = cd $$PWD/src/i2pd/ && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) clean #cleani2pd.depends = clean PRE_TARGETDEPS += $$PWD/src/i2pd/libi2pd.a $$PWD/src/i2pd/libi2pdclient.a -QMAKE_EXTRA_TARGETS += cleani2pd i2pd libi2pd +QMAKE_EXTRA_TARGETS += cleani2pd i2pd i2pd_client CLEAN_DEPS += cleani2pd BuildDateTimeQtTarget.target = $$PWD/src/BuildDateTimeQt.h From 9c7badb2d1e85116ecb985c0ba23c8f27320b761 Mon Sep 17 00:00:00 2001 From: nonlinear-chaos-order-etc-etal <19966907+nonlinear-chaos-order-etc-etal@users.noreply.github.com> Date: Mon, 15 Feb 2021 23:13:49 +0800 Subject: [PATCH 2/6] Flathub link added --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 94186ec..94bb82f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +# Installation + + * Flathub: https://flathub.org/apps/details/website.i2pd.i2pd + # Build Requirements * Qt 5 is necessary (because Qt4 lacks QtWidgets/ folder) From 71dbee484cdd0d3422f1e74bf13a196771be202f Mon Sep 17 00:00:00 2001 From: nonlinear-chaos-order-etc-etal <19966907+nonlinear-chaos-order-etc-etal@users.noreply.github.com> Date: Tue, 16 Feb 2021 00:06:47 +0800 Subject: [PATCH 3/6] Get on Flathub button --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 94bb82f..f7b5ac2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Installation +# Downloads - * Flathub: https://flathub.org/apps/details/website.i2pd.i2pd +Download on Flathub # Build Requirements From 1db82b6753ab0b691dbb1cde1bf3950fcf903b1f Mon Sep 17 00:00:00 2001 From: nonlinear-chaos-order-etc-etal <19966907+nonlinear-chaos-order-etc-etal@users.noreply.github.com> Date: Tue, 16 Feb 2021 00:09:37 +0800 Subject: [PATCH 4/6] README title added --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f7b5ac2..f59aa8f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ -# Downloads +# i2pd-qt — A GUI for i2pd + +## Downloads Download on Flathub -# Build Requirements +## Build Requirements * Qt 5 is necessary (because Qt4 lacks QtWidgets/ folder) From 32433362abcfe93305fb357d42d8cbd16b53914b Mon Sep 17 00:00:00 2001 From: orignal Date: Mon, 15 Mar 2021 09:18:50 -0400 Subject: [PATCH 5/6] 2.37.0 --- contrib/website.i2pd.i2pd.appdata.xml | 1 + src/i2pd | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/website.i2pd.i2pd.appdata.xml b/contrib/website.i2pd.i2pd.appdata.xml index a560fab..9091495 100644 --- a/contrib/website.i2pd.i2pd.appdata.xml +++ b/contrib/website.i2pd.i2pd.appdata.xml @@ -35,6 +35,7 @@ + diff --git a/src/i2pd b/src/i2pd index 74aa07e..7015bad 160000 --- a/src/i2pd +++ b/src/i2pd @@ -1 +1 @@ -Subproject commit 74aa07eba896d35bae8e69a1bb654f4eaa43efba +Subproject commit 7015bad905cf6bfcd36a35ce64c0f8ad32100a6d From 8507cdcbea6758dbfa6f593b7afe62f315033104 Mon Sep 17 00:00:00 2001 From: R4SAS Date: Mon, 15 Mar 2021 19:55:37 +0300 Subject: [PATCH 6/6] 2.37.0 Signed-off-by: R4SAS --- src/i2pd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i2pd b/src/i2pd index 7015bad..436a3e7 160000 --- a/src/i2pd +++ b/src/i2pd @@ -1 +1 @@ -Subproject commit 7015bad905cf6bfcd36a35ce64c0f8ad32100a6d +Subproject commit 436a3e7f54d1b0a70fe93dda4ac06829d2111759