aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--community/mtxclient/0001-Fix-compilaton-with-Olm-3.2.5.patch32
-rw-r--r--community/mtxclient/APKBUILD8
2 files changed, 38 insertions, 2 deletions
diff --git a/community/mtxclient/0001-Fix-compilaton-with-Olm-3.2.5.patch b/community/mtxclient/0001-Fix-compilaton-with-Olm-3.2.5.patch
new file mode 100644
index 0000000000..ef18647abd
--- /dev/null
+++ b/community/mtxclient/0001-Fix-compilaton-with-Olm-3.2.5.patch
@@ -0,0 +1,32 @@
+From b452a984b0fc522c21bb8df7d320bf13960974d0 Mon Sep 17 00:00:00 2001
+From: Nicolas Werner <nicolas.werner@hotmail.de>
+Date: Thu, 16 Sep 2021 15:51:33 +0200
+Subject: [PATCH] Fix compilaton with Olm 3.2.5
+
+---
+ lib/crypto/client.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/crypto/client.cpp b/lib/crypto/client.cpp
+index 0b46163..62233de 100644
+--- a/lib/crypto/client.cpp 2021-04-20 18:14:41.000000000 +0200
++++ b/lib/crypto/client.cpp 2021-10-24 13:56:28.132590707 +0200
+@@ -37,15 +37,15 @@ static const std::array olmErrorStrings{
+
+ };
+
+-OlmErrorCode
++mtx::crypto::OlmErrorCode
+ olm_exception::ec_from_string(std::string_view error)
+ {
+ for (size_t i = 0; i < olmErrorStrings.size(); i++) {
+ if (olmErrorStrings[i] == error)
+- return static_cast<OlmErrorCode>(i);
++ return static_cast<mtx::crypto::OlmErrorCode>(i);
+ }
+
+- return OlmErrorCode::UNKNOWN_ERROR;
++ return mtx::crypto::OlmErrorCode::UNKNOWN_ERROR;
+ }
+
+ void
diff --git a/community/mtxclient/APKBUILD b/community/mtxclient/APKBUILD
index 7b32947ff3..77b3ab61d7 100644
--- a/community/mtxclient/APKBUILD
+++ b/community/mtxclient/APKBUILD
@@ -10,7 +10,8 @@ license="MIT"
depends_dev="nlohmann-json openssl1.1-compat-dev zlib-dev olm-dev libsodium-dev boost-dev"
makedepends="$depends_dev cmake gtest-dev"
subpackages="$pkgname-dev"
-source="https://github.com/nheko-reborn/mtxclient/archive/v$pkgver/mtxclient-v$pkgver.tar.gz"
+source="https://github.com/nheko-reborn/mtxclient/archive/v$pkgver/mtxclient-v$pkgver.tar.gz
+ 0001-Fix-compilaton-with-Olm-3.2.5.patch"
options="!check" # Requires running Synapse instance
build() {
@@ -31,4 +32,7 @@ package() {
DESTDIR="$pkgdir" cmake --install build
}
-sha512sums="f0a5e823bd7f3cccdf5f919c04c36a1a5ab4d2627a6f8f3fac78e4b300eda3b9e1f5060fb31e6e47267bbafc3a03f6c2a2d16c2323e63ce4889f551860e7703f mtxclient-v0.5.1.tar.gz"
+sha512sums="
+f0a5e823bd7f3cccdf5f919c04c36a1a5ab4d2627a6f8f3fac78e4b300eda3b9e1f5060fb31e6e47267bbafc3a03f6c2a2d16c2323e63ce4889f551860e7703f mtxclient-v0.5.1.tar.gz
+bd422a9f7f35b067a00076ccf93e832fc97eed19b9fc1b34bb50d25e348dfc342b6d90b9fad1709c44c4516ed72d861f18799c60cd41f47c97993988d44f0916 0001-Fix-compilaton-with-Olm-3.2.5.patch
+"