diff options
| -rw-r--r-- | Dockerfile | 16 | ||||
| -rw-r--r-- | signal-login.c.patch | 10 |
2 files changed, 8 insertions, 18 deletions
@@ -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 \ diff --git a/signal-login.c.patch b/signal-login.c.patch deleted file mode 100644 index 5336347..0000000 --- a/signal-login.c.patch +++ /dev/null @@ -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.
\ No newline at end of file |