diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 6867349b..f05acf60 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -74,6 +74,14 @@ set_target_properties(${BINARY_NAME} # them to the application. include(flutter/generated_plugins.cmake) +# Work around tinycthread/glibc 2.43+ conflict: glibc 2.43 (with Clang 21's +# C23 default) exports once_flag from stdlib.h bt tinycthread in flserial +# defines once_flag as a preprocessor macro, causing a typedef clash. +# __STDC_NO_THREADS__ suppresses the C23 once_flag declaration in glibc stdlib.h. +if(TARGET flserial) + target_compile_definitions(flserial PRIVATE __STDC_NO_THREADS__) +endif() + # === Installation === # By default, "installing" just makes a relocatable bundle in the build diff --git a/untranslated.json b/untranslated.json index 88cbcd72..23c15af0 100644 --- a/untranslated.json +++ b/untranslated.json @@ -90,8 +90,6 @@ "ru": [ "settings_companionDebugLog", "settings_companionDebugLogSubtitle", - "chat_markAsUnread", - "chat_newMessages", "repeater_chanUtil" ],