Merge pull request #47 from d99kris/tdlib-v1.7.9

fixes #46 - update to tdlib v1.7.9
d99kris · Dec 3, 2021 · 163aaed · 163aaed
2 parents a8745a6 + 092a66b
commit 163aaed
Show file tree

Hide file tree

Showing 948 changed files with 62,519 additions and 28,013 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Project
 cmake_minimum_required(VERSION 3.16 FATAL_ERROR) # 3.1 is ok, but is 3.16 needed for proper version string
-project(nchat VERSION 2.15 LANGUAGES CXX)
+project(nchat VERSION 2.16 LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 14)
 include(CheckCXXSourceCompiles)
 set(NCHAT_PROJECT_VERSION ${PROJECT_VERSION})

diff --git a/lib/tgchat/ext/td/.clang-format b/lib/tgchat/ext/td/.clang-format
@@ -92,7 +92,7 @@ PenaltyBreakString: 1000
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
-PointerAlignment: Left
+PointerAlignment: Right
 ReflowComments:  false # true
 SortIncludes: false # disabled, because we need case insensitive sort
 SortUsingDeclarations: false # true

diff --git a/lib/tgchat/ext/td/.gitattributes b/lib/tgchat/ext/td/.gitattributes
@@ -5,6 +5,7 @@
 *.h text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.c text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.tl text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
+*.mm text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.txt text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.sh text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent eol=lf
 *.php text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
@@ -18,6 +19,7 @@
 *.java text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.py text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.js text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
+*.patch text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.swift text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.pbxproj text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
 *.cs text whitespace=blank-at-eol,space-before-tab,blank-at-eof,tab-in-indent
@@ -32,7 +34,5 @@
 
 sqlite/sqlite/* linguist-vendored
 
-*.tlo binary
-
 *.pfx binary
 *.png binary
diff --git a/lib/tgchat/ext/td/CMake/TdSetUpCompiler.cmake b/lib/tgchat/ext/td/CMake/TdSetUpCompiler.cmake
@@ -5,6 +5,8 @@ function(td_set_up_compiler)
 
   set(CMAKE_POSITION_INDEPENDENT_CODE ON PARENT_SCOPE)
 
+  include(illumos)
+
   if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     set(GCC 1)
     set(GCC 1 PARENT_SCOPE)
@@ -40,11 +42,6 @@ function(td_set_up_compiler)
     message(FATAL_ERROR "No C++14 support in the compiler. Please upgrade the compiler.")
   endif()
 
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-
   if (MSVC)
     if (CMAKE_CXX_FLAGS_DEBUG MATCHES "/RTC1")
       string(REPLACE "/RTC1" " " CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
@@ -54,12 +51,21 @@ function(td_set_up_compiler)
   elseif (CLANG OR GCC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${STD14_FLAG} -fno-omit-frame-pointer -fno-exceptions -fno-rtti")
     if (APPLE)
-      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-dead_strip,-x,-S")
+      set(TD_LINKER_FLAGS "-Wl,-dead_strip")
+      if (NOT CMAKE_BUILD_TYPE MATCHES "Deb")
+        set(TD_LINKER_FLAGS "${TD_LINKER_FLAGS},-x,-S")
+      endif()
     else()
       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections")
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffunction-sections -fdata-sections")
-      set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--gc-sections -Wl,--exclude-libs,ALL")
+      if (CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+        set(TD_LINKER_FLAGS "-Wl,-z,ignore")
+      else()
+        set(TD_LINKER_FLAGS "-Wl,--gc-sections -Wl,--exclude-libs,ALL")
+      endif()
     endif()
+    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${TD_LINKER_FLAGS}")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${TD_LINKER_FLAGS}")
 
     if (WIN32 OR CYGWIN)
       if (GCC)
@@ -81,6 +87,13 @@ function(td_set_up_compiler)
     add_definitions(-D_FILE_OFFSET_BITS=64)
   endif()
 
+  if (CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lsocket -lnsl")
+    if (ILLUMOS)
+      add_definitions(-DTD_ILLUMOS=1)
+    endif()
+  endif()
+
   include(AddCXXCompilerFlag)
   if (NOT MSVC)
     add_cxx_compiler_flag("-Wall")
@@ -121,6 +134,10 @@ function(td_set_up_compiler)
   if (GCC AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0))
     add_cxx_compiler_flag("-Wno-maybe-uninitialized")  # too much false positives
   endif()
+  if (WIN32 AND GCC AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0))
+    # warns about casts of function pointers returned by GetProcAddress
+    add_cxx_compiler_flag("-Wno-cast-function-type")
+  endif()
   if (GCC AND NOT (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0))
     # warns about a lot of "return std::move", which are not redundant for compilers without fix for DR 1579, i.e. GCC 4.9 or clang 3.8
     # see http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#1579
@@ -141,5 +158,6 @@ function(td_set_up_compiler)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" PARENT_SCOPE)
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" PARENT_SCOPE)
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}" PARENT_SCOPE)
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}" PARENT_SCOPE)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}" PARENT_SCOPE)
 endfunction()
diff --git a/lib/tgchat/ext/td/CMake/iOS.cmake b/lib/tgchat/ext/td/CMake/iOS.cmake
@@ -48,9 +48,9 @@ endif (CMAKE_UNAME)
 # Force the compilers to gcc for iOS
 set (CMAKE_C_COMPILER /usr/bin/gcc)
 set (CMAKE_CXX_COMPILER /usr/bin/g++)
-set(CMAKE_AR ar CACHE FILEPATH "" FORCE)
-set(CMAKE_RANLIB ranlib CACHE FILEPATH "" FORCE)
-set(PKG_CONFIG_EXECUTABLE pkg-config CACHE FILEPATH "" FORCE)
+set (CMAKE_AR ar CACHE FILEPATH "" FORCE)
+set (CMAKE_RANLIB ranlib CACHE FILEPATH "" FORCE)
+set (PKG_CONFIG_EXECUTABLE pkg-config CACHE FILEPATH "" FORCE)
 
 # Setup iOS platform unless specified manually with IOS_PLATFORM
 if (NOT DEFINED IOS_PLATFORM)
@@ -195,15 +195,15 @@ set (CMAKE_OSX_SYSROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Sysroot used for iOS su
 if (IOS_PLATFORM STREQUAL "OS")
     set (IOS_ARCH "armv7;armv7s;arm64")
 elseif (IOS_PLATFORM STREQUAL "SIMULATOR")
-    set (IOS_ARCH "i386;x86_64")
+    set (IOS_ARCH "i386;x86_64;arm64")
 elseif (IOS_PLATFORM STREQUAL "WATCHOS")
-    set (IOS_ARCH "armv7k")
+    set (IOS_ARCH "armv7k;arm64_32")
 elseif (IOS_PLATFORM STREQUAL "WATCHSIMULATOR")
-    set (IOS_ARCH "i386")
+    set (IOS_ARCH "i386;x86_64;arm64")
 elseif (IOS_PLATFORM STREQUAL "TVOS")
     set (IOS_ARCH "arm64")
 elseif (IOS_PLATFORM STREQUAL "TVSIMULATOR")
-    set (IOS_ARCH "x86_64")
+    set (IOS_ARCH "x86_64;arm64")
 else()
     message (WARNING "Unknown IOS_PLATFORM=<${IOS_PLATFORM}>")
 endif()

diff --git a/lib/tgchat/ext/td/CMake/illumos.cmake b/lib/tgchat/ext/td/CMake/illumos.cmake
@@ -0,0 +1,10 @@
+if (CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+  #
+  # Determine if the host is running an illumos distribution:
+  #
+  execute_process(COMMAND /usr/bin/uname -o OUTPUT_VARIABLE UNAME_O OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  if (UNAME_O STREQUAL "illumos")
+    set(ILLUMOS 1)
+  endif()
+endif()