From 41de6427f2297fa59b3326f85072c000d317b3e9 Mon Sep 17 00:00:00 2001 From: Toni Date: Wed, 18 Mar 2026 17:30:03 +0100 Subject: [PATCH] add macos build instructions --- .clang-tidy | 2 +- .gitignore | 2 +- README.md | 19 ++++++++++++++----- src/mainwindow.cc | 2 +- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index c1ce8d6..377737c 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1 +1 @@ -Checks: '*,clang-analyzer-*,-llvmlibc-*,-fuchsia-*,-altera-*,-abseil-*,-android-*,-modernize-use-trailing-return-type,-readability-identifier-length,-*-readability-todo,-*-magic-numbers,-readability-function-cognitive-complexity,-*-easily-swappable-parameters,-*-pro-type-reinterpret-cast,-*-owning-memory,-concurrency-mt-unsafe,-cert-env33-c,-*-avoid-do-while' \ No newline at end of file +Checks: '*,clang-analyzer-*,-llvmlibc-*,-fuchsia-*,-altera-*,-abseil-*,-android-*,-modernize-use-trailing-return-type,-readability-identifier-length,-*-readability-todo,-*-magic-numbers,-readability-function-cognitive-complexity,-*-easily-swappable-parameters,-*-pro-type-reinterpret-cast,-*-owning-memory,-concurrency-mt-unsafe,-cert-env33-c,-*-avoid-do-while' diff --git a/.gitignore b/.gitignore index 4224ab8..88fb94a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ /.cache /build *.py -*.dull \ No newline at end of file +*.dull diff --git a/README.md b/README.md index a98233b..b4a096b 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,11 @@ Desktop app for securely storing sensitive files ## Building -### Debian/Ubuntu +### Debian ``` sudo apt update && sudo apt install build-essential qt6-base-dev libbotan-3-dev cmake -cmake -S . -B build +cmake -B build cmake --build build -j $(nproc) ./build/dull ``` @@ -23,7 +23,16 @@ cmake --build build -j $(nproc) ``` sudo pacman -Syu base-devel cmake qt6-base botan -cmake -S . -B build +cmake -B build +cmake --build build -j $(nproc) +./build/dull +``` + +### MacOS +``` +brew install qtbase cmake pkg-config botan + +cmake -B build cmake --build build -j $(nproc) ./build/dull ``` @@ -32,7 +41,7 @@ cmake --build build -j $(nproc) ``` pacman -S --needed mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake mingw-w64-x86_64-ninja mingw-w64-x86_64-qt6-base mingw-w64-x86_64-qt6-tools mingw-w64-x86_64-libbotan -cmake -S . -B build -DBOTAN_INCLUDE_DIRS=/mingw64/include/botan-3 -DBOTAN_LIBRARIES=/mingw64/lib/libbotan-3.a +cmake -B build -DBOTAN_INCLUDE_DIRS=/mingw64/include/botan-3 -DBOTAN_LIBRARIES=/mingw64/lib/libbotan-3.a cmake --build build -j $(nproc) ./build/dull -``` \ No newline at end of file +``` diff --git a/src/mainwindow.cc b/src/mainwindow.cc index 8325e2c..88681ff 100644 --- a/src/mainwindow.cc +++ b/src/mainwindow.cc @@ -90,7 +90,7 @@ MainWindow::MainWindow(QWidget *parent) std::make_unique(path.toStdString(), password.toStdString()); reload_fs_tree(); ui->statusbar->clearMessage(); - } catch (const Botan::Invalid_Authentication_Tag &e) { + } catch (const Botan::Exception &e) { QMessageBox::critical(this, "Error", "Invalid password."); ui->statusbar->clearMessage(); return;