Merge branch 'windows_coeurl' into 'master'

Get SChannel CURL backend working for coeurl on Windows

See merge request nheko-reborn/nheko!8

CMakeLists.txt

@@ -20,6 +20,7 @@ include("cmake/HunterGate.cmake")
 HunterGate(
 	URL "https://github.com/cpp-pm/hunter/archive/v0.23.305.tar.gz"
 	SHA1 "fc8d7a6dac2fa23681847b3872d88d3839b657b0"
+	LOCAL
 	)
 
 option(USE_BUNDLED_SPDLOG "Use the bundled version of spdlog." ${HUNTER_ENABLED})
@@ -379,7 +380,7 @@ if(USE_BUNDLED_MTXCLIENT)
 	FetchContent_Declare(
 		MatrixClient
 		GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
-		GIT_TAG        9ecaefe377d4dab688caee186e4a263cb7f105e8
+		GIT_TAG        3de33120f6e2ef8e5d29b9a1a1000bfd5eea13b3
 		)
 	set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
 	set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")
@@ -673,7 +674,7 @@ if(USE_BUNDLED_COEURL)
 	FetchContent_Declare(
 		coeurl
 		GIT_REPOSITORY https://nheko.im/Nheko-Reborn/coeurl.git
-		GIT_TAG        417821a07cfe4429b08a2efed5e480a498087afd
+		GIT_TAG        e9010d1ce14e7163d1cb5407ed27b23303781796
 		)
 	FetchContent_MakeAvailable(coeurl)
 	target_link_libraries(nheko PUBLIC coeurl::coeurl)

cmake/Hunter/config.cmake

@@ -1,9 +1,52 @@
+
 hunter_config(
-    Boost
-    VERSION  "1.70.0-p1"
-    CMAKE_ARGS IOSTREAMS_NO_BZIP2=1
+    spdlog
+    VERSION 1.8.0-p1
 )
+
+hunter_config(
+    lmdb
+    VERSION 0.9.21-p2
+)
+
+hunter_config(
+    OpenSSL
+    VERSION 1.1.1j
+)
+
+hunter_config(
+    Libevent
+    VERSION 2.1.8-p4
+)
+
 hunter_config(
     nlohmann_json
+    VERSION 3.8.0
     CMAKE_ARGS JSON_MultipleHeaders=ON
 )
+
+if (WIN32)
+    hunter_config(
+        CURL
+        VERSION 7.74.0-p2
+        CMAKE_ARGS
+            CMAKE_USE_SCHANNEL=ON
+            BUILD_CURL_TESTS=OFF
+            BUILD_CURL_EXE=OFF
+            CMAKE_USE_OPENSSL=OFF
+            CMAKE_USE_LIBSSH2=OFF
+            BUILD_TESTING=OFF
+    )
+else()
+    hunter_config(
+        CURL
+        VERSION 7.74.0-p2
+        CMAKE_ARGS
+            CMAKE_USE_SCHANNEL=OFF
+            BUILD_CURL_TESTS=OFF
+            BUILD_CURL_EXE=OFF
+            CMAKE_USE_OPENSSL=ON
+            CMAKE_USE_LIBSSH2=OFF
+            BUILD_TESTING=OFF
+    )
+endif()

src/Utils.cpp

@@ -14,10 +14,11 @@
 #include <QScreen>
 #include <QSettings>
 #include <QStringBuilder>
+#include <QTextBoundaryFinder>
 #include <QTextDocument>
 #include <QXmlStreamReader>
 
-#include <QTextBoundaryFinder>
+#include <array>
 #include <cmath>
 #include <variant>