From a1dd02d763b7e25d1b8d03e9ed29fc6b3f60ab47 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Wed, 12 Oct 2022 21:20:17 +0200
Subject: [PATCH] Bump mtxclient

---
 .gitlab-ci.yml                   |  2 +-
 CMakeLists.txt                   | 12 +++++++++++-
 io.github.NhekoReborn.Nheko.yaml | 11 ++++++++++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b314d465..197cc7ac 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ build-clazy:
     TRAVIS_OS_NAME: linux
   before_script:
     - apt-get update
-    - apt-get -y install --no-install-suggests --no-install-recommends ca-certificates build-essential ninja-build cmake gcc make automake liblmdb-dev 
+    - apt-get -y install --no-install-suggests --no-install-recommends ca-certificates build-essential ninja-build cmake gcc make automake liblmdb-dev libre2-dev
         libssl-dev libqt5multimedia5-plugins libqt5multimediagsttools5 libqt5multimediaquick5 libqt5svg5-dev 
         qtmultimedia5-dev qtquickcontrols2-5-dev qttools5-dev qttools5-dev-tools qtdeclarative5-dev 
         qml-module-qtmultimedia qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qt-labs-platform 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c27e596b..1a790f05 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,7 @@ option(USE_BUNDLED_COEURL "Use a bundled version of the Curl wrapper"
 	${HUNTER_ENABLED})
 option(USE_BUNDLED_LIBEVENT "Use the bundled version of libevent." ${HUNTER_ENABLED})
 option(USE_BUNDLED_LIBCURL "Use the bundled version of libcurl." ${HUNTER_ENABLED})
+option(USE_BUNDLED_RE2 "Use the bundled version of re2." ${HUNTER_ENABLED})
 
 include(CMakeDependentOption)
 set(VOIP_DEFAULT ON)
@@ -208,6 +209,15 @@ if (NOT COEURL_TARGET_NAME)
 	message(ERROR "Couldn't find coeurl")
 endif()
 
+if(USE_BUNDLED_RE2)
+	hunter_add_package(re2)
+	find_package(re2 CONFIG REQUIRED)
+else()
+	find_package(PkgConfig REQUIRED)
+	pkg_check_modules(re2 REQUIRED IMPORTED_TARGET re2)
+endif()
+
+
 #
 # LMDB
 #
@@ -583,7 +593,7 @@ if(USE_BUNDLED_MTXCLIENT)
 	FetchContent_Declare(
 		MatrixClient
 		GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
-		GIT_TAG        5ef4460c26acb02f24530db1c6058534b87014f6
+		GIT_TAG        fc10a689fd6dbcd8e99e45903d0bd6351577f300
 		)
 	set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
 	set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")
diff --git a/io.github.NhekoReborn.Nheko.yaml b/io.github.NhekoReborn.Nheko.yaml
index eb2feb96..db113981 100644
--- a/io.github.NhekoReborn.Nheko.yaml
+++ b/io.github.NhekoReborn.Nheko.yaml
@@ -145,6 +145,15 @@ modules:
       - sha256: 1155fd1a83049767360e9a120c43c578145db3204d2b309eba49fbbedd0f4ed3
         type: archive
         url: https://github.com/nlohmann/json/archive/v3.10.4.tar.gz
+  - buildsystem: simple
+    build-commands:
+      - make static
+      - make prefix=/app static-install
+    name: re2
+    sources:
+      - sha256: f89c61410a072e5cbcf8c27e3a778da7d6fd2f2b5b1445cd4f4508bee946ab0f
+        type: archive
+        url: https://github.com/google/re2/archive/refs/tags/2022-06-01.tar.gz
   - buildsystem: qmake
     name: qt-jdenticon
     no-make-install: true
@@ -173,7 +182,7 @@ modules:
     buildsystem: cmake-ninja
     name: mtxclient
     sources:
-      - commit: 5ef4460c26acb02f24530db1c6058534b87014f6
+      - commit: fc10a689fd6dbcd8e99e45903d0bd6351577f300
         #tag: v0.8.2
         type: git
         url: https://github.com/Nheko-Reborn/mtxclient.git