diff options
| -rw-r--r-- | .github/workflows/debug.yml | 1 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 1 | ||||
| -rw-r--r-- | src/core/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/ui/main_window/MainWindow.cpp | 4 | ||||
| -rw-r--r-- | third_party/CMakeLists.txt | 6 |
5 files changed, 14 insertions, 5 deletions
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index 28ed97a0..0030dea8 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -91,6 +91,7 @@ jobs: pacman --noconfirm -S --needed make texinfo mingw-w64-x86_64-libconfig mingw-w64-x86_64-boost automake pacman --noconfirm -S --needed mingw-w64-x86_64-qt5 libintl msys2-runtime-devel gettext-devel pacman --noconfirm -S --needed mingw-w64-x86_64-gpgme mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg + pacman --noconfirm -S --needed mingw-w64-x86_64-libarchive if: matrix.os == 'windows-latest' - name: Build GpgFrontend (Linux) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9c8fd1a0..6fe2bb1e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -99,6 +99,7 @@ jobs: pacman --noconfirm -S --needed make texinfo mingw-w64-x86_64-libconfig mingw-w64-x86_64-boost automake pacman --noconfirm -S --needed mingw-w64-x86_64-qt5 libintl msys2-runtime-devel gettext-devel pacman --noconfirm -S --needed mingw-w64-x86_64-gpgme mingw-w64-x86_64-ninja mingw-w64-x86_64-gnupg + pacman --noconfirm -S --needed mingw-w64-x86_64-libarchive if: matrix.os == 'windows-latest' - name: Build GpgFrontend (Linux) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 607119b4..0a81e5dc 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -46,7 +46,12 @@ target_link_libraries(gpgfrontend_core gpgme assuan gpg-error) # link openssl target_link_libraries(gpgfrontend_core OpenSSL::SSL OpenSSL::Crypto) # link libarchive -target_link_libraries(gpgfrontend_core archive_static) +if (MINGW) + find_library(LIBARCHIVE_LIB libarchive.a) + target_link_libraries(gpgfrontend_core ${LIBARCHIVE_LIB}) +else () + target_link_libraries(gpgfrontend_core archive_static) +endif () # link json target_link_libraries(gpgfrontend_core nlohmann_json::nlohmann_json) diff --git a/src/ui/main_window/MainWindow.cpp b/src/ui/main_window/MainWindow.cpp index ee5c1c2c..18b40f78 100644 --- a/src/ui/main_window/MainWindow.cpp +++ b/src/ui/main_window/MainWindow.cpp @@ -126,8 +126,8 @@ void MainWindow::init() noexcept { connect(version_thread, &VersionCheckThread::finished, version_thread, &VersionCheckThread::deleteLater); - connect(version_thread, &VersionCheckThread::upgradeVersion, this, - &MainWindow::slotVersionUpgrade); + connect(version_thread, &VersionCheckThread::SignalUpgradeVersion, this, + &MainWindow::slot_version_upgrade); version_thread->start(); #endif diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index 138c649d..2ef5d898 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -206,5 +206,7 @@ aux_source_directory(./encoding-detect ENCODING_DETECT_SOURCE_CODE) add_library(encoding_detect STATIC ${ENCODING_DETECT_SOURCE_CODE}) # libarchive -remove_definitions(-DDEBUG) -add_subdirectory(libarchive)
\ No newline at end of file +if (NOT MINGW) + remove_definitions(-DDEBUG) + add_subdirectory(libarchive) +endif ()
\ No newline at end of file |