diff options
Diffstat (limited to 'net-im/tdlib/files')
-rw-r--r-- | net-im/tdlib/files/patch-CMakeLists.txt | 92 | ||||
-rw-r--r-- | net-im/tdlib/files/patch-CMake_GetGitRevisionDescription.cmake | 2 | ||||
-rw-r--r-- | net-im/tdlib/files/patch-sqlite_CMakeLists.txt | 11 | ||||
-rw-r--r-- | net-im/tdlib/files/patch-tdactor_CMakeLists.txt | 11 | ||||
-rw-r--r-- | net-im/tdlib/files/patch-tddb_CMakeLists.txt | 11 | ||||
-rw-r--r-- | net-im/tdlib/files/patch-tde2e_CMakeLists.txt | 17 | ||||
-rw-r--r-- | net-im/tdlib/files/patch-tdnet_CMakeLists.txt | 11 | ||||
-rw-r--r-- | net-im/tdlib/files/patch-tdtl_CMakeLists.txt | 9 | ||||
-rw-r--r-- | net-im/tdlib/files/patch-tdutils_CMakeLists.txt | 19 | ||||
-rw-r--r-- | net-im/tdlib/files/patch-test_CMakeLists.txt | 11 |
10 files changed, 175 insertions, 19 deletions
diff --git a/net-im/tdlib/files/patch-CMakeLists.txt b/net-im/tdlib/files/patch-CMakeLists.txt index ace0aa6c9837..989c6940d4d3 100644 --- a/net-im/tdlib/files/patch-CMakeLists.txt +++ b/net-im/tdlib/files/patch-CMakeLists.txt @@ -9,3 +9,95 @@ add_subdirectory(benchmark) endif() +@@ -1148,7 +1148,7 @@ set(MEMPROF_STAT_SOURCE + # LIBRARIES + + # memprof - simple library for memory usage profiling +-add_library(memprof STATIC ${MEMPROF_SOURCE}) ++add_library(memprof ${MEMPROF_SOURCE}) + target_include_directories(memprof PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>) + target_link_libraries(memprof PRIVATE tdutils) + if (MEMPROF) +@@ -1162,12 +1162,12 @@ endif() + endif() + endif() + +-add_library(memprof_stat EXCLUDE_FROM_ALL STATIC ${MEMPROF_STAT_SOURCE}) ++add_library(memprof_stat EXCLUDE_FROM_ALL ${MEMPROF_STAT_SOURCE}) + target_include_directories(memprof_stat PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>) + target_link_libraries(memprof_stat PRIVATE tdutils) + + +-add_library(tdapi STATIC ${TL_TD_API_SOURCE}) ++add_library(tdapi ${TL_TD_API_SOURCE}) + target_include_directories(tdapi PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> INTERFACE $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>) + target_link_libraries(tdapi PRIVATE tdutils) + +@@ -1184,7 +1184,7 @@ endif() + add_dependencies(tdapi tl_generate_common) + endif() + +-add_library(tdmtproto STATIC ${TD_MTPROTO_SOURCE}) ++add_library(tdmtproto ${TD_MTPROTO_SOURCE}) + target_include_directories(tdmtproto PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>) + target_include_directories(tdmtproto SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR}) + target_link_libraries(tdmtproto PUBLIC tdactor tdnet tdutils PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES}) +@@ -1201,11 +1201,11 @@ if (MSVC AND TD_ENABLE_LTO) + + # tdcore - internal TDLib interface + if (MSVC AND TD_ENABLE_LTO) +- add_library(tdcore_part1 STATIC ${TDLIB_SOURCE_PART1}) ++ add_library(tdcore_part1 ${TDLIB_SOURCE_PART1}) + target_include_directories(tdcore_part1 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>) + target_link_libraries(tdcore_part1 PUBLIC tdapi tdnet tddb tdactor tde2e tdutils PRIVATE tdmtproto) + +- add_library(tdcore_part2 STATIC ${TDLIB_SOURCE_PART2}) ++ add_library(tdcore_part2 ${TDLIB_SOURCE_PART2}) + target_include_directories(tdcore_part2 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>) + target_link_libraries(tdcore_part2 PUBLIC tdapi tdnet tddb tdactor tde2e tdutils PRIVATE tdmtproto) + +@@ -1214,7 +1214,7 @@ else() + + set(TD_CORE_PART_TARGETS tdcore_part1 tdcore_part2) + else() +- add_library(tdcore STATIC ${TDLIB_SOURCE}) ++ add_library(tdcore ${TDLIB_SOURCE}) + target_include_directories(tdcore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>) + target_link_libraries(tdcore PUBLIC tdapi tdnet tddb tdactor tde2e tdutils PRIVATE tdmtproto) + +@@ -1231,7 +1231,7 @@ endif() + endif() + endif() + +-add_library(tdclient STATIC td/telegram/Client.cpp td/telegram/Client.h td/telegram/Log.cpp td/telegram/Log.h) ++add_library(tdclient td/telegram/Client.cpp td/telegram/Client.h td/telegram/Log.cpp td/telegram/Log.h) + target_include_directories(tdclient PUBLIC + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> + ) +@@ -1263,7 +1263,7 @@ endif() + endif() + + # tdc - TDLib interface in pure C +-add_library(tdc STATIC EXCLUDE_FROM_ALL ${TL_C_SCHEME_SOURCE} td/telegram/td_c_client.cpp td/telegram/td_c_client.h) ++add_library(tdc EXCLUDE_FROM_ALL ${TL_C_SCHEME_SOURCE} td/telegram/td_c_client.cpp td/telegram/td_c_client.h) + target_include_directories(tdc PUBLIC + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> + $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>) +@@ -1272,7 +1272,7 @@ endif() + add_dependencies(tdc tl_generate_c) + endif() + +-add_library(tdjson_private STATIC ${TL_TD_JSON_SOURCE} td/telegram/ClientJson.cpp td/telegram/ClientJson.h) ++add_library(tdjson_private ${TL_TD_JSON_SOURCE} td/telegram/ClientJson.cpp td/telegram/ClientJson.h) + target_include_directories(tdjson_private PUBLIC + $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> + $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>) +@@ -1299,7 +1299,7 @@ endif() + set_target_properties(tdjson PROPERTIES LINK_FLAGS "-Wl,-exported_symbols_list,${CMAKE_CURRENT_SOURCE_DIR}/tdclientjson_export_list") + endif() + +-add_library(tdjson_static STATIC ${TD_JSON_SOURCE} ${TD_JSON_HEADERS}) ++add_library(tdjson_static ${TD_JSON_SOURCE} ${TD_JSON_HEADERS}) + target_link_libraries(tdjson_static PRIVATE tdjson_private) + target_compile_definitions(tdjson_static PUBLIC TDJSON_STATIC_DEFINE) + target_include_directories(tdjson_static PUBLIC diff --git a/net-im/tdlib/files/patch-CMake_GetGitRevisionDescription.cmake b/net-im/tdlib/files/patch-CMake_GetGitRevisionDescription.cmake index cf442232b657..f35b6961cc68 100644 --- a/net-im/tdlib/files/patch-CMake_GetGitRevisionDescription.cmake +++ b/net-im/tdlib/files/patch-CMake_GetGitRevisionDescription.cmake @@ -5,7 +5,7 @@ if (GIT_DIR STREQUAL "") set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE) - set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE) -+ set(${_hashvar} "%%COMMIT%%" PARENT_SCOPE) ++ set(${_hashvar} "b8b08b0" PARENT_SCOPE) return() endif() diff --git a/net-im/tdlib/files/patch-sqlite_CMakeLists.txt b/net-im/tdlib/files/patch-sqlite_CMakeLists.txt new file mode 100644 index 000000000000..d6db21f5bb35 --- /dev/null +++ b/net-im/tdlib/files/patch-sqlite_CMakeLists.txt @@ -0,0 +1,11 @@ +--- sqlite/CMakeLists.txt.orig 2025-05-09 16:44:31 UTC ++++ sqlite/CMakeLists.txt +@@ -23,7 +23,7 @@ set(SQLITE_SOURCE + + # all SQLite functions are moved to namespace tdsqlite3 by `sed -Ebi 's/sqlite3([^.]|$)/td&/g' *` + +-add_library(tdsqlite STATIC ${SQLITE_SOURCE}) ++add_library(tdsqlite ${SQLITE_SOURCE}) + target_include_directories(tdsqlite PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>) + target_include_directories(tdsqlite SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR}) + target_link_libraries(tdsqlite PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES}) diff --git a/net-im/tdlib/files/patch-tdactor_CMakeLists.txt b/net-im/tdlib/files/patch-tdactor_CMakeLists.txt new file mode 100644 index 000000000000..7894a1a863c2 --- /dev/null +++ b/net-im/tdlib/files/patch-tdactor_CMakeLists.txt @@ -0,0 +1,11 @@ +--- tdactor/CMakeLists.txt.orig 2025-05-09 16:50:48 UTC ++++ tdactor/CMakeLists.txt +@@ -44,7 +44,7 @@ set(TDACTOR_TEST_SOURCE + PARENT_SCOPE + ) + +-add_library(tdactor STATIC ${TDACTOR_SOURCE}) ++add_library(tdactor ${TDACTOR_SOURCE}) + target_include_directories(tdactor PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>) + target_link_libraries(tdactor PUBLIC tdutils) + diff --git a/net-im/tdlib/files/patch-tddb_CMakeLists.txt b/net-im/tdlib/files/patch-tddb_CMakeLists.txt new file mode 100644 index 000000000000..e42b54861319 --- /dev/null +++ b/net-im/tdlib/files/patch-tddb_CMakeLists.txt @@ -0,0 +1,11 @@ +--- tddb/CMakeLists.txt.orig 2025-05-09 16:50:17 UTC ++++ tddb/CMakeLists.txt +@@ -48,7 +48,7 @@ set(TDDB_SOURCE + td/db/detail/RawSqliteDb.h + ) + +-add_library(tddb STATIC ${TDDB_SOURCE}) ++add_library(tddb ${TDDB_SOURCE}) + target_include_directories(tddb PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>) + target_link_libraries(tddb PUBLIC tdactor tdutils PRIVATE tdsqlite) + diff --git a/net-im/tdlib/files/patch-tde2e_CMakeLists.txt b/net-im/tdlib/files/patch-tde2e_CMakeLists.txt index 8dc1e7c1fb01..7a9d1238ff0a 100644 --- a/net-im/tdlib/files/patch-tde2e_CMakeLists.txt +++ b/net-im/tdlib/files/patch-tde2e_CMakeLists.txt @@ -1,10 +1,11 @@ ---- tde2e/CMakeLists.txt.orig 2025-04-30 22:25:21 UTC +--- tde2e/CMakeLists.txt.orig 2025-05-09 16:51:07 UTC +++ tde2e/CMakeLists.txt -@@ -83,4 +83,7 @@ if (TDE2E_ENABLE_INSTALL) - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" - ) -+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/td -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -+ FILES_MATCHING PATTERN "*.h") +@@ -62,7 +62,7 @@ set(TDE2E_TEST_SOURCE "${TDE2E_TEST_SOURCE}" PARENT_SC + + set(TDE2E_TEST_SOURCE "${TDE2E_TEST_SOURCE}" PARENT_SCOPE) + +-add_library(tde2e STATIC ${TDE2E_SOURCE}) ++add_library(tde2e ${TDE2E_SOURCE}) + if (NOT CMAKE_CROSSCOMPILING) + add_dependencies(tde2e tl_generate_common) endif() diff --git a/net-im/tdlib/files/patch-tdnet_CMakeLists.txt b/net-im/tdlib/files/patch-tdnet_CMakeLists.txt new file mode 100644 index 000000000000..3ff722cf12f0 --- /dev/null +++ b/net-im/tdlib/files/patch-tdnet_CMakeLists.txt @@ -0,0 +1,11 @@ +--- tdnet/CMakeLists.txt.orig 2025-05-09 16:51:47 UTC ++++ tdnet/CMakeLists.txt +@@ -60,7 +60,7 @@ endif() + set_source_files_properties(td/net/DarwinHttp.mm PROPERTIES COMPILE_FLAGS -fobjc-arc) + endif() + +-add_library(tdnet STATIC ${TDNET_SOURCE}) ++add_library(tdnet ${TDNET_SOURCE}) + target_include_directories(tdnet PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>) + target_include_directories(tdnet SYSTEM PRIVATE $<BUILD_INTERFACE:${OPENSSL_INCLUDE_DIR}>) + target_link_libraries(tdnet PUBLIC tdutils tdactor) diff --git a/net-im/tdlib/files/patch-tdtl_CMakeLists.txt b/net-im/tdlib/files/patch-tdtl_CMakeLists.txt new file mode 100644 index 000000000000..bd6135a15438 --- /dev/null +++ b/net-im/tdlib/files/patch-tdtl_CMakeLists.txt @@ -0,0 +1,9 @@ +--- tdtl/CMakeLists.txt.orig 2025-05-09 16:52:10 UTC ++++ tdtl/CMakeLists.txt +@@ -24,5 +24,5 @@ set(TDTL_SOURCE + td/tl/tl_writer.h + ) + +-add_library(tdtl STATIC ${TDTL_SOURCE}) ++add_library(tdtl ${TDTL_SOURCE}) + target_include_directories(tdtl PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>) diff --git a/net-im/tdlib/files/patch-tdutils_CMakeLists.txt b/net-im/tdlib/files/patch-tdutils_CMakeLists.txt index bea6582773bf..60e62535b6d3 100644 --- a/net-im/tdlib/files/patch-tdutils_CMakeLists.txt +++ b/net-im/tdlib/files/patch-tdutils_CMakeLists.txt @@ -1,12 +1,11 @@ ---- tdutils/CMakeLists.txt.orig 2025-04-30 22:25:21 UTC +--- tdutils/CMakeLists.txt.orig 2025-05-09 16:51:24 UTC +++ tdutils/CMakeLists.txt -@@ -416,6 +416,9 @@ if (TDUTILS_ENABLE_INSTALL) - LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" - ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" - ) -+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/td -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -+ FILES_MATCHING PATTERN "*.h") - endif() +@@ -351,7 +351,7 @@ set(TDUTILS_TEST_SOURCE + PARENT_SCOPE + ) - if (TD_TEST_FOLLY AND ABSL_FOUND AND TDUTILS_USE_EXTERNAL_DEPENDENCIES) +-add_library(tdutils STATIC ${TDUTILS_SOURCE}) ++add_library(tdutils ${TDUTILS_SOURCE}) + + if (NOT CMAKE_CROSSCOMPILING AND TDUTILS_MIME_TYPE) + add_dependencies(tdutils tdmime_auto) diff --git a/net-im/tdlib/files/patch-test_CMakeLists.txt b/net-im/tdlib/files/patch-test_CMakeLists.txt new file mode 100644 index 000000000000..bc5db0338a3e --- /dev/null +++ b/net-im/tdlib/files/patch-test_CMakeLists.txt @@ -0,0 +1,11 @@ +--- test/CMakeLists.txt.orig 2025-05-09 17:43:17 UTC ++++ test/CMakeLists.txt +@@ -61,7 +61,7 @@ if (NOT CMAKE_CROSSCOMPILING OR EMSCRIPTEN) + target_include_directories(run_all_tests PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>) + target_include_directories(test-tdutils PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>) + target_link_libraries(test-tdutils PRIVATE tdutils) +- target_link_libraries(run_all_tests PRIVATE tdcore tdclient) ++ target_link_libraries(run_all_tests PRIVATE tdcore tdclient tdmtproto) + target_link_libraries(test-online PRIVATE tdcore tdjson_private tdclient tdutils tdactor) + + if (CLANG) |