mirror of
https://github.com/qTox/qTox.git
synced 2024-03-22 14:00:36 +08:00
Merge pull request #6402
Mick Sayson (1): fix(toxext): Update toxext to fix memory corruption issues
This commit is contained in:
commit
a9b7a24fe4
|
@ -148,7 +148,7 @@ sudo ldconfig
|
|||
cd ..
|
||||
|
||||
# toxext
|
||||
git clone --branch v0.0.2 --depth=1 https://github.com/toxext/toxext toxext
|
||||
git clone --branch v0.0.3 --depth=1 https://github.com/toxext/toxext toxext
|
||||
cd toxext
|
||||
mkdir build
|
||||
cd build
|
||||
|
@ -158,7 +158,7 @@ sudo make install
|
|||
cd ../../
|
||||
|
||||
# toxext_messages
|
||||
git clone --branch v0.0.2 --depth=1 https://github.com/toxext/tox_extension_messages tox_extension_messages
|
||||
git clone --branch v0.0.3 --depth=1 https://github.com/toxext/tox_extension_messages tox_extension_messages
|
||||
cd tox_extension_messages
|
||||
mkdir build
|
||||
cd build
|
||||
|
|
|
@ -480,7 +480,7 @@ You will likely have to compile these yourself
|
|||
```bash
|
||||
git clone https://github.com/toxext/toxext.git toxext
|
||||
cd toxext
|
||||
git checkout v0.0.2
|
||||
git checkout v0.0.3
|
||||
cmake .
|
||||
make -j$(nproc)
|
||||
sudo make install
|
||||
|
@ -489,7 +489,7 @@ sudo make install
|
|||
```bash
|
||||
git clone https://github.com/toxext/tox_extension_messages.git tox_extension_messages
|
||||
cd tox_extension_messages
|
||||
git checkout v0.0.2
|
||||
git checkout v0.0.3
|
||||
cmake .
|
||||
make -j$(nproc)
|
||||
sudo make install
|
||||
|
|
|
@ -49,8 +49,8 @@ readonly BASE_DIR="${SCRIPT_DIR}/${INSTALL_DIR}"
|
|||
|
||||
# versions of libs to checkout
|
||||
readonly TOXCORE_VERSION="v0.2.12"
|
||||
readonly TOXEXT_VERSION="v0.0.2"
|
||||
readonly TOX_EXT_MESSAGES_VERSION="v0.0.2"
|
||||
readonly TOXEXT_VERSION="v0.0.3"
|
||||
readonly TOX_EXT_MESSAGES_VERSION="v0.0.3"
|
||||
readonly SQLCIPHER_VERSION="v4.3.0"
|
||||
|
||||
# directory names of cloned repositories
|
||||
|
|
|
@ -61,14 +61,14 @@ RUN git checkout v0.2.12 && \
|
|||
|
||||
RUN git clone https://github.com/toxext/toxext.git /toxext
|
||||
WORKDIR /toxext
|
||||
RUN git checkout v0.0.2 && \
|
||||
RUN git checkout v0.0.3 && \
|
||||
cmake . && \
|
||||
cmake --build . -- -j $(nproc) && \
|
||||
cmake --build . --target install
|
||||
|
||||
RUN git clone https://github.com/toxext/tox_extension_messages.git /tox_extension_messages
|
||||
WORKDIR /tox_extension_messages
|
||||
RUN git checkout v0.0.2 && \
|
||||
RUN git checkout v0.0.3 && \
|
||||
cmake . && \
|
||||
cmake --build . -- -j $(nproc) && \
|
||||
cmake --build . --target install
|
||||
|
|
|
@ -58,14 +58,14 @@ RUN git checkout v0.2.12 && \
|
|||
|
||||
RUN git clone https://github.com/toxext/toxext.git /toxext
|
||||
WORKDIR /toxext
|
||||
RUN git checkout v0.0.2 && \
|
||||
RUN git checkout v0.0.3 && \
|
||||
cmake . && \
|
||||
cmake --build . -- -j $(nproc) && \
|
||||
cmake --build . --target install
|
||||
|
||||
RUN git clone https://github.com/toxext/tox_extension_messages.git /tox_extension_messages
|
||||
WORKDIR /tox_extension_messages
|
||||
RUN git checkout v0.0.2 && \
|
||||
RUN git checkout v0.0.3 && \
|
||||
cmake . && \
|
||||
cmake --build . -- -j $(nproc) && \
|
||||
cmake --build . --target install
|
||||
|
|
|
@ -124,8 +124,8 @@
|
|||
{
|
||||
"type": "git",
|
||||
"url": "https://github.com/toxext/toxext",
|
||||
"tag": "v0.0.2",
|
||||
"commit": "0280357a0dded4dd46d0ff29f52875687136472d"
|
||||
"tag": "v0.0.3",
|
||||
"commit": "e34f91bc92bc1799c133bd1602ef5748a4eb4459"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
@ -136,8 +136,8 @@
|
|||
{
|
||||
"type": "git",
|
||||
"url": "https://github.com/toxext/tox_extension_messages",
|
||||
"tag": "v0.0.2",
|
||||
"commit": "f1f4539cf1aeed0bcc0ad476fbae74cb5bd0cf66"
|
||||
"tag": "v0.0.3",
|
||||
"commit": "3def0e36f63a3537b8fda87e12f870665d90dfcc"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
|
@ -192,7 +192,7 @@ install() {
|
|||
git pull
|
||||
else
|
||||
fcho "Cloning ToxExt git ... "
|
||||
git clone --branch v0.0.2 --depth=1 https://github.com/toxext/toxext "$TOX_EXT_DIR"
|
||||
git clone --branch v0.0.3 --depth=1 https://github.com/toxext/toxext "$TOX_EXT_DIR"
|
||||
fi
|
||||
# tox_extension_messages
|
||||
if [[ -e $TOX_EXT_MESSAGES_DIR/.git/index ]]
|
||||
|
@ -202,7 +202,7 @@ install() {
|
|||
git pul
|
||||
else
|
||||
fcho "Cloning tox_extension_messages git ... "
|
||||
git clone --branch v0.0.2 --depth=1 https://github.com/toxext/tox_extension_messages "$TOX_EXT_MESSAGES_DIR"
|
||||
git clone --branch v0.0.3 --depth=1 https://github.com/toxext/tox_extension_messages "$TOX_EXT_MESSAGES_DIR"
|
||||
fi
|
||||
# qTox
|
||||
if [[ $TRAVIS = true ]]
|
||||
|
|
|
@ -1040,8 +1040,8 @@ fi
|
|||
# ToxExt
|
||||
|
||||
TOXEXT_PREFIX_DIR="$DEP_DIR/toxext"
|
||||
TOXEXT_VERSION=0.0.2
|
||||
TOXEXT_HASH="047093eeed396ea9b4a3f0cd0a6bc4e0e09b339e2b03ba4b676e30888fe6acde"
|
||||
TOXEXT_VERSION=0.0.3
|
||||
TOXEXT_HASH="99cf215d261a07bd83eafd1c69dcf78018db605898350b6137f1fd8e7c54734a"
|
||||
TOXEXT_FILENAME="toxext-$TOXEXT_VERSION.tar.gz"
|
||||
if [ ! -f "$TOXEXT_PREFIX_DIR/done" ]
|
||||
then
|
||||
|
@ -1094,8 +1094,8 @@ fi
|
|||
# tox_extension_messages
|
||||
|
||||
TOX_EXTENSION_MESSAGES_PREFIX_DIR="$DEP_DIR/tox_extension_messages"
|
||||
TOX_EXTENSION_MESSAGES_VERSION=0.0.2
|
||||
TOX_EXTENSION_MESSAGES_HASH="95e8cdd1de6cc7ba561620716f340e9606a06b3c2ff9c9020af4784c22fd0d7f"
|
||||
TOX_EXTENSION_MESSAGES_VERSION=0.0.3
|
||||
TOX_EXTENSION_MESSAGES_HASH="e7a9a199a3257382a85a8e555b6c8c540b652a11ca9a471b9da2a25a660dfdc3"
|
||||
TOX_EXTENSION_MESSAGES_FILENAME="tox_extension_messages-$TOX_EXTENSION_MESSAGES_VERSION.tar.gz"
|
||||
if [ ! -f "$TOX_EXTENSION_MESSAGES_PREFIX_DIR/done" ]
|
||||
then
|
||||
|
|
Loading…
Reference in New Issue
Block a user