Merge branch '1.8'

qxmpp-project · Aug 21, 2024 · 6b6d0e7 · 6b6d0e7
2 parents fc44fb1 + e45d1c8
commit 6b6d0e7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -43,7 +43,7 @@ jobs:
           token: ${{ secrets.CODECOV_TOKEN }}
 
   macos:
-    runs-on: macos-latest
+    runs-on: macos-13
     env:
       CONFIG: ${{ matrix.config }}
       QT_VERSION: ${{ matrix.qt_version }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,12 @@ QXmpp 1.9.0 (UNRELEASED)
 
 *under development*
 
+QXmpp 1.8.1 (August 21, 2024)
+-----------------------------
+
+ - Fix other DNS records are not tried if host does not exist (@lnjX)
+ - Fix clang build (@lnjX)
+
 QXmpp 1.8.0 (July 30, 2024)
 ---------------------------
 

diff --git a/src/base/QXmppSasl.cpp b/src/base/QXmppSasl.cpp
@@ -28,6 +28,9 @@ template<class... Ts>
 struct overloaded : Ts... {
     using Ts::operator()...;
 };
+// explicit deduction guide
+template<class... Ts>
+overloaded(Ts...) -> overloaded<Ts...>;
 
 static QByteArray forcedNonce;
 

diff --git a/src/client/QXmppAccountMigrationManager.h b/src/client/QXmppAccountMigrationManager.h
@@ -12,6 +12,7 @@
 
 #include <any>
 #include <typeindex>
+#include <unordered_map>
 
 struct QXmppExportDataPrivate;
 

diff --git a/src/client/QXmppSaslManager.cpp b/src/client/QXmppSaslManager.cpp
@@ -46,7 +46,7 @@ static auto chooseMechanism(const QXmppConfiguration &config, const QList<QStrin
     auto mechanismsView = availableMechanisms |
         views::filter(isEnabled) |
         views::transform(&SaslMechanism::fromString) |
-        views::filter(&std::optional<SaslMechanism>::has_value) |
+        views::filter([](const auto &o) { return o.has_value(); }) |
         views::transform([](const auto &v) { return *v; }) |
         views::filter(std::bind(&QXmppSaslClient::isMechanismAvailable, _1, config.credentialData()));