Skip to content

Some Linux build fixes #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CreativeCylon wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Some Linux build fixes #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5a0bb9d
Fix missing include leading to build error
CreativeCylon May 29, 2026
2ad01b5
Only patch `libicudata.so.70` when needed
CreativeCylon May 29, 2026
a9986c2
Avoid deprecated `CheckBoxWidget::stateChanged`
CreativeCylon May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions cmake/devtools_qt_helper.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,20 @@ if (Qt6_DIR)
get_target_property(_qmake_executable Qt::qmake IMPORTED_LOCATION)
get_filename_component(_qt_bin_dir "${_qmake_executable}" DIRECTORY)

if (LINUX)
get_target_property(_qt_core_lib Qt6::Core IMPORTED_LOCATION)
if(_qt_core_lib)
execute_process(
COMMAND readelf -d ${_qt_core_lib}
OUTPUT_VARIABLE _qt_core_needed
ERROR_QUIET
)
if(NOT _qt_core_needed MATCHES "libicui18n")
set(ICU_DATA_NEEDS_PATCHING TRUE)
endif()
endif()
endif()

function(deploy_qt_build target)
if (WIN32)
find_program(DEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}")
Expand All @@ -41,8 +55,8 @@ if (Qt6_DIR)
)
endif ()

# Ensure that libicudata.so.70 is added as an explicit dependency of Qt based targets so that it gets deployed
if (LINUX)
if (ICU_DATA_NEEDS_PATCHING)
message(WARNING "Qt6Core does not link libicudata. Manually adding libicudata.so.70.")
add_custom_command(TARGET ${target} POST_BUILD COMMAND patchelf --add-needed libicudata.so.70 $<TARGET_FILE:${target}>)

@CreativeCylon CreativeCylon May 29, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can get rid of the patchelf fully. Not sure why this was needed.

endif ()

Expand Down
1 change: 1 addition & 0 deletions source/backend/rmt_mutex.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//=============================================================================

#ifndef _WIN32
#include <new>
#include <mutex>
#endif // #ifndef _WIN32

Expand Down
9 changes: 8 additions & 1 deletion source/frontend/views/settings/settings_pane.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,14 @@ SettingsPane::SettingsPane(QWidget* parent)
ui_->byte_units_combo_push_button_->SetSelectedRow(0);
connect(ui_->byte_units_combo_push_button_, &ArrowIconComboBox::SelectionChanged, this, &SettingsPane::ByteUnitsChanged);

connect(ui_->check_for_updates_on_startup_checkbox_, &CheckBoxWidget::stateChanged, this, &SettingsPane::CheckForUpdatesOnStartupStateChanged);
const auto state_change_function =
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
&CheckBoxWidget::checkStateChanged;
#else
&CheckBoxWidget::stateChanged;
#endif

connect(ui_->check_for_updates_on_startup_checkbox_, state_change_function, this, &SettingsPane::CheckForUpdatesOnStartupStateChanged);
}

SettingsPane::~SettingsPane()
Expand Down