chore(deps): Update c-toxcore to v0.2.18

Replace msgpack-c with toxcore submodule of cmp.
Talkless · May 1, 2022 · 3c467de · 3c467de
1 parent a004243
commit 3c467de
Show file tree

Hide file tree

Showing 15 changed files with 3 additions and 93 deletions.
diff --git a/.ci-scripts/build-osx-deps.sh b/.ci-scripts/build-osx-deps.sh
@@ -39,6 +39,5 @@ install_deps \
     build_vpx.sh \
     build_opus.sh \
     build_ffmpeg.sh \
-    build_msgpack_c.sh \
     build_toxcore.sh \
     build_sqlcipher.sh \
diff --git a/buildscripts/build_msgpack_c.sh b/buildscripts/build_msgpack_c.sh
diff --git a/buildscripts/docker/Dockerfile.almalinux b/buildscripts/docker/Dockerfile.almalinux
@@ -37,7 +37,6 @@ RUN dnf --nodocs -y install dnf-plugins-core && \
 		ffmpeg-devel \
 		libexif-devel \
 		qrencode-devel \
-		msgpack-devel \
 		openal-soft-devel \
 		kf5-sonnet-devel \
 		libXScrnSaver-devel \

diff --git a/buildscripts/docker/Dockerfile.archlinux b/buildscripts/docker/Dockerfile.archlinux
@@ -30,7 +30,6 @@ RUN pacman -Syu --noconfirm --needed \
     sqlcipher \
     openal \
     sonnet \
-    msgpack-c \
     snorenotify \
     git \
     && \

diff --git a/buildscripts/docker/Dockerfile.debian b/buildscripts/docker/Dockerfile.debian
@@ -40,7 +40,6 @@ RUN apt-get update && \
     libkf5sonnet-dev \
     pkg-config \
     libqrencode-dev \
-    libmsgpack-dev \
     qttools5-dev && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*

diff --git a/buildscripts/docker/Dockerfile.debian_old b/buildscripts/docker/Dockerfile.debian_old
@@ -42,7 +42,6 @@ RUN apt-get update && \
     libkf5sonnet-dev \
     pkg-config \
     libqrencode-dev \
-    libmsgpack-dev \
     qt5-default \
     qttools5-dev && \
     apt-get clean && \

diff --git a/buildscripts/docker/Dockerfile.fedora b/buildscripts/docker/Dockerfile.fedora
@@ -39,7 +39,6 @@ RUN dnf --nodocs -y install dnf-plugins-core && \
         openal-soft-devel \
         kf5-sonnet-devel \
         libXScrnSaver-devel \
-        msgpack-devel \
         patch \
         sqlite-devel \
         sqlcipher-devel && \

diff --git a/buildscripts/docker/Dockerfile.flatpak_builder b/buildscripts/docker/Dockerfile.flatpak_builder
@@ -39,11 +39,6 @@ RUN mkdir -p /src/libsodium && \
     cd /src/libsodium && \
     /build/download/download_sodium.sh
 
-COPY download/download_msgpack_c.sh /build/download/download_msgpack_c.sh
-RUN mkdir -p /src/msgpack && \
-    cd /src/msgpack && \
-    /build/download/download_msgpack_c.sh
-
 COPY download/download_sqlcipher.sh /build/download/download_sqlcipher.sh
 RUN mkdir -p /src/sqlcipher && \
     cd /src/sqlcipher && \

diff --git a/buildscripts/docker/Dockerfile.opensuse b/buildscripts/docker/Dockerfile.opensuse
@@ -25,7 +25,6 @@ RUN zypper install --no-recommends -y \
     libqt5-qtsvg-devel \
     libsodium-devel \
     libvpx-devel \
-    msgpack-devel \
     openal-soft-devel \
     qrencode-devel \
     sqlcipher-devel \

diff --git a/buildscripts/docker/Dockerfile.ubuntu_lts b/buildscripts/docker/Dockerfile.ubuntu_lts
@@ -58,7 +58,6 @@ RUN apt-get update && \
         libinotifytools0-dev \
         liblz4-dev \
         libcairo-dev \
-        libmsgpack-dev \
         desktop-file-utils \
         wget \
         xxd \

diff --git a/buildscripts/docker/Dockerfile.windows_builder b/buildscripts/docker/Dockerfile.windows_builder
@@ -158,13 +158,6 @@ RUN mkdir -p /src/nsisshellexecasuser && \
   /build/build_nsisshellexecasuser_windows.sh && \
   rm -fr /src/nsisshellexecasuser
 
-COPY download/download_msgpack_c.sh /build/download/download_msgpack_c.sh
-COPY build_msgpack_c.sh /build/build_msgpack_c.sh
-RUN mkdir -p /src/msgpack_c && \
-  cd /src/msgpack_c && \
-  /build/build_msgpack_c.sh && \
-  rm -fr /src/msgpack_c
-
 COPY download/download_toxcore.sh /build/download/download_toxcore.sh
 COPY download/download_toxext.sh /build/download/download_toxext.sh
 COPY download/download_toxext_messages.sh /build/download/download_toxext_messages.sh
@@ -193,7 +186,6 @@ RUN mkdir /export && \
   cp /windows/lib/libqrencode.dll /export && \
   cp /windows/bin/libsodium-*.dll /export && \
   cp /windows/bin/libsqlcipher-*.dll /export && \
-  cp /windows/bin/libmsgpackc.dll /export && \
   cp /windows/bin/swscale-*.dll /export && \
   cp /windows/bin/libcrypto-*.dll /export && \
   cp /windows/bin/libtoxcore.dll /export && \

diff --git a/buildscripts/download/download_msgpack_c.sh b/buildscripts/download/download_msgpack_c.sh
diff --git a/buildscripts/download/download_toxcore.sh b/buildscripts/download/download_toxcore.sh
@@ -17,11 +17,11 @@
 
 set -euo pipefail
 
-TOXCORE_VERSION=0.2.17
-TOXCORE_HASH=d9cdf5d690fe8e217dcaba5b988fb943bbe7bda919a2fde6d9506df047e5f4cb
+TOXCORE_VERSION=0.2.18
+TOXCORE_HASH=f2940537998863593e28bc6a6b5f56f09675f6cd8a28326b7bc31b4836c08942
 
 source "$(dirname "$(realpath "$0")")/common.sh"
 
 download_verify_extract_tarball \
-    https://github.com/TokTok/c-toxcore/archive/v$TOXCORE_VERSION.tar.gz \
+    https://github.com/TokTok/c-toxcore/releases/download/v$TOXCORE_VERSION/c-toxcore-$TOXCORE_VERSION.tar.gz \
     "$TOXCORE_HASH"
diff --git a/flatpak/io.github.qtox.qTox.json b/flatpak/io.github.qtox.qTox.json
@@ -83,21 +83,6 @@
                 }
             ]
         },
-        {
-            "name": "msgpack",
-            "buildsystem": "cmake-ninja",
-            "config-opts": [
-                "-DCMAKE_BUILD_TYPE=Release",
-                "-DMSGPACK_BUILD_EXAMPLES=OFF",
-                "-DMSGPACK_BUILD_TESTS=OFF"
-            ],
-            "sources": [
-                {
-                    "type": "dir",
-                    "path": "/src/msgpack"
-                }
-            ]
-        },
         {
             "name": "c-toxcore",
             "buildsystem": "cmake-ninja",

diff --git a/osx/Brewfile b/osx/Brewfile
@@ -13,7 +13,6 @@ brew "qrencode"
 brew "qt@5"
 brew "sqlcipher"
 brew "openal-soft"
-brew "msgpack"
 # accelerate builds with ccache
 brew "ccache"