summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas Werner <nicolas.werner@hotmail.de>2022-02-24 04:57:54 +0100
committerNicolas Werner <nicolas.werner@hotmail.de>2022-02-24 04:57:54 +0100
commit92c0b34436612882c75984849bfa0ee602cfd36e (patch)
treee26a121996da91db1eb67500e58ccbca65f11a3b
parentmaking userName_ an AbstractButton should play nicely with ListView (#961) (diff)
parentRebuild against newer mtxclient (diff)
downloadnheko-92c0b34436612882c75984849bfa0ee602cfd36e.tar.xz
Merge branch 'v0.9.1-fixes'
-rw-r--r--CHANGELOG.md8
-rw-r--r--CMakeLists.txt2
-rw-r--r--io.github.NhekoReborn.Nheko.yaml2
3 files changed, 10 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md

index 488d22ff..b9cb9991 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md
@@ -1,5 +1,13 @@ # Changelog +## [0.9.1-1] -- 2021-02-24 + +- Rebuild against newer mtxclient to fix an incompatibility with Matrix v1.1 and newer. + +If you use the binary packages for macOS or Windows, you will need this update. +Otherwise you can just wait for your distribution to update the mtxclient +package instead. + ## [0.9.1] -- 2021-12-21 ### Highlights diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb220440..7c29af2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -411,7 +411,7 @@ if(USE_BUNDLED_MTXCLIENT) set(BUILD_LIB_TESTS OFF CACHE INTERNAL "") FetchContent_MakeAvailable(MatrixClient) else() - find_package(MatrixClient 0.6.1 REQUIRED) + find_package(MatrixClient 0.6.2 REQUIRED) endif() if(USE_BUNDLED_OLM) include(FetchContent) diff --git a/io.github.NhekoReborn.Nheko.yaml b/io.github.NhekoReborn.Nheko.yaml
index 79f686a9..cfb300db 100644 --- a/io.github.NhekoReborn.Nheko.yaml +++ b/io.github.NhekoReborn.Nheko.yaml
@@ -190,7 +190,7 @@ modules: name: mtxclient sources: - commit: b649ddbedbf5b6b8b4e841139e5e1b5b034b70d1 - #tag: v0.6.1 + #tag: v0.6.2 type: git url: https://github.com/Nheko-Reborn/mtxclient.git - config-opts: