rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump dep versions

This commit is contained in:
Nicolas Werner 2021-12-19 23:31:17 +01:00
parent 6be752e163
commit e907372f21
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -413,20 +413,20 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare( FetchContent_Declare(
MatrixClient MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
GIT_TAG ec7cd5285117e3d3079f186a179e701496b62485 GIT_TAG v0.6.1
) )
set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "") set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
set(BUILD_LIB_TESTS OFF CACHE INTERNAL "") set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")
FetchContent_MakeAvailable(MatrixClient) FetchContent_MakeAvailable(MatrixClient)
else() else()
find_package(MatrixClient 0.6.0 REQUIRED) find_package(MatrixClient 0.6.1 REQUIRED)
endif() endif()
if(USE_BUNDLED_OLM) if(USE_BUNDLED_OLM)
include(FetchContent) include(FetchContent)
FetchContent_Declare( FetchContent_Declare(
Olm Olm
GIT_REPOSITORY https://gitlab.matrix.org/matrix-org/olm.git GIT_REPOSITORY https://gitlab.matrix.org/matrix-org/olm.git
GIT_TAG 3.2.6 GIT_TAG 3.2.8
) )
set(OLM_TESTS OFF CACHE INTERNAL "") set(OLM_TESTS OFF CACHE INTERNAL "")
FetchContent_MakeAvailable(Olm) FetchContent_MakeAvailable(Olm)
@ -710,7 +710,7 @@ if(USE_BUNDLED_COEURL)
FetchContent_Declare( FetchContent_Declare(
coeurl coeurl
GIT_REPOSITORY https://nheko.im/Nheko-Reborn/coeurl.git GIT_REPOSITORY https://nheko.im/Nheko-Reborn/coeurl.git
GIT_TAG abafd60d7e9f5cce76c9abad3b2b3dc1382e5349 GIT_TAG v0.1.1
) )
FetchContent_MakeAvailable(coeurl) FetchContent_MakeAvailable(coeurl)
target_link_libraries(nheko PUBLIC coeurl::coeurl) target_link_libraries(nheko PUBLIC coeurl::coeurl)
@ -719,7 +719,7 @@ elseif(coeurl_DIR)
target_link_libraries(nheko PUBLIC coeurl::coeurl) target_link_libraries(nheko PUBLIC coeurl::coeurl)
else() else()
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(coeurl REQUIRED IMPORTED_TARGET coeurl) pkg_check_modules(coeurl REQUIRED IMPORTED_TARGET coeurl>=0.1.1)
target_link_libraries(nheko PUBLIC PkgConfig::coeurl) target_link_libraries(nheko PUBLIC PkgConfig::coeurl)
endif() endif()

14
io.github.NhekoReborn.Nheko.yaml
View File

@ -80,9 +80,9 @@ modules:
buildsystem: cmake-ninja buildsystem: cmake-ninja
name: olm name: olm
sources: sources:
- commit: 8656f1463c4e16366335fb468453a9455a366c78 - commit: 797183f27f1c8cdb9d4551aaa317bd13ff02401b
disable-shallow-clone: true disable-shallow-clone: true
tag: 3.2.6 tag: 3.2.8
type: git type: git
url: https://gitlab.matrix.org/matrix-org/olm.git url: https://gitlab.matrix.org/matrix-org/olm.git
- buildsystem: meson - buildsystem: meson
@ -170,8 +170,8 @@ modules:
- mkdir -p /app/bin/ - mkdir -p /app/bin/
- cp libqtjdenticon.so /app/bin/ - cp libqtjdenticon.so /app/bin/
sources: sources:
- commit: 07604d2e83e9c97969db93af04d3ea548c6f2e89 - commit: 0346c228f1d544581dfd72a4dceb84f8714570dd
tag: v0.2.1 tag: v0.3.0
type: git type: git
url: https://github.com/Nheko-Reborn/qt-jdenticon.git url: https://github.com/Nheko-Reborn/qt-jdenticon.git
- buildsystem: meson - buildsystem: meson
@ -179,7 +179,8 @@ modules:
- -Ddefault_library=static - -Ddefault_library=static
name: coeurl name: coeurl
sources: sources:
- commit: abafd60d7e9f5cce76c9abad3b2b3dc1382e5349 - commit: fa108b25a92b0e037723debc4388a300e737dc2d
tag: v0.1.1
type: git type: git
url: https://nheko.im/nheko-reborn/coeurl.git url: https://nheko.im/nheko-reborn/coeurl.git
- config-opts: - config-opts:
@ -190,7 +191,8 @@ modules:
buildsystem: cmake-ninja buildsystem: cmake-ninja
name: mtxclient name: mtxclient
sources: sources:
- commit: ec7cd5285117e3d3079f186a179e701496b62485 - commit: 9be1d3615ad30395557ef2768215bc14fd6359bd
tag: v0.6.1
type: git type: git
url: https://github.com/Nheko-Reborn/mtxclient.git url: https://github.com/Nheko-Reborn/mtxclient.git
- config-opts: - config-opts: