From 3c467de9f27dfd481bc37335ea9ee0908b250a9b Mon Sep 17 00:00:00 2001 From: Anthony Bilinski Date: Tue, 19 Apr 2022 03:29:12 -0700 Subject: [PATCH] chore(deps): Update c-toxcore to v0.2.18 Replace msgpack-c with toxcore submodule of cmp. --- .ci-scripts/build-osx-deps.sh | 1 - buildscripts/build_msgpack_c.sh | 26 ------------------ buildscripts/docker/Dockerfile.almalinux | 1 - buildscripts/docker/Dockerfile.archlinux | 1 - buildscripts/docker/Dockerfile.debian | 1 - buildscripts/docker/Dockerfile.debian_old | 1 - buildscripts/docker/Dockerfile.fedora | 1 - .../docker/Dockerfile.flatpak_builder | 5 ---- buildscripts/docker/Dockerfile.opensuse | 1 - buildscripts/docker/Dockerfile.ubuntu_lts | 1 - .../docker/Dockerfile.windows_builder | 8 ------ buildscripts/download/download_msgpack_c.sh | 27 ------------------- buildscripts/download/download_toxcore.sh | 6 ++--- flatpak/io.github.qtox.qTox.json | 15 ----------- osx/Brewfile | 1 - 15 files changed, 3 insertions(+), 93 deletions(-) delete mode 100755 buildscripts/build_msgpack_c.sh delete mode 100755 buildscripts/download/download_msgpack_c.sh diff --git a/.ci-scripts/build-osx-deps.sh b/.ci-scripts/build-osx-deps.sh index 6f29d9c1c..50a3e5540 100755 --- 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 deleted file mode 100755 index 2cc1cd691..000000000 --- a/buildscripts/build_msgpack_c.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -# SPDX-License-Identifier: GPL-3.0-or-later AND MIT -# Copyright (c) 2022 by The qTox Project Contributors - -set -euo pipefail - -readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")" - -source "${SCRIPT_DIR}/build_utils.sh" - -parse_arch --dep "msgpack-c" --supported "win32 win64 macos" "$@" - -"${SCRIPT_DIR}/download/download_msgpack_c.sh" - -cmake .\ - "-DCMAKE_INSTALL_PREFIX=${DEP_PREFIX}" \ - -DCMAKE_BUILD_TYPE=Release \ - "${CMAKE_TOOLCHAIN_FILE}" \ - -DMSGPACK_BUILD_EXAMPLES=OFF \ - -DMSGPACK_BUILD_TESTS=OFF \ - "-DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOS_MINIMUM_SUPPORTED_VERSION}" \ - . - -make -j "${MAKE_JOBS}" -make install diff --git a/buildscripts/docker/Dockerfile.almalinux b/buildscripts/docker/Dockerfile.almalinux index 24688bc7f..c9a114357 100644 --- 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 index aec213905..424245567 100644 --- 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 index 904b093b6..37698005e 100644 --- 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 index 430cd4f35..2a50c578a 100644 --- 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 index 402ca5fed..8fd59818d 100644 --- 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 index 634c7a2cd..0b88c5083 100644 --- 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 index 895a644ea..915b3e993 100644 --- 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 index d4b4aa3d8..424aad4d8 100644 --- 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 index d8028cb04..b793d7437 100644 --- 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 deleted file mode 100755 index b70dd38be..000000000 --- a/buildscripts/download/download_msgpack_c.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# Copyright © 2022 by The qTox Project Contributors -# -# This program is libre software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -set -euo pipefail - -MSGPACK_VERSION=c-4.0.0 -MSGPACK_HASH=656ebe4566845e7bda9c097b625ba59ac72ddfd45df6017172d46d9ac7365aa3 - -source "$(dirname "$(realpath "$0")")/common.sh" - -download_verify_extract_tarball \ - "https://github.com/msgpack/msgpack-c/archive/${MSGPACK_VERSION}.tar.gz" \ - "${MSGPACK_HASH}" diff --git a/buildscripts/download/download_toxcore.sh b/buildscripts/download/download_toxcore.sh index 21d0d96db..0ec83ddd4 100755 --- 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 index 8ba26d363..00ce178de 100644 --- 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 index 8a031a321..1b981caa9 100644 --- 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"