From 4dc7420162e69095942b392048c309e6246d6b21 Mon Sep 17 00:00:00 2001 From: sudden6 Date: Sun, 8 Jul 2018 14:19:17 +0200 Subject: [PATCH 1/7] fix(logging): only log toxcore messages above TRACE level --- src/core/toxlogger.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/toxlogger.cpp b/src/core/toxlogger.cpp index dae7e340f..d8a1cf1ff 100644 --- a/src/core/toxlogger.cpp +++ b/src/core/toxlogger.cpp @@ -47,6 +47,7 @@ void ToxLogger::onLogMessage(Tox *tox, TOX_LOG_LEVEL level, const char *file, ui switch (level) { case TOX_LOG_LEVEL_TRACE: + return; // trace level generates too much noise to enable by default case TOX_LOG_LEVEL_DEBUG: case TOX_LOG_LEVEL_INFO: qDebug() << logMsg; From 0ad80288dc81483cd4099723a35d51e8c1f77af3 Mon Sep 17 00:00:00 2001 From: sudden6 Date: Wed, 11 Jul 2018 10:31:22 +0200 Subject: [PATCH 2/7] fix(ui): don't emit filename change windows for every chat --- src/core/core.h | 2 +- src/core/corefile.cpp | 6 +++--- src/widget/form/chatform.cpp | 6 +++++- src/widget/form/chatform.h | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/core/core.h b/src/core/core.h index 626d4bc41..8f2fc49e4 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -184,7 +184,7 @@ signals: void fileTransferInfo(ToxFile file); void fileTransferRemotePausedUnpaused(ToxFile file, bool paused); void fileTransferBrokenUnbroken(ToxFile file, bool broken); - void fileNameChanged(); + void fileNameChanged(const ToxPk& friendPk); void fileSendFailed(uint32_t friendId, const QString& fname); diff --git a/src/core/corefile.cpp b/src/core/corefile.cpp index 17b56ff9e..04c1865e2 100644 --- a/src/core/corefile.cpp +++ b/src/core/corefile.cpp @@ -277,7 +277,7 @@ void CoreFile::removeFile(uint32_t friendId, uint32_t fileId) QString CoreFile::getCleanFileName(QString filename) { - QRegularExpression regex("[<>:\"/\\|?*]"); + QRegularExpression regex{QStringLiteral(R"([<>:"/\\|?])")}; filename.replace(regex, "_"); return filename; @@ -289,9 +289,9 @@ void CoreFile::onFileReceiveCallback(Tox*, uint32_t friendId, uint32_t fileId, u { Core* core = static_cast(vCore); auto filename = ToxString(fname, fnameLen); + const ToxPk friendPk = core->getFriendPublicKey(friendId); if (kind == TOX_FILE_KIND_AVATAR) { - const ToxPk friendPk = core->getFriendPublicKey(friendId); if (!filesize) { qDebug() << QString("Received empty avatar request %1:%2").arg(friendId).arg(fileId); // Avatars of size 0 means explicitely no avatar @@ -326,7 +326,7 @@ void CoreFile::onFileReceiveCallback(Tox*, uint32_t friendId, uint32_t fileId, u if (cleanFileName != filename.getQString()) { qDebug() << QStringLiteral("Cleaned filename"); filename = ToxString(cleanFileName); - emit core->fileNameChanged(); + emit core->fileNameChanged(friendPk); } else { qDebug() << QStringLiteral("filename already clean"); } diff --git a/src/widget/form/chatform.cpp b/src/widget/form/chatform.cpp index f3d3747b7..0b1af6ae1 100644 --- a/src/widget/form/chatform.cpp +++ b/src/widget/form/chatform.cpp @@ -234,8 +234,12 @@ void ChatForm::onSendTriggered() SendMessageStr(msgEdit->toPlainText()); msgEdit->clear(); } -void ChatForm::onFileNameChanged() +void ChatForm::onFileNameChanged(const ToxPk& friendPk) { + if(friendPk != f->getPublicKey()) { + return; + } + QMessageBox::warning(this, tr("Filename contained illegal characters"), tr("Illegal characters have been changed to _ \n" "so you can save the file on windows.")); diff --git a/src/widget/form/chatform.h b/src/widget/form/chatform.h index 84790abd0..85f494bde 100644 --- a/src/widget/form/chatform.h +++ b/src/widget/form/chatform.h @@ -74,7 +74,7 @@ public slots: void onAvEnd(uint32_t friendId, bool error); void onAvatarChange(uint32_t friendId, const QPixmap& pic); void onAvatarRemoved(uint32_t friendId); - void onFileNameChanged(); + void onFileNameChanged(const ToxPk& friendPk); protected slots: void onSearchUp(const QString& phrase) override; From c1521d7b981ac59777ed2269ec560881602b6742 Mon Sep 17 00:00:00 2001 From: Anthony Bilinski Date: Sun, 15 Jul 2018 11:29:21 -0700 Subject: [PATCH 3/7] chore(release): update version number and changelog --- CHANGELOG.md | 13 +++++++++++++ README.md | 6 +++--- osx/info.plist | 4 ++-- windows/qtox.nsi | 2 +- windows/qtox64.nsi | 2 +- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd1ace498..8905187cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ + +## (2018-07-15) + +This point release fixes dialog spam from receiving invalid filenames and logs +spam. No feature changes. + +#### Bug Fixes + +* **logging:** only log toxcore messages above TRACE level ([4dc74201](https://github.com/qTox/qTox/commit/4dc7420162e69095942b392048c309e6246d6b21)) +* **ui:** don't emit filename change windows for every chat ([c1701345](https://github.com/qTox/qTox/commit/c1701345455ad5b253beeaa3d487daa01b8b1b21)) + + + ## (2018-07-04) diff --git a/README.md b/README.md index 025ceefb7..7b3eef9b6 100644 --- a/README.md +++ b/README.md @@ -140,15 +140,15 @@ AED3 1134 9C23 A123 E5C4 AA4B 139C A045 3DA2 D773 ``` [#qtox@freenode]: https://webchat.freenode.net/?channels=qtox -[64 bit release]: https://github.com/qTox/qTox/releases/download/v1.16.1/setup-qtox-x86_64-release.exe -[32 bit release]: https://github.com/qTox/qTox/releases/download/v1.16.1/setup-qtox-i686-release.exe +[64 bit release]: https://github.com/qTox/qTox/releases/download/v1.16.2/setup-qtox-x86_64-release.exe +[32 bit release]: https://github.com/qTox/qTox/releases/download/v1.16.2/setup-qtox-i686-release.exe [32nightly]: https://build.tox.chat/view/qtox/job/qTox-cmake-nightly_build_windows_x86_release/lastSuccessfulBuild/artifact/qTox-cmake-nightly_build_windows_x86_release.zip [64nightly]: https://build.tox.chat/view/qtox/job/qTox-cmake-nightly_build_windows_x86-64_release/lastSuccessfulBuild/artifact/qTox-cmake-nightly_build_windows_x86-64_release.zip [Arch]: /INSTALL.md#arch [Building instructions]: /INSTALL.md#os-x [Contributing]: /CONTRIBUTING.md#how-to-start-contributing [easy issues]: https://github.com/qTox/qTox/labels/E-easy -[Latest release]: https://github.com/qTox/qTox/releases/download/v1.16.1/qTox.dmg +[Latest release]: https://github.com/qTox/qTox/releases/download/v1.16.2/qTox.dmg [Fedora]: /INSTALL.md#fedora [Gentoo]: /INSTALL.md#gentoo [Install/Build]: /INSTALL.md diff --git a/osx/info.plist b/osx/info.plist index b15f365e6..7349f378a 100644 --- a/osx/info.plist +++ b/osx/info.plist @@ -65,7 +65,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.16.1 + 1.16.2 CFBundleSignature toxq CFBundleURLTypes @@ -84,7 +84,7 @@ CFBundleVersion - 1.16.1 + 1.16.2 NSPrincipalClass NSApplication UTImportedTypeDeclarations diff --git a/windows/qtox.nsi b/windows/qtox.nsi index 7912eed0a..25a07badb 100644 --- a/windows/qtox.nsi +++ b/windows/qtox.nsi @@ -276,7 +276,7 @@ Section "Install" ${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}" ${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "Path" "$INSTDIR\bin\" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "qTox" - ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "1.16.1" + ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "1.16.2" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "The qTox Project" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\uninstall.exe" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "URLInfoAbout" "https://qtox.github.io" diff --git a/windows/qtox64.nsi b/windows/qtox64.nsi index 075d32eee..f89c5299a 100755 --- a/windows/qtox64.nsi +++ b/windows/qtox64.nsi @@ -277,7 +277,7 @@ Section "Install" ${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}" ${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "Path" "$INSTDIR\bin\" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "qTox" - ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "1.16.1" + ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "1.16.2" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "The qTox Project" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\uninstall.exe" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "URLInfoAbout" "https://qtox.github.io" From 90171366bd4c71c2ae3bed2eaa2dcf28345a0d2c Mon Sep 17 00:00:00 2001 From: sudden6 Date: Thu, 12 Jul 2018 14:29:01 +0200 Subject: [PATCH 4/7] chore(deploy): keep our own copy of the flatpak manifest in this repo This allows us to easily add dependencies or change the build for new features, but has the downside that we have to sync to the flathub.org repo on a release --- flatpak/build.sh | 14 --- flatpak/io.github.qtox.qTox.json | 157 ++++++++++++++++++++++++++ flatpak/patches/build_directory.patch | 14 --- flatpak/patches/ci_fixes.patch | 3 - 4 files changed, 157 insertions(+), 31 deletions(-) create mode 100644 flatpak/io.github.qtox.qTox.json delete mode 100644 flatpak/patches/build_directory.patch delete mode 100644 flatpak/patches/ci_fixes.patch diff --git a/flatpak/build.sh b/flatpak/build.sh index f5ad21199..0bffc04c8 100755 --- a/flatpak/build.sh +++ b/flatpak/build.sh @@ -14,8 +14,6 @@ readonly BUILD_DIR="/build" readonly QTOX_BUILD_DIR="$BUILD_DIR"/qtox readonly FP_BUILD_DIR="$BUILD_DIR"/flatpak readonly APT_FLAGS="-y --no-install-recommends" -# flatpak manifest file -readonly QTOX_MANIFEST="https://raw.githubusercontent.com/flathub/io.github.qtox.qTox/master/io.github.qtox.qTox.json" # flatpak manifest download location readonly MANIFEST_FILE="flatpak/io.github.qtox.qTox.json" # directory containing necessary patches @@ -41,18 +39,6 @@ cd "$BUILD_DIR" cp -r "$QTOX_SRC_DIR" "$QTOX_BUILD_DIR" cd "$QTOX_BUILD_DIR" -# download manifest file if not in repo, this allows an easy local override -if [ ! -f "$MANIFEST_FILE" ]; -then - wget -O "$MANIFEST_FILE" "$QTOX_MANIFEST" -fi - -# build from the local build directory instead of the git repo -patch "$MANIFEST_FILE" < "$PATCH_DIR"/build_directory.patch - -# this patch should contain all other patches needed -patch "$MANIFEST_FILE" < "$PATCH_DIR"/ci_fixes.patch - # create flatpak build directory mkdir -p "$FP_BUILD_DIR" cd "$FP_BUILD_DIR" diff --git a/flatpak/io.github.qtox.qTox.json b/flatpak/io.github.qtox.qTox.json new file mode 100644 index 000000000..07348893a --- /dev/null +++ b/flatpak/io.github.qtox.qTox.json @@ -0,0 +1,157 @@ +{ + "app-id": "io.github.qtox.qTox", + "runtime": "org.kde.Platform", + "sdk": "org.kde.Sdk", + "runtime-version": "5.10", + "command": "qtox", + "rename-icon": "qtox", + "finish-args": [ + "--share=network", + "--socket=pulseaudio", + "--socket=wayland", + "--socket=x11", + "--share=ipc", + "--filesystem=xdg-desktop", + "--filesystem=xdg-documents", + "--filesystem=xdg-download", + "--filesystem=xdg-music", + "--filesystem=xdg-pictures", + "--filesystem=xdg-videos", + "--filesystem=/media", + "--device=all" + ], + "build-options": { + "cflags": "-O3 -DSQLITE_HAS_CODEC", + "cxxflags": "-O3" + }, + "cleanup": [ + "/include", + "/lib/pkgconfig", + "/share/man" + ], + "modules": [ + { + "name": "libv4l2", + "config-opts": + [ + "--disable-libdvbv5", + "--disable-v4l-utils", + "--disable-qv4l2" + ], + "sources": + [ + { + "type": "archive", + "url": "https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.14.2.tar.bz2", + "sha256" : "e6b962c4b1253cf852c31da13fd6b5bb7cbe5aa9e182881aec55123bae680692" + } + ] + }, + { + "name": "ffmpeg", + "config-opts": [ + "--disable-everything", + "--enable-gpl", + "--disable-debug", + "--enable-optimizations", + "--enable-shared", + "--disable-programs", + "--disable-protocols", + "--disable-doc", + "--disable-avfilter", + "--disable-avresample", + "--disable-filters", + "--disable-iconv", + "--disable-network", + "--disable-postproc", + "--enable-libv4l2", + "--enable-indev=v4l2", + "--enable-libxcb", + "--enable-indev=xcbgrab", + "--enable-demuxer=h264", + "--enable-demuxer=mjpeg", + "--enable-parser=h264", + "--enable-parser=mjpeg", + "--enable-decoder=h264", + "--enable-decoder=mjpeg", + "--enable-decoder=rawvideo" + ], + "sources": [ + { + "type": "archive", + "url": "https://ffmpeg.org/releases/ffmpeg-4.0.1.tar.bz2", + "sha256" : "7ee591b1e7fb66f055fa514fbd5d98e092ddb3dbe37d2e50ea5c16ab51c21670" + } + ] + }, + { + "name": "sqlcipher", + "rm-configure": true, + "config-opts": [ + "--enable-tempstore=yes", + "--disable-tcl" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/sqlcipher/sqlcipher", + "tag": "v3.4.2", + "commit": "c6f709fca81c910ba133aaf6330c28e01ccfe5f8", + "disable-fsckobjects" : true + }, + { + "type": "script", + "dest-filename": "autogen.sh", + "commands": [ + "AUTOMAKE=\"automake --foreign\" autoreconf -vfi" + ] + } + ] + }, + { + "name": "libsodium", + "sources": [ + { + "type": "git", + "url": "https://github.com/jedisct1/libsodium", + "tag": "1.0.16", + "commit": "675149b9b8b66ff44152553fb3ebf9858128363d" + } + ] + }, + { + "name": "libqrencode", + "sources": [ + { + "type": "git", + "url": "https://github.com/fukuchi/libqrencode", + "tag": "v4.0.2", + "commit": "59ee597f913fcfda7a010a6e106fbee2595f68e4" + } + ] + }, + { + "name": "c-toxcore", + "buildsystem": "cmake-ninja", + "sources": [ + { + "type": "git", + "url": "https://github.com/toktok/c-toxcore", + "tag": "v0.2.3", + "commit": "ae7899cab8104fa3c3078a3e61ddfa58a826e39a" + } + ] + }, + { + "name": "qTox", + "buildsystem": "cmake-ninja", + "sources": [ + { + "type": "dir", + "path": "/build/qtox/" + } + ] + } + ] +} + diff --git a/flatpak/patches/build_directory.patch b/flatpak/patches/build_directory.patch deleted file mode 100644 index a921e8791..000000000 --- a/flatpak/patches/build_directory.patch +++ /dev/null @@ -1,14 +0,0 @@ -97,103c97,101 -< { -< "type": "git", -< "url": "https://github.com/qTox/qTox", -< "tag": "v1.15.0", -< "commit": "02d6c63acaac0ae95fa8be3a1b9301657e6a4a94" -< } -< ] ---- -> { -> "type": "dir", -> "path": "/build/qtox/" -> } -> ] diff --git a/flatpak/patches/ci_fixes.patch b/flatpak/patches/ci_fixes.patch deleted file mode 100644 index 0e2639028..000000000 --- a/flatpak/patches/ci_fixes.patch +++ /dev/null @@ -1,3 +0,0 @@ -8,9d7 -< "rename-desktop-file": "qtox.desktop", -< "rename-appdata-file": "qTox.appdata.xml", From b0ae3124027977a6db03c54ccb29e20e70a29ac5 Mon Sep 17 00:00:00 2001 From: sudden6 Date: Fri, 13 Jul 2018 15:58:57 +0200 Subject: [PATCH 5/7] chore: fix small issues in deployment scripts and add debug mode --- appimage/build-appimage.sh | 35 +++++++++++++++++++++++++++-------- flatpak/build-flatpak.sh | 32 +++++++++++++++++++++++++++----- flatpak/build.sh | 2 +- 3 files changed, 55 insertions(+), 14 deletions(-) diff --git a/appimage/build-appimage.sh b/appimage/build-appimage.sh index 62e65023e..3ebcbb954 100755 --- a/appimage/build-appimage.sh +++ b/appimage/build-appimage.sh @@ -22,8 +22,15 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. - -+set -exo pipefail +# usage: ./appimage/build-appimage.sh [Debug] +# +# If [Debug] is set to "Debug" the container will run in interactive mode and +# stay open to poke around in the filesystem. + +readonly DEBUG="$1" + +# Fail out on error +set -exo pipefail # This script should be run from the root of the repository @@ -38,12 +45,24 @@ fi mkdir -p ./output -docker run --rm \ - -v $PWD:/qtox \ - -v $PWD/output:/output \ - debian:stretch-slim \ - /bin/bash -c "/qtox/appimage/build.sh" - +if [ "$DEBUG" == "Debug" ] +then + echo "Execute: /qtox/appimage/build.sh to start the build script" + echo "Execute: exit to leave the container" + + docker run --rm -it \ + -v $PWD:/qtox \ + -v $PWD/output:/output \ + debian:stretch-slim \ + /bin/bash +else + docker run --rm \ + -v $PWD:/qtox \ + -v $PWD/output:/output \ + debian:stretch-slim \ + /bin/bash -c "/qtox/appimage/build.sh" +fi + # use the version number in the name when building a tag on Travis CI if [ -n "$TRAVIS_TAG" ] then diff --git a/flatpak/build-flatpak.sh b/flatpak/build-flatpak.sh index 30efadfb6..fd2f70113 100755 --- a/flatpak/build-flatpak.sh +++ b/flatpak/build-flatpak.sh @@ -6,6 +6,16 @@ # # This script should be run from the root of the repository +# usage: ./flatpak/build-flatpak.sh [Debug] +# +# If [Debug] is set to "Debug" the container will run in interactive mode and +# stay open to poke around in the filesystem. + +readonly DEBUG="$1" + +# Fail out on error +set -exo pipefail + if [ ! -f ./flatpak/build-flatpak.sh ]; then echo "" echo "You are attempting to run the build-flatpak.sh from a wrong directory." @@ -17,11 +27,23 @@ fi mkdir -p ./output -docker run --rm --privileged \ - -v $PWD:/qtox \ - -v $PWD/output:/output \ - debian:stretch-slim \ - /bin/bash -c "/qtox/flatpak/build.sh" +if [ "$DEBUG" == "Debug" ] +then + echo "Execute: /qtox/appimage/build.sh to start the build script" + echo "Execute: exit to leave the container" + + docker run --rm --privileged -it \ + -v $PWD:/qtox \ + -v $PWD/output:/output \ + debian:stretch-slim \ + /bin/bash +else + docker run --rm --privileged \ + -v $PWD:/qtox \ + -v $PWD/output:/output \ + debian:stretch-slim \ + /bin/bash -c "/qtox/flatpak/build.sh" +fi # use the version number in the name when building a tag on Travis CI if [ -n "$TRAVIS_TAG" ] diff --git a/flatpak/build.sh b/flatpak/build.sh index 0bffc04c8..262bb32ef 100755 --- a/flatpak/build.sh +++ b/flatpak/build.sh @@ -26,7 +26,7 @@ echo "deb http://ftp.debian.org/debian stretch-backports main" > /etc/apt/source # Get packages apt-get update -apt-get install $APT_FLAGS ca-certificates git elfutils wget xz-utils patch +apt-get install $APT_FLAGS ca-certificates git elfutils wget xz-utils patch bzip2 # install recent flatpak packages apt-get install $APT_FLAGS -t stretch-backports flatpak flatpak-builder From e5234cefc16461818bf03174c5ebbd293d6e89d2 Mon Sep 17 00:00:00 2001 From: Anthony Bilinski Date: Fri, 20 Jul 2018 11:52:46 -0700 Subject: [PATCH 6/7] chore(flatpak): update flatpak KDE SDK to 5.11 Fix https://github.com/flathub/io.github.qtox.qTox/issues/3 --- flatpak/io.github.qtox.qTox.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flatpak/io.github.qtox.qTox.json b/flatpak/io.github.qtox.qTox.json index 07348893a..bc03f4718 100644 --- a/flatpak/io.github.qtox.qTox.json +++ b/flatpak/io.github.qtox.qTox.json @@ -2,7 +2,7 @@ "app-id": "io.github.qtox.qTox", "runtime": "org.kde.Platform", "sdk": "org.kde.Sdk", - "runtime-version": "5.10", + "runtime-version": "5.11", "command": "qtox", "rename-icon": "qtox", "finish-args": [ From 8eed684c37bd711de2ca4bd863f5f0509edcdc2d Mon Sep 17 00:00:00 2001 From: Anthony Bilinski Date: Wed, 18 Jul 2018 00:44:57 -0700 Subject: [PATCH 7/7] chore(release): update version number and changelog --- CHANGELOG.md | 7 +++++++ README.md | 6 +++--- osx/info.plist | 4 ++-- windows/qtox.nsi | 2 +- windows/qtox64.nsi | 2 +- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8905187cf..28adc0b42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ + +## (2018-07-18) + +This point release fixes flatpak build. No feature changes. + + + ## (2018-07-15) diff --git a/README.md b/README.md index 7b3eef9b6..32a39e509 100644 --- a/README.md +++ b/README.md @@ -140,15 +140,15 @@ AED3 1134 9C23 A123 E5C4 AA4B 139C A045 3DA2 D773 ``` [#qtox@freenode]: https://webchat.freenode.net/?channels=qtox -[64 bit release]: https://github.com/qTox/qTox/releases/download/v1.16.2/setup-qtox-x86_64-release.exe -[32 bit release]: https://github.com/qTox/qTox/releases/download/v1.16.2/setup-qtox-i686-release.exe +[64 bit release]: https://github.com/qTox/qTox/releases/download/v1.16.3/setup-qtox-x86_64-release.exe +[32 bit release]: https://github.com/qTox/qTox/releases/download/v1.16.3/setup-qtox-i686-release.exe [32nightly]: https://build.tox.chat/view/qtox/job/qTox-cmake-nightly_build_windows_x86_release/lastSuccessfulBuild/artifact/qTox-cmake-nightly_build_windows_x86_release.zip [64nightly]: https://build.tox.chat/view/qtox/job/qTox-cmake-nightly_build_windows_x86-64_release/lastSuccessfulBuild/artifact/qTox-cmake-nightly_build_windows_x86-64_release.zip [Arch]: /INSTALL.md#arch [Building instructions]: /INSTALL.md#os-x [Contributing]: /CONTRIBUTING.md#how-to-start-contributing [easy issues]: https://github.com/qTox/qTox/labels/E-easy -[Latest release]: https://github.com/qTox/qTox/releases/download/v1.16.2/qTox.dmg +[Latest release]: https://github.com/qTox/qTox/releases/download/v1.16.3/qTox.dmg [Fedora]: /INSTALL.md#fedora [Gentoo]: /INSTALL.md#gentoo [Install/Build]: /INSTALL.md diff --git a/osx/info.plist b/osx/info.plist index 7349f378a..e91fedaba 100644 --- a/osx/info.plist +++ b/osx/info.plist @@ -65,7 +65,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.16.2 + 1.16.3 CFBundleSignature toxq CFBundleURLTypes @@ -84,7 +84,7 @@ CFBundleVersion - 1.16.2 + 1.16.3 NSPrincipalClass NSApplication UTImportedTypeDeclarations diff --git a/windows/qtox.nsi b/windows/qtox.nsi index 25a07badb..8ada7378c 100644 --- a/windows/qtox.nsi +++ b/windows/qtox.nsi @@ -276,7 +276,7 @@ Section "Install" ${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}" ${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "Path" "$INSTDIR\bin\" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "qTox" - ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "1.16.2" + ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "1.16.3" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "The qTox Project" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\uninstall.exe" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "URLInfoAbout" "https://qtox.github.io" diff --git a/windows/qtox64.nsi b/windows/qtox64.nsi index f89c5299a..b943388b9 100755 --- a/windows/qtox64.nsi +++ b/windows/qtox64.nsi @@ -277,7 +277,7 @@ Section "Install" ${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "" "$INSTDIR\${MAIN_APP_EXE}" ${WriteRegStr} "${REG_ROOT}" "${REG_APP_PATH}" "Path" "$INSTDIR\bin\" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayName" "qTox" - ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "1.16.2" + ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "DisplayVersion" "1.16.3" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "Publisher" "The qTox Project" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "UninstallString" "$INSTDIR\uninstall.exe" ${WriteRegStr} ${REG_ROOT} "${UNINSTALL_PATH}" "URLInfoAbout" "https://qtox.github.io"