diff --git a/debian/control b/debian/control index ebe2b485b..1c7374d8f 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Jeff Becker (probably not evil) Build-Depends: debhelper (>= 11), g++, ninja-build, cmake (>= 3.10), pkg-config, libuv1-dev, git, libunbound-dev, - libsodium-dev (>= 1.0.18), libsystemd-dev, liblokimq-dev (>= 1.2.2), libsqlite3-dev, nettle-dev, libevent-dev + libsodium-dev (>= 1.0.18), libsystemd-dev, liblokimq-dev (>= 1.2.3), libsqlite3-dev, nettle-dev, libevent-dev Standards-Version: 3.9.6 Homepage: https://loki.network/ Vcs-Git: git://github.com/loki-project/lokinet-builder.git diff --git a/debian/patches/0004-lokimq-rename-compatibility-fix.patch b/debian/patches/0004-lokimq-rename-compatibility-fix.patch new file mode 100644 index 000000000..1dea537c0 --- /dev/null +++ b/debian/patches/0004-lokimq-rename-compatibility-fix.patch @@ -0,0 +1,44 @@ +From: Jason Rhinelander +Date: Fri, 15 Jan 2021 14:39:33 -0400 +Subject: lokimq rename compatibility fix + +--- + llarp/router/abstractrouter.hpp | 3 ++- + llarp/router_contact.hpp | 5 +++-- + 2 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/llarp/router/abstractrouter.hpp b/llarp/router/abstractrouter.hpp +index ca53fc9..e532812 100644 +--- a/llarp/router/abstractrouter.hpp ++++ b/llarp/router/abstractrouter.hpp +@@ -23,10 +23,11 @@ struct llarp_dht_context; + struct llarp_nodedb; + struct llarp_threadpool; + +-namespace lokimq ++namespace oxenmq + { + class LokiMQ; + } ++namespace lokimq = oxenmq; + + namespace llarp + { +diff --git a/llarp/router_contact.hpp b/llarp/router_contact.hpp +index be29e76..16ce479 100644 +--- a/llarp/router_contact.hpp ++++ b/llarp/router_contact.hpp +@@ -17,10 +17,11 @@ + #define MAX_RC_SIZE (1024) + #define NICKLEN (32) + +-namespace lokimq ++namespace oxenmq + { + class bt_list_consumer; +-} // namespace lokimq ++} // namespace oxenmq ++namespace lokimq = oxenmq; + + namespace llarp + { diff --git a/debian/patches/0005-Move-default-user-group-into-deb-patch.patch b/debian/patches/0005-Move-default-user-group-into-deb-patch.patch index 4f51f100c..7cee1d35d 100644 --- a/debian/patches/0005-Move-default-user-group-into-deb-patch.patch +++ b/debian/patches/0005-Move-default-user-group-into-deb-patch.patch @@ -8,10 +8,10 @@ Rather than cramming it into CXXFLAGS in debian/rules. 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index dac39e8..f46ee2c 100644 +index cec1825..3783838 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -109,6 +109,9 @@ include(cmake/unix.cmake) +@@ -108,6 +108,9 @@ include(cmake/unix.cmake) include(cmake/check_for_std_optional.cmake) include(cmake/check_for_std_filesystem.cmake) diff --git a/debian/patches/series b/debian/patches/series index deec55d43..7cf5dbc38 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0004-Make-root-bootstraps-to-system-path.patch 0005-Move-default-user-group-into-deb-patch.patch 0007-Pass-debian-version-as-GIT_VERSION.patch +0004-lokimq-rename-compatibility-fix.patch