From 5bd5d19125cc1120b5bbd903446dd67e9dbaf5e6 Mon Sep 17 00:00:00 2001 From: ezkrg Date: Wed, 6 Apr 2022 13:29:21 +0200 Subject: update whatsapp to whatsmeow --- Dockerfile.debian | 17 +++++++++++------ plugin_versions | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Dockerfile.debian b/Dockerfile.debian index b2da3f2..f6e2a33 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -348,16 +348,21 @@ ARG WHATSAPP_VERSION RUN echo WHATSAPP=${WHATSAPP} > /tmp/status \ && if [ ${WHATSAPP} -eq 1 ]; \ then cd /tmp \ + && echo "deb http://deb.debian.org/debian bullseye-backports main" | tee -a /etc/apt/sources.list \ && apt-get update \ - && apt-get install -y --no-install-recommends golang-go \ + && apt-get install -y --no-install-recommends -t bullseye-backports golang-go \ + && apt-get install -y --no-install-recommends cmake pkg-config \ && git clone -n https://github.com/hoehermann/purple-gowhatsapp.git \ && cd purple-gowhatsapp \ && git checkout ${WHATSAPP_VERSION} \ - && make \ - && make install \ - && strip /usr/lib/purple-2/libgowhatsapp.so; \ + && mkdir build \ + && cd build \ + && cmake .. \ + && cmake --build . \ + && make install/strip \ + && strip /usr/lib/purple-2/libwhatsmeow.so; \ else mkdir -p /usr/lib/purple-2 \ - && ln -sf /nowhere /usr/lib/purple-2/libgowhatsapp.so; \ + && ln -sf /nowhere /usr/lib/purple-2/libwhatsmeow.so; \ fi # --- @@ -423,7 +428,7 @@ COPY --from=signald-build /tmp/status /tmp/plugin/signald COPY --from=icyque-build /usr/lib/purple-2/libicyque.so /tmp/usr/lib/purple-2/libicyque.so COPY --from=icyque-build /tmp/status /tmp/plugin/icyque -COPY --from=whatsapp-build /usr/lib/purple-2/libgowhatsapp.so /tmp/usr/lib/purple-2/libgowhatsapp.so +COPY --from=whatsapp-build /usr/lib/purple-2/libwhatsmeow.so /tmp/usr/lib/purple-2/libwhatsmeow.so COPY --from=whatsapp-build /tmp/status /tmp/plugin/whatsapp RUN apt-get update \ diff --git a/plugin_versions b/plugin_versions index 28d9550..c97f4d5 100644 --- a/plugin_versions +++ b/plugin_versions @@ -12,4 +12,4 @@ SKYPEWEB_VERSION=c4906b8 SLACK_VERSION=e0c73ae STEAM_VERSION=a6444d2 TELEGRAM_VERSION=v1.4.3 -WHATSAPP_VERSION=438fae6 +WHATSAPP_VERSION=v1.2.0 -- cgit v1.2.3