diff options
| author | TomZ | 2022-03-05 22:23:00 +0100 |
|---|---|---|
| committer | TomZ | 2022-03-05 22:31:17 +0100 |
| commit | f8919d3b5f49ffb998a4326ccde6b40bfab36b6c (patch) | |
| tree | afe2085d7121cf7bd08aa6658def9f1f964e1b6a | |
| parent | aa0ccd44296ff1952db43b49fb7fe8065ec92af9 (diff) | |
| download | aur-f8919d3b5f49ffb998a4326ccde6b40bfab36b6c.tar.gz | |
Cherry-pick a commit from unreleased master
This makes stuff compile
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 9 | ||||
| -rw-r--r-- | std.diff | 30 |
3 files changed, 39 insertions, 2 deletions
@@ -21,8 +21,10 @@ pkgbase = flowee source = https://gitlab.com/FloweeTheHub/thehub/-/archive/2021.06.2/thehub-2021.06.2.tar.gz source = flowee.logrotate source = flowee.conf + source = std.diff sha256sums = 81829dccf49be1ea7950a3ea33087a09cbf08f9a7ab8c8b6daf87d41556ecd8c sha256sums = 0438e1a44523aeb3bbecd60fd920ca7b2aacd267b5cf988ab77a44eb7c03929e sha256sums = 59c1928ddb33fed1d4bf35df8fecd1dbdda0b308eac943503a2e3afb8c64bc89 + sha256sums = 1257e6f40c54d99099d9180ab95ffb661141c97ac0c983de9f7155237f4709d8 pkgname = flowee @@ -15,13 +15,18 @@ backup=("etc/flowee/flowee.conf" "etc/flowee/rest-service.conf") install=flowee.install source=("https://gitlab.com/FloweeTheHub/thehub/-/archive/$pkgver/thehub-$pkgver.tar.gz" "flowee.logrotate" - "flowee.conf") + "flowee.conf" + "std.diff") sha256sums=("81829dccf49be1ea7950a3ea33087a09cbf08f9a7ab8c8b6daf87d41556ecd8c" "0438e1a44523aeb3bbecd60fd920ca7b2aacd267b5cf988ab77a44eb7c03929e" - "59c1928ddb33fed1d4bf35df8fecd1dbdda0b308eac943503a2e3afb8c64bc89") + "59c1928ddb33fed1d4bf35df8fecd1dbdda0b308eac943503a2e3afb8c64bc89" + "1257e6f40c54d99099d9180ab95ffb661141c97ac0c983de9f7155237f4709d8") build() { + cd thehub-$pkgver + patch -p1 < $srcdir/std.diff + cd .. mkdir -p build cd build cmake -Denable_gui=false -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$pkgdir/usr/ ../thehub-$pkgver diff --git a/std.diff b/std.diff new file mode 100644 index 000000000000..8c7bb27ffc99 --- /dev/null +++ b/std.diff @@ -0,0 +1,30 @@ +commit c8ed2ec382672d579433c3d69685b604f6021401 +Author: TomZ <tom@flowee.org> +Date: Sat Jan 22 23:25:53 2022 +0100 + + Make compile + +diff --git a/libs/networkmanager/NetworkManager.h b/libs/networkmanager/NetworkManager.h +index b42b6b3f2..38a5b4669 100644 +--- a/libs/networkmanager/NetworkManager.h ++++ b/libs/networkmanager/NetworkManager.h +@@ -21,6 +21,7 @@ + #include <string> + #include <cstdint> + #include <vector> ++#include <map> + + #include <boost/asio/io_service.hpp> + #include <boost/asio/ip/tcp.hpp> +diff --git a/libs/p2p/SyncChainAction.h b/libs/p2p/SyncChainAction.h +index 44bbd1507..74b428af2 100644 +--- a/libs/p2p/SyncChainAction.h ++++ b/libs/p2p/SyncChainAction.h +@@ -21,6 +21,7 @@ + #include "Action.h" + + #include <set> ++#include <map> + + class SyncChainAction : public Action + { |