From f408fecdd0d858e93411c0df4f38c127554a640c Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 17 Nov 2020 11:54:10 +0100 Subject: [PATCH 1/2] Add missing zlib dependency. libzim were dependent of zlib and we were (wrongly) using its dependency declaration to link with zlib. Now that libzim doesn't depends on zlib, we need to fix our build system and explicitly depend on it. --- meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 51da0d124..184232a84 100644 --- a/meson.build +++ b/meson.build @@ -29,6 +29,7 @@ libzim_dep = dependency('libzim', version : '>=6.1.8', static:static_deps) pugixml_dep = dependency('pugixml', static:static_deps) libcurl_dep = dependency('libcurl', static:static_deps) microhttpd_dep = dependency('libmicrohttpd', static:static_deps) +zlib_dep = dependency('zlib', static:static_deps) if compiler.has_header('mustache.hpp') extra_include = [] @@ -44,7 +45,7 @@ if target_machine.system() == 'windows' and static_deps extra_cflags += '-DCURL_STATICLIB' endif -all_deps = [thread_dep, libicu_dep, libzim_dep, pugixml_dep, libcurl_dep, microhttpd_dep] +all_deps = [thread_dep, libicu_dep, libzim_dep, pugixml_dep, libcurl_dep, microhttpd_dep, zlib_dep] inc = include_directories('include', extra_include) From bc4b6846ef75f3b212e6d7ebc40d83c22a058655 Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Tue, 17 Nov 2020 11:54:36 +0100 Subject: [PATCH 2/2] Add missing dependency declaration in the README. --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index b6f184b6f..39602b53f 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,9 @@ libraries need to be available: * [Mustache](https://github.com/kainjow/Mustache) (Just copy the header `mustache.hpp` somewhere it can be found by the compiler and/or set CPPFLAGS with correct `-I` option). Use Mustache version 3 only. +* [libcurl](https://curl.se/libcurl) (`libcurl4-gnutls-dev`, `libcurl4-nss-dev` or `libcurl4-openssl-dev` on Ubuntu) +* [microhttpd](https://www.gnu.org/software/libmicrohttpd) (package `libmicrohttpd-dev` on Ubuntu) +* [zlib](https://zlib.net/) (package `zlib1g-dev` on Ubuntu) The following dependency needs to be available at runtime: * [Aria2](https://aria2.github.io/) (package `aria2` on Ubuntu)