Merge pull request #37 from mooomooo/signald

Update purple-signald build

Dockerfile

@@ -310,19 +310,19 @@ FROM bitlbee-build as signald-build
 ARG SIGNAL=1
 ARG SIGNAL_VERSION
 
-COPY signal-login.c.patch /tmp/login.c.patch
-
 RUN echo SIGNAL=${SIGNAL} > /tmp/status \
  && if [ ${SIGNAL} -eq 1 ]; \
      then cd /tmp \
-       && apk --no-cache add file-dev libmagic patch \
-       && git clone -n https://github.com/hoehermann/libpurple-signald \
-       && cd libpurple-signald \
+       && apk --no-cache add file-dev cmake \
+       && git clone -n https://github.com/hoehermann/purple-signald \
+       && cd purple-signald \
        && git checkout ${SIGNAL_VERSION} \
        && git submodule init \
        && git submodule update \
-       && patch < ../login.c.patch \
-       && make -j$(nproc --ignore 2) SUPPORT_EXTERNAL_ATTACHMENTS=1 libsignald.so \
+       && mkdir -p build \
+       && cd build \
+       && cmake .. \
+       && make -j$(nproc --ignore 2) \
        && make install \
        && strip /usr/lib/purple-2/libsignald.so; \
      else mkdir -p /usr/lib/purple-2 \
@@ -438,7 +438,7 @@ RUN addgroup -g 101 -S bitlbee \
  && if [ ${STEAM} -eq 1 ] || [ ${TELEGRAM} -eq 1 ] || [ ${MATRIX} -eq 1 ]; then PKGS="${PKGS} libgcrypt"; fi \
  && if [ ${TELEGRAM} -eq 1 ]; then PKGS="${PKGS} zlib libwebp libpng libstdc++ libgcc"; fi \
  && if [ ${HANGOUTS} -eq 1 ] || [ ${SIGNAL} -eq 1 ]; then PKGS="${PKGS} protobuf-c"; fi \
- && if [ ${SIGNAL} -eq 1 ]; then PKGS="${PKGS} libmagic"; fi \
+ && if [ ${SIGNAL} -eq 1 ]; then PKGS="${PKGS} gdk-pixbuf"; fi \
  && if [ ${SIPE} -eq 1 ]; then PKGS="${PKGS} libxml2"; fi \
  && if [ ${ROCKETCHAT} -eq 1 ]; then PKGS="${PKGS} discount"; fi \
  && if [ ${MATRIX} -eq 1 ]; then PKGS="${PKGS} sqlite http-parser olm"; fi \

plugin_versions

@@ -6,7 +6,7 @@ ICYQUE_VERSION=4fc08a0
 MASTODON_VERSION=v1.4.5
 MATRIX_VERSION=034ebf8
 ROCKETCHAT_VERSION=484e5bf
-SIGNAL_VERSION=v0.11.0
+SIGNAL_VERSION=v0.12.0
 SIPE_VERSION=3db5111
 SKYPEWEB_VERSION=8b29d7b
 SLACK_VERSION=3433ac5

signal-login.c.patch

@@ -1,10 +0,0 @@
---- login.c
-+++ login.c.new
-@@ -4,6 +4,7 @@
- #include <sys/un.h> // for sockaddr_un
- #include <sys/socket.h> // for socket and read
- #include <errno.h>
-+#include <stdint.h>
-
- /*
-  * Implements the read callback.