From 33b1f37e378d85a1efc685f690c3a92cf24d2ebf Mon Sep 17 00:00:00 2001 From: redsky17 Date: Thu, 18 Apr 2019 22:28:58 -0400 Subject: Update olm repo to new location. Remove LICENSE file in favor of COPYING --- deps/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'deps') diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 2679876b..7f03ea5b 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -63,7 +63,7 @@ set( set(LMDBXX_HASH c57b501a4e8fa1187fa7fd348da415c7685a50a7cb25b17b3f257b9e9426f73d) -set(OLM_URL https://git.matrix.org/git/olm.git) +set(OLM_URL https://gitlab.matrix.org/matrix-org/olm.git) set(OLM_TAG 4065c8e11a33ba41133a086ed3de4da94dcb6bae) set(CMARK_URL https://github.com/commonmark/cmark/archive/0.28.3.tar.gz) -- cgit 1.4.1 From da0f8cf2915355e62840958e14777f7df1b49b50 Mon Sep 17 00:00:00 2001 From: redsky17 Date: Wed, 8 May 2019 21:52:00 -0400 Subject: Update to boost 1.69.0 to attemp travis fix --- deps/CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'deps') diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 7f03ea5b..7ec995ce 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -39,16 +39,15 @@ endif() include(ExternalProject) set(BOOST_URL - https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.tar.bz2) + https://dl.bintray.com/boostorg/release/1.69.0/source/boost_1_69_0.tar.bz2) set(BOOST_SHA256 - 7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7) + 8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406) set( MTXCLIENT_URL - https://github.com/Nheko-Reborn/mtxclient/archive/5dc567a4a494a2152658c6586e0d7637ecba85b4.tar.gz - ) + https://github.com/Nheko-Reborn/mtxclient/archive/49226a29626ff6c801931e48a12d7669e8ebcb23.tar.gz) set(MTXCLIENT_HASH - afea7b9681657233f6e833cccd161af66e320654be0c6bcffba855420e37f415) + 1538e7aa83b56e8ab5cca3598ba03a668937089698b8bd7495d6e65607e52d10) set( TWEENY_URL https://github.com/mobius3/tweeny/archive/b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf.tar.gz -- cgit 1.4.1 From eeb8fff2b57dcc104edfd283a87f456c77a6bd21 Mon Sep 17 00:00:00 2001 From: redsky17 Date: Wed, 8 May 2019 22:17:46 -0400 Subject: Update mtxclient ver --- deps/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'deps') diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 7ec995ce..eecb5de5 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -45,9 +45,9 @@ set(BOOST_SHA256 set( MTXCLIENT_URL - https://github.com/Nheko-Reborn/mtxclient/archive/49226a29626ff6c801931e48a12d7669e8ebcb23.tar.gz) + https://github.com/Nheko-Reborn/mtxclient/archive/3edf66b9854b496f9fe992660b0d3d66fd8af594.tar.gz) set(MTXCLIENT_HASH - 1538e7aa83b56e8ab5cca3598ba03a668937089698b8bd7495d6e65607e52d10) + 00ce1669fda6362181e887d4a71e69b214b8431c5a2dba054a8095449348718b) set( TWEENY_URL https://github.com/mobius3/tweeny/archive/b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf.tar.gz -- cgit 1.4.1 From 4b7e9f7746cddddff56e39987a9bd1b1e4fedff1 Mon Sep 17 00:00:00 2001 From: redsky17 Date: Wed, 8 May 2019 22:57:21 -0400 Subject: link boost dynamically --- CMakeLists.txt | 3 ++- deps/cmake/Boost.cmake | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'deps') diff --git a/CMakeLists.txt b/CMakeLists.txt index 352542a1..e1f2a7c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,7 +104,8 @@ if(NOT MSVC) -pedantic \ -fsized-deallocation \ -fdiagnostics-color=always \ - -Wunreachable-code" + -Wunreachable-code \ + -std=c++14" ) if (NOT CMAKE_COMPILER_IS_GNUCXX) # -Wshadow is buggy and broken in GCC, so do not enable it. diff --git a/deps/cmake/Boost.cmake b/deps/cmake/Boost.cmake index 27dc0c21..47eb723b 100644 --- a/deps/cmake/Boost.cmake +++ b/deps/cmake/Boost.cmake @@ -16,7 +16,7 @@ ExternalProject_Add( CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/boost/bootstrap.sh --with-libraries=random,thread,system,iostreams,atomic,chrono,date_time,regex --prefix=${DEPS_INSTALL_DIR} - BUILD_COMMAND ${DEPS_BUILD_DIR}/boost/b2 -d0 cxxstd=14 variant=release link=static threading=multi --layout=system + BUILD_COMMAND ${DEPS_BUILD_DIR}/boost/b2 -d0 cxxstd=14 variant=release link=shared runtime-link=shared threading=multi --layout=system INSTALL_COMMAND ${DEPS_BUILD_DIR}/boost/b2 -d0 install ) -- cgit 1.4.1 From a17a5550f82028a329c3bfa620c605360a39f605 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Sun, 12 May 2019 23:23:47 -0400 Subject: Update to newer mtxclient to allow optional static linking --- deps/CMakeLists.txt | 4 ++-- deps/cmake/MatrixClient.cmake | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'deps') diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index eecb5de5..e9fe225f 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -45,9 +45,9 @@ set(BOOST_SHA256 set( MTXCLIENT_URL - https://github.com/Nheko-Reborn/mtxclient/archive/3edf66b9854b496f9fe992660b0d3d66fd8af594.tar.gz) + https://github.com/Nheko-Reborn/mtxclient/archive/d5cc703848b44c1a9c543dc01355b7881f66ea81.tar.gz) set(MTXCLIENT_HASH - 00ce1669fda6362181e887d4a71e69b214b8431c5a2dba054a8095449348718b) + c56b0cfbe15157b96d429dd56dd88b7f6e33a06f670815336c6dd2aade8d54fc) set( TWEENY_URL https://github.com/mobius3/tweeny/archive/b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf.tar.gz diff --git a/deps/cmake/MatrixClient.cmake b/deps/cmake/MatrixClient.cmake index e20c5d22..479c6eb6 100644 --- a/deps/cmake/MatrixClient.cmake +++ b/deps/cmake/MatrixClient.cmake @@ -28,6 +28,7 @@ ExternalProject_Add( -DBUILD_LIB_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} ${BOOST_BUNDLE_ROOT} + -DMTX_STATIC=${MTX_STATIC} ${PLATFORM_FLAGS} ${DEPS_BUILD_DIR}/mtxclient BUILD_COMMAND -- cgit 1.4.1 From 2ff115577b8e4b76659c1ba76c76dd89ea8b8c23 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Wed, 22 May 2019 21:25:33 -0400 Subject: Update mtxclient version and build args --- deps/CMakeLists.txt | 4 ++-- deps/cmake/MatrixClient.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'deps') diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index e9fe225f..84665010 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -45,9 +45,9 @@ set(BOOST_SHA256 set( MTXCLIENT_URL - https://github.com/Nheko-Reborn/mtxclient/archive/d5cc703848b44c1a9c543dc01355b7881f66ea81.tar.gz) + https://github.com/Nheko-Reborn/mtxclient/archive/08100fd0628f702ae9064e9929b7161ab0140149.tar.gz) set(MTXCLIENT_HASH - c56b0cfbe15157b96d429dd56dd88b7f6e33a06f670815336c6dd2aade8d54fc) + bcd2633040657c75bb2c89a4a189e2da9222c40f7797e788fb1105cb4ccd6c75) set( TWEENY_URL https://github.com/mobius3/tweeny/archive/b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf.tar.gz diff --git a/deps/cmake/MatrixClient.cmake b/deps/cmake/MatrixClient.cmake index 479c6eb6..b2c570ab 100644 --- a/deps/cmake/MatrixClient.cmake +++ b/deps/cmake/MatrixClient.cmake @@ -28,7 +28,7 @@ ExternalProject_Add( -DBUILD_LIB_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} ${BOOST_BUNDLE_ROOT} - -DMTX_STATIC=${MTX_STATIC} + -DBUILD_SHARED_LIBS=${MTX_STATIC} ${PLATFORM_FLAGS} ${DEPS_BUILD_DIR}/mtxclient BUILD_COMMAND -- cgit 1.4.1 From e52f29a7547e0b0df9594b6a414384b861d7957e Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Wed, 22 May 2019 22:06:45 -0400 Subject: Minor build tweaks --- appveyor.yml | 5 +++-- deps/CMakeLists.txt | 1 + deps/cmake/MatrixClient.cmake | 8 +++++++- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'deps') diff --git a/appveyor.yml b/appveyor.yml index ec82810c..0504e73e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -59,6 +59,7 @@ build_script: -DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DUSE_BUNDLED_BOOST=OFF -DUSE_BUNDLED_JSON=OFF + -DMTX_STATIC=ON - cmake --build .deps --config Release # Build nheko @@ -104,8 +105,8 @@ after_build: # Copy installer data - copy %BUILD%\resources\nheko.ico installer\config - copy %BUILD%\resources\nheko.png installer\config - - copy %BUILD%\LICENSE installer\packages\com.mujx.nheko\meta\license.txt - - copy %BUILD%\LICENSE installer\packages\com.mujx.nheko.cleanup\meta\license.txt + - copy %BUILD%\COPYING installer\packages\com.mujx.nheko\meta\license.txt + - copy %BUILD%\COPYING installer\packages\com.mujx.nheko.cleanup\meta\license.txt - copy %BUILD%\deploy\installer\config.xml installer\config - copy %BUILD%\deploy\installer\controlscript.qs installer\config - copy %BUILD%\deploy\installer\uninstall.qs installer\packages\com.mujx.nheko\data diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 84665010..f04bfbcc 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -30,6 +30,7 @@ option(USE_BUNDLED_LMDBXX "Use the bundled version of lmdbxx." ${USE_BUNDLED}) option(USE_BUNDLED_MATRIX_CLIENT "Use the bundled version of mtxclient." ${USE_BUNDLED}) option(USE_BUNDLED_JSON "Use the bundled version of nlohmann json." ${USE_BUNDLED}) +option(MTX_STATIC "Compile / link bundled mtx client statically" OFF) if(USE_BUNDLED_BOOST) # bundled boost is 1.68, which requires CMake 3.12 or greater. diff --git a/deps/cmake/MatrixClient.cmake b/deps/cmake/MatrixClient.cmake index b2c570ab..44992c0b 100644 --- a/deps/cmake/MatrixClient.cmake +++ b/deps/cmake/MatrixClient.cmake @@ -13,6 +13,12 @@ endif() # instead of the bundled version of Boost, like we wanted. set(BOOST_BUNDLE_ROOT "-DBOOST_ROOT=${DEPS_BUILD_DIR}/boost") +set (MTX_SHARED ON) + +if (MTX_STATIC) + set (MTX_SHARED OFF) +endif() + ExternalProject_Add( MatrixClient @@ -28,7 +34,7 @@ ExternalProject_Add( -DBUILD_LIB_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} ${BOOST_BUNDLE_ROOT} - -DBUILD_SHARED_LIBS=${MTX_STATIC} + -DBUILD_SHARED_LIBS=${MTX_SHARED} ${PLATFORM_FLAGS} ${DEPS_BUILD_DIR}/mtxclient BUILD_COMMAND -- cgit 1.4.1 From 1b34b53afe766e8de3a127fb4085f7bee977f0da Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Wed, 22 May 2019 22:29:31 -0400 Subject: Update to v0.6.4 --- CHANGELOG.md | 22 ++++++++++++++++++++++ CMakeLists.txt | 2 +- README.md | 2 +- appveyor.yml | 12 ++++++------ deps/CMakeLists.txt | 4 ++-- resources/nheko.appdata.xml | 1 + 6 files changed, 33 insertions(+), 10 deletions(-) (limited to 'deps') diff --git a/CHANGELOG.md b/CHANGELOG.md index 0efbb516..74f6c62f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,28 @@ ## [Unreleased] +## [0.6.4] - 2019-05-22 + +*Most* of the below fixes are due to updates in mtxclient. Make sure you compile against 0.2.1 +if you do not use the mtxclient bundled with nheko to get these fixes. + +### Features +- Support V3 Rooms + +### Improvements +- Fix #19 + - Fix initial sync issue caused by matrix-org/synapse#4898 (thanks @monokelpinguin) + - Add additional lmbd max_dbs setting (thanks @AndrewJDR) +- Update DE translations (thanks @miocho) +- Update Dutch translations (thanks @vistaus) +- Fix text input UI bug (thanks @0xd800) +- Update linkifyMessage to parse HTML better (thanks @monokelpinguin) +- Update to Boost 1.69.0 +- Fix some memory-leak scenarios due to mismatched new / delete (thanks @monokelpinguin) + +### Other Changes +- mtxclient now builds as a Shared Library by default (instead of statically) + ## [0.6.3] - 2019-02-08 ### Features diff --git a/CMakeLists.txt b/CMakeLists.txt index e1f2a7c5..fda60b71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ include(QtCommon) project(nheko LANGUAGES C CXX) set(CPACK_PACKAGE_VERSION_MAJOR "0") set(CPACK_PACKAGE_VERSION_MINOR "6") -set(CPACK_PACKAGE_VERSION_PATCH "3") +set(CPACK_PACKAGE_VERSION_PATCH "4") set(PROJECT_VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}) set(PROJECT_VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}) set(PROJECT_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH}) diff --git a/README.md b/README.md index 9432aa10..cf7dbbb1 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ nheko ---- [![Build Status](https://travis-ci.org/Nheko-Reborn/nheko.svg?branch=master)](https://travis-ci.org/Nheko-Reborn/nheko) [![Build status](https://ci.appveyor.com/api/projects/status/07qrqbfylsg4hw2h/branch/master?svg=true)](https://ci.appveyor.com/project/redsky17/nheko/branch/master) -[![Stable Version](https://img.shields.io/badge/download-stable-green.svg)](https://github.com/Nheko-Reborn/nheko/releases/v0.6.3) +[![Stable Version](https://img.shields.io/badge/download-stable-green.svg)](https://github.com/Nheko-Reborn/nheko/releases/v0.6.4) [![Nightly](https://img.shields.io/badge/download-nightly-green.svg)](https://bintray.com/nheko-reborn/nheko/nheko) [![#nheko-reborn:matrix.org](https://img.shields.io/matrix/nheko-reborn:matrix.org.svg?label=%23nheko-reborn:matrix.org)](https://matrix.to/#/#nheko-reborn:matrix.org) [![AUR: nheko](https://img.shields.io/badge/AUR-nheko-blue.svg)](https://aur.archlinux.org/packages/nheko) diff --git a/appveyor.yml b/appveyor.yml index 0504e73e..08251174 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ --- -version: 0.6.3-{build} +version: 0.6.4-{build} configuration: Release image: Visual Studio 2017 @@ -39,8 +39,8 @@ build_script: # VERSION format: branch-master/branch-1.2 # INSTVERSION format: x.y.z # WINVERSION format: 9999.0.0.123/1.2.0.234 - - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.6.3 - - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.6.3 + - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.6.4 + - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.6.4 - if "%APPVEYOR_REPO_TAG%"=="false" if "%APPVEYOR_REPO_BRANCH%"=="master" set INSTVERSION=9999.0 - if "%APPVEYOR_REPO_TAG%"=="false" set WINVERSION=%INSTVERSION%.0.%APPVEYOR_BUILD_NUMBER% # VERSION format: v1.2.3/v1.3.4 @@ -115,9 +115,9 @@ after_build: - copy %BUILD%\deploy\installer\cleanup\package.xml installer\packages\com.mujx.nheko.cleanup\meta - copy %BUILD%\deploy\installer\cleanup\installscript.qs installer\packages\com.mujx.nheko.cleanup\meta # Amend version and date - - sed -i "s/__VERSION__/0.6.3/" installer\config\config.xml - - sed -i "s/__VERSION__/0.6.3/" installer\packages\com.mujx.nheko\meta\package.xml - - sed -i "s/__VERSION__/0.6.3/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml + - sed -i "s/__VERSION__/0.6.4/" installer\config\config.xml + - sed -i "s/__VERSION__/0.6.4/" installer\packages\com.mujx.nheko\meta\package.xml + - sed -i "s/__VERSION__/0.6.4/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml - sed -i "s/__DATE__/%DATE%/" installer\packages\com.mujx.nheko\meta\package.xml - sed -i "s/__DATE__/%DATE%/" installer\packages\com.mujx.nheko.cleanup\meta\package.xml # Copy nheko data diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index f04bfbcc..6f8f2616 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -46,9 +46,9 @@ set(BOOST_SHA256 set( MTXCLIENT_URL - https://github.com/Nheko-Reborn/mtxclient/archive/08100fd0628f702ae9064e9929b7161ab0140149.tar.gz) + https://github.com/Nheko-Reborn/mtxclient/archive/975ce8906c42742dbb698fcf9fa15663c530df20.tar.gz) set(MTXCLIENT_HASH - bcd2633040657c75bb2c89a4a189e2da9222c40f7797e788fb1105cb4ccd6c75) + 5e3169ef19b6e585069ceced42489574ce18380480628339bac015759fa1893e) set( TWEENY_URL https://github.com/mobius3/tweeny/archive/b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf.tar.gz diff --git a/resources/nheko.appdata.xml b/resources/nheko.appdata.xml index c4447a4e..b549e2e9 100644 --- a/resources/nheko.appdata.xml +++ b/resources/nheko.appdata.xml @@ -43,6 +43,7 @@ https://github.com/Nheko-Reborn/nheko https://github.com/Nheko-Reborn + -- cgit 1.4.1