Merge branch 'macos-ci-fix' into 'master'

Macos ci fix

See merge request nheko-reborn/nheko!3

.ci/macos/Brewfile

@@ -1,12 +1,12 @@
 tap "nlohmann/json"
 
+brew "python3"
 brew "pkg-config"
 brew "clang-format"
 brew "cmake"
 brew "ninja"
 brew "openssl"
 brew "qt5"
-brew "python3"
 brew "nlohmann_json"
 brew "gstreamer"
 brew "gst-plugins-base"

.gitlab-ci.yml

@@ -52,7 +52,8 @@ build-macos:
   tags: [macos]
   before_script:
     - brew update
-    - brew bundle --file=./.ci/macos/Brewfile
+    - brew reinstall --force python3
+    - brew bundle --file=./.ci/macos/Brewfile --force --cleanup
     - pip3 install dmgbuild
   script:
     - export PATH=/usr/local/opt/qt/bin/:${PATH}

io.github.NhekoReborn.Nheko.json

@@ -125,16 +125,6 @@
         }
       ]
     },
-    {
-      "name": "sodium",
-      "sources": [
-        {
-          "sha256": "6f504490b342a4f8a4c4a02fc9b866cbef8622d5df4e5452b46be121e46636c1",
-          "type": "archive",
-          "url": "https://github.com/jedisct1/libsodium/releases/download/1.0.18-RELEASE/libsodium-1.0.18.tar.gz"
-        }
-      ]
-    },
     {
       "build-commands": [
         "./bootstrap.sh --with-libraries=thread,system,iostreams --prefix=/app",

src/LoginPage.cpp

@@ -315,14 +315,14 @@ LoginPage::checkHomeserverVersion()
                             if (err || flows.flows.empty())
                                     emit versionOkCb(LoginMethod::Password);
 
-                            LoginMethod loginMethod = LoginMethod::Password;
+                            LoginMethod loginMethod_ = LoginMethod::Password;
                             for (const auto &flow : flows.flows) {
                                     if (flow.type == mtx::user_interactive::auth_types::sso) {
-                                            loginMethod = LoginMethod::SSO;
+                                            loginMethod_ = LoginMethod::SSO;
                                             break;
                                     }
                             }
-                            emit versionOk(loginMethod);
+                            emit versionOk(loginMethod_);
                     });
           });
 }

src/UserSettingsPage.cpp

@@ -54,7 +54,7 @@ QSharedPointer<UserSettings> UserSettings::instance_;
 
 UserSettings::UserSettings()
 {
-        connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, [this]() {
+        connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, []() {
                 instance_.clear();
         });
 }