nheko, revbump, fixes build with new libfmt (#12063)

patches from upstream, master branch already checked and is good without patching for this
This commit is contained in:
Schrijvers Luc
2025-03-24 13:17:44 +00:00
committed by GitHub
parent f0876ac3fb
commit f4ba20c61f
2 changed files with 95 additions and 7 deletions

View File

@@ -5,7 +5,7 @@ etc.) and less like an IRC client. It was developed using the Qt6 framework."
HOMEPAGE="https://nheko.im/nheko-reborn/nheko"
COPYRIGHT="2017-2024 Nheko Authors"
LICENSE="GNU GPL v3"
REVISION="4"
REVISION="5"
SOURCE_URI="https://github.com/Nheko-Reborn/nheko/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="a3a7578bd9386a0b9a4188fa1296fdddb7df0f846c39728b80a998f9d06f36d1"
SOURCE_FILENAME="nheko-v$portVersion.tar.gz"
@@ -26,6 +26,7 @@ REQUIRES="
lib:libcrypto$secondaryArchSuffix
lib:libdbus_1$secondaryArchSuffix
lib:libfmt$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libglib_2.0$secondaryArchSuffix
lib:libgobject_2.0$secondaryArchSuffix
lib:libgstreamer_1.0$secondaryArchSuffix
@@ -41,6 +42,7 @@ REQUIRES="
lib:libQt6keychain$secondaryArchSuffix
lib:libQt6Multimedia$secondaryArchSuffix
lib:libQt6Network$secondaryArchSuffix
lib:libopenal$secondaryArchSuffix
lib:libQt6Qml$secondaryArchSuffix
lib:libQt6Quick$secondaryArchSuffix
lib:libQt6QuickControls2$secondaryArchSuffix

View File

@@ -1,4 +1,4 @@
From ef366ad5cf61650b3d2ef1b20e34a59deac67c79 Mon Sep 17 00:00:00 2001
From 181f1c7169cbecc4ccafad103e612eac5a3cb8a6 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Mon, 24 Jun 2024 19:26:00 +0200
Subject: Build fix
@@ -18,17 +18,17 @@ index 8ea1590..f9c3ad0 100644
// when you have an actual window, that has the focus...
auto waylandApp = app.nativeInterface<QNativeInterface::QWaylandApplication>();
--
2.45.1
2.48.1
From 65eb93f012a0e3119cf67dac72871eda4313281d Mon Sep 17 00:00:00 2001
From ae3e4d4dc2441d081b78670e96a600187c4b507a Mon Sep 17 00:00:00 2001
From: Daniel Weber <weberd@outlook.de>
Date: Tue, 12 Sep 2023 18:01:12 +0000
Subject: [PATCH 3/4] Set software mode (which should be default)
Subject: Set software mode (which should be default)
diff --git a/src/main.cpp b/src/main.cpp
index f9c3ad0..df34e4b 100644
index f9c3ad0..9ccddea 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -178,6 +178,10 @@ main(int argc, char *argv[])
@@ -43,5 +43,91 @@ index f9c3ad0..df34e4b 100644
for (int i = 1; i < argc; ++i) {
QString arg{argv[i]};
--
2.45.1
2.48.1
From ab25362383c1cfb1f0220310034d65db3680006b Mon Sep 17 00:00:00 2001
From: Vitaly <vitaly@easycoding.org>
Date: Tue, 16 Jul 2024 12:30:45 +0200
Subject: [PATCH] Fixed build against fmt 11.
diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
index 93e2cf1..562d2c8 100644
--- a/src/RegisterPage.cpp
+++ b/src/RegisterPage.cpp
@@ -4,6 +4,8 @@
#include <set>
+#include <fmt/ranges.h>
+
#include <mtx/responses/common.hpp>
#include <mtx/responses/register.hpp>
#include <mtx/responses/version.hpp>
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 3e7340f..99d337c 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -26,6 +26,7 @@
#include <QWindow>
#include <QXmlStreamReader>
+#include <fmt/ranges.h>
#include <nlohmann/json.hpp>
#include <cmark.h>
diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp
index cb595df..0757d88 100644
--- a/src/encryption/DeviceVerificationFlow.cpp
+++ b/src/encryption/DeviceVerificationFlow.cpp
@@ -9,6 +9,7 @@
#include <QDateTime>
#include <QTimer>
+#include <fmt/ranges.h>
#include <nlohmann/json.hpp>
#include "Cache.h"
--
2.48.1
From 338ce1fc0dd9e67532614ce496782a6260d0f921 Mon Sep 17 00:00:00 2001
From: DeepBlueV7.X <begasus@gmail.com>
Date: Mon, 24 Mar 2025 13:59:26 +0100
Subject: Bump mtxclient to fix fmt build errors
https://github.com/Nheko-Reborn/nheko/commit/b3026e297871666ad3b55d95af4be9f7f12a65ea
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04738bd..e09c435 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -606,7 +606,7 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare(
MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
- GIT_TAG v0.10.0
+ GIT_TAG a0b203980491ddf2e2fe4f1cd6af8c2562b3ee35
)
set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")
diff --git a/im.nheko.Nheko.yaml b/im.nheko.Nheko.yaml
index 4e6720a..368497b 100644
--- a/im.nheko.Nheko.yaml
+++ b/im.nheko.Nheko.yaml
@@ -223,8 +223,8 @@ modules:
buildsystem: cmake-ninja
name: mtxclient
sources:
- - commit: 457bc52773b40142848f0b2ab025516bf6ed634d
- tag: v0.10.0
+ - commit: a0b203980491ddf2e2fe4f1cd6af8c2562b3ee35
+# tag: v0.10.0
type: git
url: https://github.com/Nheko-Reborn/mtxclient.git
- config-opts:
--
2.48.1