d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

v0.11.0

Browse source
This commit is contained in:
Nicolas Werner 2023-01-12 22:03:54 +01:00
parent 0c6a2fb706
commit 3507698ea5
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
5 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -1,6 +1,6 @@
# Changelog # Changelog
## [0.11.0] -- UNRELEASED ## [0.11.0] -- 2023-01-12
### Highlights ### Highlights

12
CMakeLists.txt
View file

@ -107,8 +107,8 @@ project(nheko LANGUAGES CXX C)
include(GNUInstallDirs) include(GNUInstallDirs)
set(CPACK_PACKAGE_VERSION_MAJOR "0") set(CPACK_PACKAGE_VERSION_MAJOR "0")
set(CPACK_PACKAGE_VERSION_MINOR "10") set(CPACK_PACKAGE_VERSION_MINOR "11")
set(CPACK_PACKAGE_VERSION_PATCH "2") set(CPACK_PACKAGE_VERSION_PATCH "0")
set(PROJECT_VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}) set(PROJECT_VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR})
set(PROJECT_VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}) set(PROJECT_VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR})
set(PROJECT_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH}) set(PROJECT_VERSION_PATCH ${CPACK_PACKAGE_VERSION_PATCH})
@ -186,13 +186,13 @@ 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 f989f3c54c1ca15e29c5bd6b1ce4efbcb3fd8078 GIT_TAG v0.3.0
) )
FetchContent_MakeAvailable(coeurl) FetchContent_MakeAvailable(coeurl)
set(COEURL_TARGET_NAME coeurl::coeurl) set(COEURL_TARGET_NAME coeurl::coeurl)
else() else()
find_package(PkgConfig) find_package(PkgConfig)
pkg_check_modules(coeurl IMPORTED_TARGET coeurl>=0.1.1) pkg_check_modules(coeurl IMPORTED_TARGET coeurl>=0.3.0)
if (TARGET PkgConfig::coeurl) if (TARGET PkgConfig::coeurl)
set(COEURL_TARGET_NAME PkgConfig::coeurl) set(COEURL_TARGET_NAME PkgConfig::coeurl)
endif() endif()
@ -595,13 +595,13 @@ 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 79dcdbb8daad2efb06147e136702a12cd8877aba GIT_TAG v0.9.0
) )
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.8.1 REQUIRED) find_package(MatrixClient 0.9.0 REQUIRED)
endif() endif()
if (VOIP) if (VOIP)

10
appveyor.yml
View file

@ -1,6 +1,6 @@
--- ---
version: 0.10.2-{build} version: 0.11.0-{build}
configuration: Release configuration: Release
image: Visual Studio 2022 image: Visual Studio 2022
@ -29,8 +29,8 @@ build_script:
# VERSION format: branch-master/branch-1.2 # VERSION format: branch-master/branch-1.2
# INSTVERSION format: x.y.z # INSTVERSION format: x.y.z
# WINVERSION format: 9999.0.0.123/1.2.0.234 # WINVERSION format: 9999.0.0.123/1.2.0.234
- if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.10.2 - if "%APPVEYOR_REPO_TAG%"=="false" set INSTVERSION=0.11.0
- if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.10.2 - if "%APPVEYOR_REPO_TAG%"=="false" set VERSION=0.11.0
- if "%APPVEYOR_REPO_TAG%"=="false" if "%APPVEYOR_REPO_BRANCH%"=="master" set INSTVERSION=9999.0 - 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% - if "%APPVEYOR_REPO_TAG%"=="false" set WINVERSION=%INSTVERSION%.0.%APPVEYOR_BUILD_NUMBER%
# VERSION format: v1.2.3/v1.3.4 # VERSION format: v1.2.3/v1.3.4
@ -93,8 +93,8 @@ after_build:
- copy %BUILD%\deploy\installer\gui\package.xml installer\packages\io.github.nhekoreborn.nheko\meta - copy %BUILD%\deploy\installer\gui\package.xml installer\packages\io.github.nhekoreborn.nheko\meta
- copy %BUILD%\deploy\installer\gui\installscript.qs installer\packages\io.github.nhekoreborn.nheko\meta - copy %BUILD%\deploy\installer\gui\installscript.qs installer\packages\io.github.nhekoreborn.nheko\meta
# Amend version and date # Amend version and date
- sed -i "s/__VERSION__/0.10.2/" installer\config\config.xml - sed -i "s/__VERSION__/0.11.0/" installer\config\config.xml
- sed -i "s/__VERSION__/0.10.2/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml - sed -i "s/__VERSION__/0.11.0/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml
- sed -i "s/__DATE__/%DATE%/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml - sed -i "s/__DATE__/%DATE%/" installer\packages\io.github.nhekoreborn.nheko\meta\package.xml
# Copy nheko data # Copy nheko data
- xcopy NhekoData\*.* installer\packages\io.github.nhekoreborn.nheko\data\*.* /s /e /c /y - xcopy NhekoData\*.* installer\packages\io.github.nhekoreborn.nheko\data\*.* /s /e /c /y

8
io.github.NhekoReborn.Nheko.yaml
View file

@ -170,8 +170,8 @@ modules:
- -Ddefault_library=static - -Ddefault_library=static
name: coeurl name: coeurl
sources: sources:
- commit: f989f3c54c1ca15e29c5bd6b1ce4efbcb3fd8078 - commit: 2a20a129240a1a017b37b6874faab499ca4e523b
#tag: v0.2.1 tag: v0.3.0
type: git type: git
url: https://nheko.im/nheko-reborn/coeurl.git url: https://nheko.im/nheko-reborn/coeurl.git
- config-opts: - config-opts:
@ -182,8 +182,8 @@ modules:
buildsystem: cmake-ninja buildsystem: cmake-ninja
name: mtxclient name: mtxclient
sources: sources:
- commit: 79dcdbb8daad2efb06147e136702a12cd8877aba - commit: f30d77a719f3deb66b17b99f3585ee919dbbe120
#tag: v0.8.2 tag: v0.9.0
type: git type: git
url: https://github.com/Nheko-Reborn/mtxclient.git url: https://github.com/Nheko-Reborn/mtxclient.git
- config-opts: - config-opts:

1
resources/nheko.appdata.xml.in
View file

@ -61,6 +61,7 @@
<url type="homepage">https://github.com/Nheko-Reborn/nheko</url> <url type="homepage">https://github.com/Nheko-Reborn/nheko</url>
<update_contact>https://github.com/Nheko-Reborn</update_contact> <update_contact>https://github.com/Nheko-Reborn</update_contact>
<releases> <releases>
<release date="2023-01-12" version="0.11.0"/>
<release date="2022-09-28" version="0.10.2"/> <release date="2022-09-28" version="0.10.2"/>
<release date="2022-09-07" version="0.10.1"/> <release date="2022-09-07" version="0.10.1"/>
<release date="2022-07-22" version="0.10.0"/> <release date="2022-07-22" version="0.10.0"/>