pimhwang
/
qTox
mirror of https://github.com/qTox/qTox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #6402 

Mick Sayson (1):
      fix(toxext): Update toxext to fix memory corruption issues
reviewable/pr6394/r5
Anthony Bilinski 4 years ago
parent
8af9d0905f 761c2fb292
commit
a9b7a24fe4
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
8 changed files with 20 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .travis/build-ubuntu-16-04.sh
  2. 4
      INSTALL.md
  3. 4
      bootstrap.sh
  4. 4
      docker/Dockerfile.debian
  5. 4
      docker/Dockerfile.ubuntu
  6. 8
      flatpak/io.github.qtox.qTox.json
  7. 4
      osx/qTox-Mac-Deployer-ULTIMATE.sh
  8. 8
      windows/cross-compile/build.sh

4
.travis/build-ubuntu-16-04.sh
Unescape View File

@ -148,7 +148,7 @@ sudo ldconfig
cd .. cd ..
# toxext # 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 cd toxext
mkdir build mkdir build
cd build cd build
@ -158,7 +158,7 @@ sudo make install
cd ../../ cd ../../
# toxext_messages # 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 cd tox_extension_messages
mkdir build mkdir build
cd build cd build

4
INSTALL.md
Unescape View File

@ -480,7 +480,7 @@ You will likely have to compile these yourself
```bash ```bash
git clone https://github.com/toxext/toxext.git toxext git clone https://github.com/toxext/toxext.git toxext
cd toxext cd toxext
git checkout v0.0.2 git checkout v0.0.3
cmake . cmake .
make -j$(nproc) make -j$(nproc)
sudo make install sudo make install
@ -489,7 +489,7 @@ sudo make install
```bash ```bash
git clone https://github.com/toxext/tox_extension_messages.git tox_extension_messages git clone https://github.com/toxext/tox_extension_messages.git tox_extension_messages
cd tox_extension_messages cd tox_extension_messages
git checkout v0.0.2 git checkout v0.0.3
cmake . cmake .
make -j$(nproc) make -j$(nproc)
sudo make install sudo make install

4
bootstrap.sh
Unescape View File

@ -49,8 +49,8 @@ readonly BASE_DIR="${SCRIPT_DIR}/${INSTALL_DIR}"
# versions of libs to checkout # versions of libs to checkout
readonly TOXCORE_VERSION="v0.2.12" readonly TOXCORE_VERSION="v0.2.12"
readonly TOXEXT_VERSION="v0.0.2" readonly TOXEXT_VERSION="v0.0.3"
readonly TOX_EXT_MESSAGES_VERSION="v0.0.2" readonly TOX_EXT_MESSAGES_VERSION="v0.0.3"
readonly SQLCIPHER_VERSION="v4.3.0" readonly SQLCIPHER_VERSION="v4.3.0"
# directory names of cloned repositories # directory names of cloned repositories

4
docker/Dockerfile.debian
Unescape View File

@ -61,14 +61,14 @@ RUN git checkout v0.2.12 && \
RUN git clone https://github.com/toxext/toxext.git /toxext RUN git clone https://github.com/toxext/toxext.git /toxext
WORKDIR /toxext WORKDIR /toxext
RUN git checkout v0.0.2 && \ RUN git checkout v0.0.3 && \
cmake . && \ cmake . && \
cmake --build . -- -j $(nproc) && \ cmake --build . -- -j $(nproc) && \
cmake --build . --target install cmake --build . --target install
RUN git clone https://github.com/toxext/tox_extension_messages.git /tox_extension_messages RUN git clone https://github.com/toxext/tox_extension_messages.git /tox_extension_messages
WORKDIR /tox_extension_messages WORKDIR /tox_extension_messages
RUN git checkout v0.0.2 && \ RUN git checkout v0.0.3 && \
cmake . && \ cmake . && \
cmake --build . -- -j $(nproc) && \ cmake --build . -- -j $(nproc) && \
cmake --build . --target install cmake --build . --target install

4
docker/Dockerfile.ubuntu
Unescape View File

@ -58,14 +58,14 @@ RUN git checkout v0.2.12 && \
RUN git clone https://github.com/toxext/toxext.git /toxext RUN git clone https://github.com/toxext/toxext.git /toxext
WORKDIR /toxext WORKDIR /toxext
RUN git checkout v0.0.2 && \ RUN git checkout v0.0.3 && \
cmake . && \ cmake . && \
cmake --build . -- -j $(nproc) && \ cmake --build . -- -j $(nproc) && \
cmake --build . --target install cmake --build . --target install
RUN git clone https://github.com/toxext/tox_extension_messages.git /tox_extension_messages RUN git clone https://github.com/toxext/tox_extension_messages.git /tox_extension_messages
WORKDIR /tox_extension_messages WORKDIR /tox_extension_messages
RUN git checkout v0.0.2 && \ RUN git checkout v0.0.3 && \
cmake . && \ cmake . && \
cmake --build . -- -j $(nproc) && \ cmake --build . -- -j $(nproc) && \
cmake --build . --target install cmake --build . --target install

8
flatpak/io.github.qtox.qTox.json
Unescape View File

@ -124,8 +124,8 @@
{ {
"type": "git", "type": "git",
"url": "https://github.com/toxext/toxext", "url": "https://github.com/toxext/toxext",
"tag": "v0.0.2", "tag": "v0.0.3",
"commit": "0280357a0dded4dd46d0ff29f52875687136472d" "commit": "e34f91bc92bc1799c133bd1602ef5748a4eb4459"
} }
] ]
}, },
@ -136,8 +136,8 @@
{ {
"type": "git", "type": "git",
"url": "https://github.com/toxext/tox_extension_messages", "url": "https://github.com/toxext/tox_extension_messages",
"tag": "v0.0.2", "tag": "v0.0.3",
"commit": "f1f4539cf1aeed0bcc0ad476fbae74cb5bd0cf66" "commit": "3def0e36f63a3537b8fda87e12f870665d90dfcc"
} }
] ]
}, },

4
osx/qTox-Mac-Deployer-ULTIMATE.sh
Unescape View File

@ -192,7 +192,7 @@ install() {
git pull git pull
else else
fcho "Cloning ToxExt git ... " 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 fi
# tox_extension_messages # tox_extension_messages
if [[ -e $TOX_EXT_MESSAGES_DIR/.git/index ]] if [[ -e $TOX_EXT_MESSAGES_DIR/.git/index ]]
@ -202,7 +202,7 @@ install() {
git pul git pul
else else
fcho "Cloning tox_extension_messages git ... " 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 fi
# qTox # qTox
if [[ $TRAVIS = true ]] if [[ $TRAVIS = true ]]

8
windows/cross-compile/build.sh
Unescape View File

@ -1040,8 +1040,8 @@ fi
# ToxExt # ToxExt
TOXEXT_PREFIX_DIR="$DEP_DIR/toxext" TOXEXT_PREFIX_DIR="$DEP_DIR/toxext"
TOXEXT_VERSION=0.0.2 TOXEXT_VERSION=0.0.3
TOXEXT_HASH="047093eeed396ea9b4a3f0cd0a6bc4e0e09b339e2b03ba4b676e30888fe6acde" TOXEXT_HASH="99cf215d261a07bd83eafd1c69dcf78018db605898350b6137f1fd8e7c54734a"
TOXEXT_FILENAME="toxext-$TOXEXT_VERSION.tar.gz" TOXEXT_FILENAME="toxext-$TOXEXT_VERSION.tar.gz"
if [ ! -f "$TOXEXT_PREFIX_DIR/done" ] if [ ! -f "$TOXEXT_PREFIX_DIR/done" ]
then then
@ -1094,8 +1094,8 @@ fi
# tox_extension_messages # tox_extension_messages
TOX_EXTENSION_MESSAGES_PREFIX_DIR="$DEP_DIR/tox_extension_messages" TOX_EXTENSION_MESSAGES_PREFIX_DIR="$DEP_DIR/tox_extension_messages"
TOX_EXTENSION_MESSAGES_VERSION=0.0.2 TOX_EXTENSION_MESSAGES_VERSION=0.0.3
TOX_EXTENSION_MESSAGES_HASH="95e8cdd1de6cc7ba561620716f340e9606a06b3c2ff9c9020af4784c22fd0d7f" TOX_EXTENSION_MESSAGES_HASH="e7a9a199a3257382a85a8e555b6c8c540b652a11ca9a471b9da2a25a660dfdc3"
TOX_EXTENSION_MESSAGES_FILENAME="tox_extension_messages-$TOX_EXTENSION_MESSAGES_VERSION.tar.gz" TOX_EXTENSION_MESSAGES_FILENAME="tox_extension_messages-$TOX_EXTENSION_MESSAGES_VERSION.tar.gz"
if [ ! -f "$TOX_EXTENSION_MESSAGES_PREFIX_DIR/done" ] if [ ! -f "$TOX_EXTENSION_MESSAGES_PREFIX_DIR/done" ]
then then

Write Preview
Loading…
Cancel
Save