Cmake build: Start demanding at least version 5.1 if compiling with gcc

CMakeLists.txt

@@ -77,9 +77,10 @@ if(NOT help AND NOT HELP)
   # 'project' triggers the searching for a compiler
   project(${LYX_PROJECT})
   if (CMAKE_COMPILER_IS_GNUCXX)
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.9")
+    set(MIN_GCC_VERSION "5.1")
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${MIN_GCC_VERSION})
       message(STATUS "Gnu CXX compiler version = ${CMAKE_CXX_COMPILER_VERSION}")
-      message(STATUS "is too old, should be >= 4.9")
+      message(STATUS "is too old, should be >= ${MIN_GCC_VERSION}")
       message(FATAL_ERROR "Exiting")
     endif()
   endif()
@@ -658,7 +659,7 @@ else()
 	set(LYX_DEBUG ON)
 endif()
 
-set(min_qt5_version "5.6")
+set(min_qt5_version "5.12")
 if(LYX_USE_QT MATCHES "AUTO")
 	# try qt6 first
 	foreach(_mod Core Gui Widgets Concurrent Svg)

development/cmake/ConfigureChecks.cmake

@@ -185,19 +185,6 @@ else()
   LYX_CALLSTACK_PRINTING)
 endif()
 
-# Check whether STL is libstdc++
-check_cxx_source_compiles(
-	"
-	#include <vector>
-	int main() {
-	#if ! defined(__GLIBCXX__) && ! defined(__GLIBCPP__)
-		this is not libstdc++
-	#endif
-		return(0);
-	}
-	"
-lyx_cv_lib_stdcxx)
-
 # Check whether STL is libstdc++ with C++11 ABI
 check_cxx_source_compiles(
 	"
@@ -232,17 +219,6 @@ check_cxx_source_compiles(
   "
 HAVE_DEF_MAKE_UNIQUE)
 
-check_cxx_source_compiles(
-  "
-  #include <mutex>
-  static std::once_flag flag;
-  int main() {
-    std::call_once(flag, [](){ return; });
-    return(0);
-  }
-  "
-LYX_USE_STD_CALL_ONCE)
-
 if (ENCHANT_FOUND)
   set(CMAKE_REQUIRED_INCLUDES ${ENCHANT_INCLUDE_DIR})
   set(CMAKE_REQUIRED_LIBRARIES ${ENCHANT_LIBRARY})
@@ -261,19 +237,7 @@ if (ENCHANT_FOUND)
   endif()
 endif()
 
-set(USE_LLVM_LIBCPP)
-set(STD_STRING_USES_COW)
 set(USE_GLIBCXX_CXX11_ABI)
-if(lyx_cv_lib_stdcxx)
-  if(NOT USE_GLIBCXX_CXX11_ABI)
-    set(STD_STRING_USES_COW 1)
-  endif()
-else()
-  if(lyx_cv_prog_clang)
-    # use libc++ provided by llvm instead of GNU libstdc++
-    set(USE_LLVM_LIBCPP 1)
-  endif()
-endif()
 
 set(HAVE_QT5_X11_EXTRAS)
 set(HAVE_QT6_X11_EXTRAS)

development/cmake/config.h.cmake

@@ -53,12 +53,6 @@
 // Define if callstack can be printed
 #cmakedefine LYX_CALLSTACK_PRINTING 1
 
-// Define if std::string uses copy-on-write
-#cmakedefine STD_STRING_USES_COW 1
-
-// use libc++ provided by llvm instead of GNU libstdc++
-#cmakedefine USE_LLVM_LIBCPP 1
-
 // use GNU libstdc++ with C++11 ABI
 #cmakedefine USE_GLIBCXX_CXX11_ABI 1
 

development/cmake/modules/FindCXX11Compiler.cmake

@@ -38,7 +38,8 @@ INCLUDE(FindPackageHandleStandardArgs)
 # Detection of c++20 works well, but our code is not ready for it yet.
 # We currently get errors with internal boost and also from our code.
 set(_max_std_num 20)
-lyxgetknowncmakestd(${_max_std_num} tmpnums)
+set(_min_std_num 17)
+lyxgetknowncmakestd(${_max_std_num} ${_min_std_num} tmpnums)
 
 if (CMAKE_CXX_COMPILER_ID MATCHES "^([cC]lang|AppleClang)$")
   foreach(_num ${tmpnums})

development/cmake/modules/LyXMacros.cmake

@@ -468,12 +468,12 @@ function(determineversionandbuildtype configfile package version dirs date build
 endfunction(determineversionandbuildtype)
 
 # determine known cmake cxx_std features but only if not greater than ${max_desired}
-function(lyxgetknowncmakestd max_desired result)
+function(lyxgetknowncmakestd max_desired min_enabled result)
   set(tmp_list)
   set(CXX_STD_LIST)
   math(EXPR max_desired "${max_desired}+1")
   if (CMAKE_VERSION VERSION_LESS "3.9")
-    list(APPEND tmp_list 98 11 14)
+    list(APPEND tmp_list 14 17 20)
   else()
     foreach(_e ${CMAKE_CXX_COMPILE_FEATURES})
       if (_e MATCHES "^cxx_std_\(.*)")
@@ -484,7 +484,7 @@ function(lyxgetknowncmakestd max_desired result)
   list(REVERSE tmp_list)
   # Filter undesired from list
   foreach(i ${tmp_list})
-    if (i LESS ${max_desired} OR i GREATER 89)
+    if (i LESS ${max_desired} AND i GREATER_EQUAL ${min_enabled})
       list(APPEND CXX_STD_LIST ${i})
     endif()
   endforeach()

po/sk.po

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX-2.5\n"
 "Report-Msgid-Bugs-To: lyx-devel@lists.lyx.org\n"
-"POT-Creation-Date: 2024-10-16 09:55+0200\n"
-"PO-Revision-Date: 2024-10-16 07:58+0000\n"
+"POT-Creation-Date: 2024-10-24 11:49+0200\n"
+"PO-Revision-Date: 2024-10-24 10:00+0000\n"
 "Last-Translator: Kornel Benko <kornel@lyx.org>\n"
 "Language-Team: Slovak <kornel@lyx.org>\n"
 "Language: sk\n"
@@ -4485,10 +4485,10 @@ msgstr "&Primárna:"
 
 #: src/frontends/qt/ui/PrefInputUi.ui:101
 msgid ""
-"Mac OS X specific setting for use with emacs bindings. Takes effect next "
-"time LyX is launched."
+"macOS specific setting for use with emacs bindings. Takes effect next time "
+"LyX is launched."
 msgstr ""
-"Špeciálne nastavenia pre MAC OS X na používanie skratiek v emacs. Zmeny sa "
+"Špeciálne nastavenie pre macOS na používanie emacs-skratiek. Zmeny sa "
 "aktivujú pri nasledujúcom vyvolaní LyX-a."
 
 #: src/frontends/qt/ui/PrefInputUi.ui:104
@@ -30276,8 +30276,8 @@ msgid "Cannot edit file"
 msgstr "Nemôžem editovať súbor"
 
 #: src/Format.cpp:736
-msgid "LinkBack files can only be edited on Apple Mac OSX."
-msgstr "Súbory LinkBack je možné editovať len na Apple Mac OSX."
+msgid "LinkBack files can only be edited on macOS."
+msgstr "Súbory LinkBack je možné upravovať iba v systéme macOS."
 
 #: src/Format.cpp:749
 #, c-format
@@ -30894,9 +30894,9 @@ msgstr ""
 msgid "Make Apple key act as Meta and Control key as Ctrl."
 msgstr "Prehoď Apple klávesu na Meta a Kontrol klávesu na Ctrl."
 
-#: src/LyXRC.cpp:3202
-msgid "Use the Mac OS X conventions for cursor movement"
-msgstr "Použiť dohody Mac OS X pre pohyb kurzoru"
+#: src/LyXRC.cpp:3206
+msgid "Use the macOS conventions for cursor movement"
+msgstr "Na pohyb kurzora použite konvencie systému macOS"
 
 #: src/LyXRC.cpp:3206
 msgid ""