From 03d817d2770d2238cc84042742755f81e0a6dd8c Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Wed, 6 Jan 2021 09:51:41 +0100 Subject: [PATCH 1/4] Force override macos deps in CI --- .ci/macos/Brewfile | 2 +- .gitlab-ci.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.ci/macos/Brewfile b/.ci/macos/Brewfile index 7e9687c7..e7a62374 100644 --- a/.ci/macos/Brewfile +++ b/.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" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a6775db..4fa41d37 100644 --- a/.gitlab-ci.yml +++ b/.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} From 0c0c69074df71187ec857dbad119fbdefa655501 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Wed, 6 Jan 2021 11:01:41 +0100 Subject: [PATCH 2/4] Fix shadowing in LoginPage.cpp --- src/LoginPage.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp index 39d0f9d6..dba5ba51 100644 --- a/src/LoginPage.cpp +++ b/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_); }); }); } From f3b6e994d00d2f63fcc8ad2903da6a67c5d122e5 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Wed, 6 Jan 2021 11:24:35 +0100 Subject: [PATCH 3/4] Remove useless capture --- src/UserSettingsPage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index 4ca3be49..7c7ef9ab 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -54,7 +54,7 @@ QSharedPointer UserSettings::instance_; UserSettings::UserSettings() { - connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, [this]() { + connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, []() { instance_.clear(); }); } From 4ead72fdc1155100630a3181bc66eb12b65c6742 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Wed, 6 Jan 2021 12:47:13 +0100 Subject: [PATCH 4/4] Remove sodium from flatpak --- io.github.NhekoReborn.Nheko.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/io.github.NhekoReborn.Nheko.json b/io.github.NhekoReborn.Nheko.json index 49e92311..7aba130b 100644 --- a/io.github.NhekoReborn.Nheko.json +++ b/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",