From 0eb59306f2edf372f9e67a43e203b3a7018e0926 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Tue, 20 Dec 2022 18:04:40 +0100 Subject: [PATCH 1/3] Update qtkeychain to `e5b070831cf1ea3cb98c95f97fcb7439f8d79bd6` --- lib/qtkeychain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/qtkeychain b/lib/qtkeychain index de954627363..e5b070831cf 160000 --- a/lib/qtkeychain +++ b/lib/qtkeychain @@ -1 +1 @@ -Subproject commit de954627363b0b4bff9a2616f1a409b7e14d5df9 +Subproject commit e5b070831cf1ea3cb98c95f97fcb7439f8d79bd6 From 6bddcf86deb802f638be28310d2a96996164cede Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Tue, 20 Dec 2022 18:31:05 +0100 Subject: [PATCH 2/3] FreeBSD/Cirrus - use system qtkeychain --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 2eb42f69746..86bd5955e6e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -9,5 +9,5 @@ task: git submodule update mkdir build cd build - cmake CMAKE_C_COMPILER="cc" -DCMAKE_CXX_COMPILER="c++" -DCMAKE_C_FLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " -DCMAKE_CXX_FLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " -DLINK_OPTIONS="-fstack-protector-strong" -DCMAKE_INSTALL_PREFIX="/usr/local" -DCMAKE_BUILD_TYPE="release" .. + cmake CMAKE_C_COMPILER="cc" -DCMAKE_CXX_COMPILER="c++" -DCMAKE_C_FLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " -DCMAKE_CXX_FLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " -DLINK_OPTIONS="-fstack-protector-strong" -DCMAKE_INSTALL_PREFIX="/usr/local" -DUSE_SYSTEM_QTKEYCHAIN="ON" -DCMAKE_BUILD_TYPE="release" .. make -j $(getconf _NPROCESSORS_ONLN) From 8db156094cb88947796d26eaedcd6cc5daeeefd3 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Tue, 20 Dec 2022 19:04:36 +0100 Subject: [PATCH 3/3] Set BUILD_SHARED_LIBS to OFF globally --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e985ad29e3..c9e5688713f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,7 @@ option(BUILD_WITH_QTKEYCHAIN "Build Chatterino with support for your system key option(USE_PRECOMPILED_HEADERS "Use precompiled headers" ON) option(BUILD_WITH_QT6 "Use Qt6 instead of default Qt5" OFF) option(CHATTERINO_GENERATE_COVERAGE "Generate coverage files" OFF) +option(BUILD_SHARED_LIBS "" OFF) option(USE_CONAN "Use conan" OFF) @@ -84,7 +85,6 @@ endif() if (BUILD_WITH_QTKEYCHAIN) # Link QtKeychain statically - option(QTKEYCHAIN_STATIC "" ON) if (USE_SYSTEM_QTKEYCHAIN) find_package(Qt${MAJOR_QT_VERSION}Keychain REQUIRED) else()