From 1aad94b5053fed86af7ac536d7b072ee3e9be364 Mon Sep 17 00:00:00 2001 From: simon987 Date: Sun, 22 May 2022 10:29:09 -0400 Subject: [PATCH] update mongoose remove libmagic dep --- Dockerfile | 4 ++-- patches/mongoose-master.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 028d5e1..6c04472 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN apt install -y pkg-config python3 yasm ragel \ automake autotools-dev wget libtool libssl-dev \ curl zip unzip tar xorg-dev libglu1-mesa-dev libxcursor-dev \ libxml2-dev libxinerama-dev gettext bison \ - nasm git meson\ + nasm git meson libmagic-dev \ && apt clean # cmake @@ -34,7 +34,7 @@ RUN ./vcpkg/vcpkg install \ && rm -rf /root/.cache/vcpkg /vcpkg/downloads /vcpkg/buildtrees /vcpkg/downloads RUN ./vcpkg/vcpkg install \ - lmdb cjson glib brotli libarchive[core,bzip2,libxml2,lz4,lzma,lzo] pthread tesseract libxml2 libmupdf gtest mongoose libmagic libraw jasper lcms gumbo \ + lmdb cjson glib brotli libarchive[core,bzip2,libxml2,lz4,lzma,lzo] pthread tesseract libxml2 libmupdf gtest mongoose libraw jasper lcms gumbo \ && rm -rf /root/.cache/vcpkg /vcpkg/downloads /vcpkg/buildtrees /vcpkg/downloads RUN mkdir -p /debug/lib/ && mkdir -p /include && \ diff --git a/patches/mongoose-master.patch b/patches/mongoose-master.patch index 0872777..0d61ce7 100644 --- a/patches/mongoose-master.patch +++ b/patches/mongoose-master.patch @@ -6,7 +6,7 @@ REPO cesanta/mongoose - REF 8e520756366ca5739f13dc6ad65fcf269dbbc994 #v7.1 - SHA512 a966a8b4e47e36da0f630c3cf343c85a1c1138508a82e506b21e4b8bd72573d0e0145318f97b32a67f423e033b348de76a00b780430e4e69d1a98bd7494a3e0a -+ REF 9173034b96cc312c3184f5d10324a0964132ab67 # master -+ SHA512 355095feb9b86f2df1d7942823892b24b761b0021731112ab69382c5decb2c22a67e77893dc09d5e7cf7bd2cd633433e8c10c667df8421802a23fc8e1bd7c1ac ++ REF d5993ba27ece4b406c230eca63b76dd5d2c28a2d # 7.7 ++ SHA512 b5633ae2845d6000549f84dd4933064c8ba6eedc37004666fa2de428e31df2f2ba2422a4434b001629be7bb52b94c52ed62e904231f39fc12074158d85ed145d HEAD_REF master )