From 68e3c6b0e2db05a25fc6a0f547071952324a99e1 Mon Sep 17 00:00:00 2001 From: R4SAS Date: Sat, 8 Jun 2019 22:10:39 +0300 Subject: [PATCH] 2.26.0 Info about patch i2pd-qtproj.patch: That patch fixes build on qt. Changes commited in trunk under commits e60549f and 48d02f7 --- i2pd-qtproj.patch | 150 +++++++++++++++++++++++++++++++++++++++++ website.i2pd.i2pd.json | 8 ++- 2 files changed, 156 insertions(+), 2 deletions(-) create mode 100644 i2pd-qtproj.patch diff --git a/i2pd-qtproj.patch b/i2pd-qtproj.patch new file mode 100644 index 0000000..471af5b --- /dev/null +++ b/i2pd-qtproj.patch @@ -0,0 +1,150 @@ +diff --git a/qt/i2pd_qt/i2pd_qt.pro b/qt/i2pd_qt/i2pd_qt.pro +index e24a3963..46dd4a1b 100644 +--- a/qt/i2pd_qt/i2pd_qt.pro ++++ b/qt/i2pd_qt/i2pd_qt.pro +@@ -4,19 +4,22 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets + + TARGET = i2pd_qt + TEMPLATE = app +-QMAKE_CXXFLAGS *= -std=c++11 -ggdb ++QMAKE_CXXFLAGS *= -std=c++11 -Wno-unused-parameter -Wno-maybe-uninitialized + DEFINES += USE_UPNP + + SOURCES += DaemonQT.cpp mainwindow.cpp \ + ../../libi2pd/api.cpp \ + ../../libi2pd/Base.cpp \ ++ ../../libi2pd/Blinding.cpp \ + ../../libi2pd/BloomFilter.cpp \ ++ ../../libi2pd/ChaCha20.cpp \ + ../../libi2pd/Config.cpp \ + ../../libi2pd/CPU.cpp \ + ../../libi2pd/Crypto.cpp \ +- ../../libi2pd/CryptoKey.cpp \ ++ ../../libi2pd/CryptoKey.cpp \ + ../../libi2pd/Datagram.cpp \ + ../../libi2pd/Destination.cpp \ ++ ../../libi2pd/Ed25519.cpp \ + ../../libi2pd/Event.cpp \ + ../../libi2pd/Family.cpp \ + ../../libi2pd/FS.cpp \ +@@ -31,7 +34,9 @@ SOURCES += DaemonQT.cpp mainwindow.cpp \ + ../../libi2pd/Log.cpp \ + ../../libi2pd/NetDb.cpp \ + ../../libi2pd/NetDbRequests.cpp \ ++ ../../libi2pd/NTCP2.cpp \ + ../../libi2pd/NTCPSession.cpp \ ++ ../../libi2pd/Poly1305.cpp \ + ../../libi2pd/Profiling.cpp \ + ../../libi2pd/Reseed.cpp \ + ../../libi2pd/RouterContext.cpp \ +@@ -49,9 +54,6 @@ SOURCES += DaemonQT.cpp mainwindow.cpp \ + ../../libi2pd/TunnelGateway.cpp \ + ../../libi2pd/TunnelPool.cpp \ + ../../libi2pd/util.cpp \ +- ../../libi2pd/Ed25519.cpp \ +- ../../libi2pd/Chacha20.cpp \ +- ../../libi2pd/Poly1305.cpp \ + ../../libi2pd_client/AddressBook.cpp \ + ../../libi2pd_client/BOB.cpp \ + ../../libi2pd_client/ClientContext.cpp \ +@@ -64,24 +66,23 @@ SOURCES += DaemonQT.cpp mainwindow.cpp \ + ../../libi2pd_client/SOCKS.cpp \ + ../../libi2pd_client/Websocket.cpp \ + ../../libi2pd_client/WebSocks.cpp \ ++ ../../daemon/Daemon.cpp \ ++ ../../daemon/HTTPServer.cpp \ ++ ../../daemon/I2PControl.cpp \ ++ ../../daemon/i2pd.cpp \ ++ ../../daemon/UnixDaemon.cpp \ ++ ../../daemon/UPnP.cpp \ + ClientTunnelPane.cpp \ + MainWindowItems.cpp \ + ServerTunnelPane.cpp \ + SignatureTypeComboboxFactory.cpp \ + TunnelConfig.cpp \ + TunnelPane.cpp \ +- ../../daemon/Daemon.cpp \ +- ../../daemon/HTTPServer.cpp \ +- ../../daemon/i2pd.cpp \ +- ../../daemon/I2PControl.cpp \ +- ../../daemon/UnixDaemon.cpp \ +- ../../daemon/UPnP.cpp \ + textbrowsertweaked1.cpp \ + pagewithbackbutton.cpp \ + widgetlock.cpp \ + widgetlockregistry.cpp \ + logviewermanager.cpp \ +- ../../libi2pd/NTCP2.cpp + + #qt creator does not handle this well + #SOURCES += $$files(../../libi2pd/*.cpp) +@@ -89,17 +90,22 @@ SOURCES += DaemonQT.cpp mainwindow.cpp \ + #SOURCES += $$files(../../daemon/*.cpp) + #SOURCES += $$files(./*.cpp) + +-SOURCES -= ../../daemon/UnixDaemon.cpp ++#SOURCES -= ../../daemon/UnixDaemon.cpp + + HEADERS += DaemonQT.h mainwindow.h \ + ../../libi2pd/api.h \ + ../../libi2pd/Base.h \ ++ ../../libi2pd/Blinding.h \ + ../../libi2pd/BloomFilter.h \ ++ ../../libi2pd/ChaCha20.h \ + ../../libi2pd/Config.h \ ++ ../../libi2pd/CPU.h \ + ../../libi2pd/Crypto.h \ +- ../../libi2pd/CryptoKey.h \ ++ ../../libi2pd/CryptoKey.h \ ++ ../../libi2pd/CryptoWorker.h \ + ../../libi2pd/Datagram.h \ + ../../libi2pd/Destination.h \ ++ ../../libi2pd/Ed25519.h \ + ../../libi2pd/Event.h \ + ../../libi2pd/Family.h \ + ../../libi2pd/FS.h \ +@@ -115,13 +121,16 @@ HEADERS += DaemonQT.h mainwindow.h \ + ../../libi2pd/Log.h \ + ../../libi2pd/NetDb.hpp \ + ../../libi2pd/NetDbRequests.h \ ++ ../../libi2pd/NTCP2.h \ + ../../libi2pd/NTCPSession.h \ ++ ../../libi2pd/Poly1305.h \ + ../../libi2pd/Profiling.h \ + ../../libi2pd/Queue.h \ + ../../libi2pd/Reseed.h \ + ../../libi2pd/RouterContext.h \ + ../../libi2pd/RouterInfo.h \ + ../../libi2pd/Signature.h \ ++ ../../libi2pd/Siphash.h \ + ../../libi2pd/SSU.h \ + ../../libi2pd/SSUData.h \ + ../../libi2pd/SSUSession.h \ +@@ -151,6 +160,10 @@ HEADERS += DaemonQT.h mainwindow.h \ + ../../libi2pd_client/SOCKS.h \ + ../../libi2pd_client/Websocket.h \ + ../../libi2pd_client/WebSocks.h \ ++ ../../daemon/Daemon.h \ ++ ../../daemon/HTTPServer.h \ ++ ../../daemon/I2PControl.h \ ++ ../../daemon/UPnP.h \ + ClientTunnelPane.h \ + MainWindowItems.h \ + ServerTunnelPane.h \ +@@ -158,16 +171,11 @@ HEADERS += DaemonQT.h mainwindow.h \ + TunnelConfig.h \ + TunnelPane.h \ + TunnelsPageUpdateListener.h \ +- ../../daemon/Daemon.h \ +- ../../daemon/HTTPServer.h \ +- ../../daemon/I2PControl.h \ +- ../../daemon/UPnP.h \ + textbrowsertweaked1.h \ + pagewithbackbutton.h \ + widgetlock.h \ + widgetlockregistry.h \ + i2pd.rc \ +- i2pd.rc \ + logviewermanager.h + + INCLUDEPATH += ../../libi2pd diff --git a/website.i2pd.i2pd.json b/website.i2pd.i2pd.json index f1e1110..0df6f4d 100644 --- a/website.i2pd.i2pd.json +++ b/website.i2pd.i2pd.json @@ -70,13 +70,17 @@ "sources": [ { "type": "archive", - "url": "https://github.com/PurpleI2P/i2pd/archive/2.25.0.zip", - "sha256": "3dc1d5424ee960e8e340853e8591df29254bc36a4832f7b7ea143d4f8094c6fd" + "url": "https://github.com/PurpleI2P/i2pd/archive/2.26.0.zip", + "sha256": "69fcf9a3c15d7ee9a15606e57f1f01838d6f6040f988549e3645f771bb348d30" }, { "type": "patch", "path": "i2pd-ldlibs.patch" }, + { + "type": "patch", + "path": "i2pd-qtproj.patch" + }, { "type": "file", "path": "i2pd_qt_wrapper"