Github messages for voidlinux
 help / color / Atom feed
* [PR PATCH] New package: libtd-1.6.0
@ 2020-07-19  5:32 sirikid
  2020-07-19  7:42 ` [PR PATCH] [Updated] " sirikid
                   ` (26 more replies)
  0 siblings, 27 replies; 28+ messages in thread
From: sirikid @ 2020-07-19  5:32 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 378 bytes --]

There is a new pull request by sirikid against master on the void-packages repository

https://github.com/sirikid/void-packages package/libtd
https://github.com/void-linux/void-packages/pull/23645

New package: libtd-1.6.0
Pretty ugly patch, but their cross compilation is super cursed.

A patch file from https://github.com/void-linux/void-packages/pull/23645.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/libtd-23645.patch --]
[-- Type: text/x-diff, Size: 6791 bytes --]

From 3ed295a14acafb8e852cdace53e9d84f5f5238c4 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Thu, 16 Jul 2020 14:03:58 +0300
Subject: [PATCH] New package: libtd-1.6.0

---
 common/shlibs                               |   1 +
 srcpkgs/libtd-devel                         |   1 +
 srcpkgs/libtd/patches/cross-compiling.patch | 122 ++++++++++++++++++++
 srcpkgs/libtd/template                      |  29 +++++
 4 files changed, 153 insertions(+)
 create mode 120000 srcpkgs/libtd-devel
 create mode 100644 srcpkgs/libtd/patches/cross-compiling.patch
 create mode 100644 srcpkgs/libtd/template

diff --git a/common/shlibs b/common/shlibs
index 42bb0996d24..df4341bcabc 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3979,3 +3979,4 @@ libtexluajit.so.2 texlive-LuaTeX-20200406_1
 libtexlua53.so.5 texlive-LuaTeX-20200406_1
 libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
+libtdjson.so.1.6.0 libtd-1.6.0_1
diff --git a/srcpkgs/libtd-devel b/srcpkgs/libtd-devel
new file mode 120000
index 00000000000..ee1a79b2bad
--- /dev/null
+++ b/srcpkgs/libtd-devel
@@ -0,0 +1 @@
+libtd
\ No newline at end of file
diff --git a/srcpkgs/libtd/patches/cross-compiling.patch b/srcpkgs/libtd/patches/cross-compiling.patch
new file mode 100644
index 00000000000..f7290089ef1
--- /dev/null
+++ b/srcpkgs/libtd/patches/cross-compiling.patch
@@ -0,0 +1,122 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ecf31c4a..c070b3da 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -261,7 +261,7 @@ add_subdirectory(tdutils)
+ 
+ add_subdirectory(td/generate)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_custom_target(prepare_cross_compiling DEPENDS tl_generate_common tdmime_auto tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_custom_target(remove_cpp_documentation
+@@ -760,7 +760,7 @@ if (TD_ENABLE_JNI AND NOT ANDROID) # jni is available by default on Android
+   target_link_libraries(tdcore PUBLIC ${JAVA_JVM_LIBRARY})
+ endif()
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdcore tl_generate_common)
+   if (TD_ENABLE_JNI)
+     add_dependencies(tdcore td_generate_java_api)
+@@ -794,7 +794,7 @@ if (TD_ENABLE_DOTNET)
+   target_include_directories(tddotnet PUBLIC
+     $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>
+   )
+-  if (NOT CMAKE_CROSSCOMPILING)
++  if (YES)
+     add_dependencies(tddotnet generate_dotnet_api)
+   endif()
+ 
+@@ -814,7 +814,7 @@ target_include_directories(tdc PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdc PRIVATE tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdc tl_generate_c)
+ endif()
+ 
+@@ -823,7 +823,7 @@ target_include_directories(tdjson_private PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdjson_private PUBLIC tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdjson_private tl_generate_common tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_dependencies(tdjson_private remove_cpp_documentation)
+@@ -879,7 +879,7 @@ if (EMSCRIPTEN)
+ endif()
+ 
+ #EXECUTABLES
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(tg_cli td/telegram/cli.cpp ${TL_TD_JSON})
+ 
+   if (NOT READLINE_FOUND)
+diff --git a/td/generate/CMakeLists.txt b/td/generate/CMakeLists.txt
+index a3f52b6c..0a386ed4 100644
+--- a/td/generate/CMakeLists.txt
++++ b/td/generate/CMakeLists.txt
+@@ -89,7 +89,7 @@ set(TL_GENERATE_JSON_SOURCE
+   tl_json_converter.h
+ )
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(PHP_EXECUTABLE php)
+ 
+   if (PHP_EXECUTABLE AND NOT TD_ENABLE_DOTNET)
+diff --git a/tddb/CMakeLists.txt b/tddb/CMakeLists.txt
+index 9a80b6cf..8cc9b0f5 100644
+--- a/tddb/CMakeLists.txt
++++ b/tddb/CMakeLists.txt
+@@ -48,7 +48,7 @@ add_library(tddb STATIC ${TDDB_SOURCE})
+ target_include_directories(tddb PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+ target_link_libraries(tddb PUBLIC tdactor tdutils PRIVATE tdsqlite)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(binlog_dump td/db/binlog/binlog_dump.cpp)
+   target_link_libraries(binlog_dump PRIVATE tddb)
+ endif()
+diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
+index d57d93c8..89c1a21c 100644
+--- a/tdutils/CMakeLists.txt
++++ b/tdutils/CMakeLists.txt
+@@ -291,7 +291,7 @@ if (WIN32)
+   # target_link_libraries(tdutils PRIVATE ${WS2_32_LIBRARY} ${MSWSOCK_LIBRARY})
+   target_link_libraries(tdutils PRIVATE ws2_32 Mswsock Normaliz)
+ endif()
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdutils tdmime_auto)
+ endif()
+ 
+@@ -329,6 +329,11 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "NetBSD")
+   target_link_libraries(tdutils PUBLIC /usr/pkg/gcc5/i486--netbsdelf/lib/libatomic.so)
+ endif()
+ 
++# armv6l missing atomic operations without libatomic
++if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
++  target_link_libraries(tdutils PUBLIC atomic)
++endif()
++
+ install(TARGETS tdutils EXPORT TdTargets
+   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+diff --git a/tdutils/generate/CMakeLists.txt b/tdutils/generate/CMakeLists.txt
+index 9eca574a..72e51c9a 100644
+--- a/tdutils/generate/CMakeLists.txt
++++ b/tdutils/generate/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(TDMIME_AUTO
+ 
+ add_custom_target(tdmime_auto DEPENDS ${TDMIME_SOURCE})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(GPERF_EXECUTABLE gperf)
+   if (NOT GPERF_EXECUTABLE)
+     message(FATAL_ERROR "Could NOT find gperf. Add path to gperf executable to PATH environment variable or specify it manually using GPERF_EXECUTABLE option, i. e. 'cmake -DGPERF_EXECUTABLE:FILEPATH=\"<path to gperf executable>\"'.")
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
new file mode 100644
index 00000000000..9fe7809b43d
--- /dev/null
+++ b/srcpkgs/libtd/template
@@ -0,0 +1,29 @@
+# Template file for 'libtd'
+pkgname=libtd
+version=1.6.0
+revision=1
+wrksrc="td-${version}"
+build_style=cmake
+build_helper=qemu
+hostmakedepends="gperf"
+makedepends="libressl-devel zlib-devel"
+short_desc="Cross-platform library for building Telegram clients"
+maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
+license="BSL-1.0"
+homepage="https://core.telegram.org/tdlib"
+distfiles="https://github.com/tdlib/td/archive/v${version}.tar.gz"
+checksum=9dce57a96f9d4bac8f99aab13ef5cbf6fed04b234a5d22dfa7ef7dce06ea43f8
+patch_args="-Np1"
+
+case "$XBPS_TARGET_MACHINE" in
+	(arm*) makedepends+=" libatomic-devel" ;;
+esac
+
+libtd-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.a"
+		vmove usr/include
+		vmove usr/lib/cmake
+	}
+}

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] New package: libtd-1.6.0
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
@ 2020-07-19  7:42 ` sirikid
  2020-07-19  8:29 ` sirikid
                   ` (25 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-19  7:42 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

There is an updated pull request by sirikid against master on the void-packages repository

https://github.com/sirikid/void-packages package/libtd
https://github.com/void-linux/void-packages/pull/23645

New package: libtd-1.6.0
Pretty ugly patch, but their cross compilation is super cursed.

A patch file from https://github.com/void-linux/void-packages/pull/23645.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/libtd-23645.patch --]
[-- Type: text/x-diff, Size: 7037 bytes --]

From e1c98e28c48d8e66c7f1c40bb0e9758b72775dc7 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Thu, 16 Jul 2020 14:03:58 +0300
Subject: [PATCH] New package: libtd-1.6.6

---
 common/shlibs                               |   1 +
 srcpkgs/libtd-devel                         |   1 +
 srcpkgs/libtd/patches/cross-compiling.patch | 122 ++++++++++++++++++++
 srcpkgs/libtd/template                      |  30 +++++
 4 files changed, 154 insertions(+)
 create mode 120000 srcpkgs/libtd-devel
 create mode 100644 srcpkgs/libtd/patches/cross-compiling.patch
 create mode 100644 srcpkgs/libtd/template

diff --git a/common/shlibs b/common/shlibs
index 42bb0996d24..d461f6830c3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3979,3 +3979,4 @@ libtexluajit.so.2 texlive-LuaTeX-20200406_1
 libtexlua53.so.5 texlive-LuaTeX-20200406_1
 libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
+libtdjson.so.1.6.6 libtd-1.6.6_1
diff --git a/srcpkgs/libtd-devel b/srcpkgs/libtd-devel
new file mode 120000
index 00000000000..ee1a79b2bad
--- /dev/null
+++ b/srcpkgs/libtd-devel
@@ -0,0 +1 @@
+libtd
\ No newline at end of file
diff --git a/srcpkgs/libtd/patches/cross-compiling.patch b/srcpkgs/libtd/patches/cross-compiling.patch
new file mode 100644
index 00000000000..b1273726cd2
--- /dev/null
+++ b/srcpkgs/libtd/patches/cross-compiling.patch
@@ -0,0 +1,122 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46524dba..5b7265c4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -261,7 +261,7 @@ add_subdirectory(tdutils)
+ 
+ add_subdirectory(td/generate)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_custom_target(prepare_cross_compiling DEPENDS tl_generate_common tdmime_auto tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_custom_target(remove_cpp_documentation
+@@ -785,7 +785,7 @@ target_include_directories(tdcore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURC
+ target_include_directories(tdcore SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
+ target_link_libraries(tdcore PUBLIC tdapi tdactor tdutils tdnet tddb PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdcore tl_generate_common)
+   if (TD_ENABLE_JNI)
+     add_dependencies(tdcore td_generate_java_api)
+@@ -813,7 +813,7 @@ if (TD_ENABLE_DOTNET)
+   target_include_directories(tddotnet PUBLIC
+     $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>
+   )
+-  if (NOT CMAKE_CROSSCOMPILING)
++  if (YES)
+     add_dependencies(tddotnet generate_dotnet_api)
+   endif()
+ 
+@@ -833,7 +833,7 @@ target_include_directories(tdc PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdc PRIVATE tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdc tl_generate_c)
+ endif()
+ 
+@@ -842,7 +842,7 @@ target_include_directories(tdjson_private PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdjson_private PUBLIC tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdjson_private tl_generate_common tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_dependencies(tdjson_private remove_cpp_documentation)
+@@ -899,7 +899,7 @@ if (EMSCRIPTEN)
+ endif()
+ 
+ #EXECUTABLES
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(tg_cli td/telegram/cli.cpp ${TL_TD_JSON_SOURCE})
+ 
+   if (NOT READLINE_FOUND)
+diff --git a/td/generate/CMakeLists.txt b/td/generate/CMakeLists.txt
+index adbaa266..49947baa 100644
+--- a/td/generate/CMakeLists.txt
++++ b/td/generate/CMakeLists.txt
+@@ -93,7 +93,7 @@ set(TL_GENERATE_JSON_SOURCE
+   tl_json_converter.h
+ )
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(PHP_EXECUTABLE php)
+ 
+   if ((CMAKE_SYSTEM_NAME MATCHES "FreeBSD") AND (CMAKE_SYSTEM_VERSION MATCHES "HBSD"))
+diff --git a/tddb/CMakeLists.txt b/tddb/CMakeLists.txt
+index 9a80b6cf..8cc9b0f5 100644
+--- a/tddb/CMakeLists.txt
++++ b/tddb/CMakeLists.txt
+@@ -48,7 +48,7 @@ add_library(tddb STATIC ${TDDB_SOURCE})
+ target_include_directories(tddb PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+ target_link_libraries(tddb PUBLIC tdactor tdutils PRIVATE tdsqlite)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(binlog_dump td/db/binlog/binlog_dump.cpp)
+   target_link_libraries(binlog_dump PRIVATE tddb)
+ endif()
+diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
+index d57d93c8..89c1a21c 100644
+--- a/tdutils/CMakeLists.txt
++++ b/tdutils/CMakeLists.txt
+@@ -291,7 +291,7 @@ if (WIN32)
+   # target_link_libraries(tdutils PRIVATE ${WS2_32_LIBRARY} ${MSWSOCK_LIBRARY})
+   target_link_libraries(tdutils PRIVATE ws2_32 Mswsock Normaliz)
+ endif()
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdutils tdmime_auto)
+ endif()
+ 
+@@ -329,6 +329,11 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "NetBSD")
+   target_link_libraries(tdutils PUBLIC /usr/pkg/gcc5/i486--netbsdelf/lib/libatomic.so)
+ endif()
+ 
++# armv6l missing atomic operations without libatomic
++if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
++  target_link_libraries(tdutils PUBLIC atomic)
++endif()
++
+ install(TARGETS tdutils EXPORT TdTargets
+   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+diff --git a/tdutils/generate/CMakeLists.txt b/tdutils/generate/CMakeLists.txt
+index 9eca574a..72e51c9a 100644
+--- a/tdutils/generate/CMakeLists.txt
++++ b/tdutils/generate/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(TDMIME_AUTO
+ 
+ add_custom_target(tdmime_auto DEPENDS ${TDMIME_SOURCE})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(GPERF_EXECUTABLE gperf)
+   if (NOT GPERF_EXECUTABLE)
+     message(FATAL_ERROR "Could NOT find gperf. Add path to gperf executable to PATH environment variable or specify it manually using GPERF_EXECUTABLE option, i. e. 'cmake -DGPERF_EXECUTABLE:FILEPATH=\"<path to gperf executable>\"'.")
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
new file mode 100644
index 00000000000..04d41e43929
--- /dev/null
+++ b/srcpkgs/libtd/template
@@ -0,0 +1,30 @@
+# Template file for 'libtd'
+pkgname=libtd
+version=1.6.6
+_commit=c78fbe4bc5e31395e08f916816704e8051f27296
+revision=1
+wrksrc="td-${_commit}"
+build_style=cmake
+build_helper=qemu
+hostmakedepends="gperf"
+makedepends="libressl-devel zlib-devel"
+short_desc="Cross-platform library for building Telegram clients"
+maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
+license="BSL-1.0"
+homepage="https://core.telegram.org/tdlib"
+distfiles="https://github.com/tdlib/td/archive/${_commit}.tar.gz"
+checksum=adb84e39d95c3cde8a70d47410acd91af3953fc6ebbca152a1afbef9c7135e1e
+patch_args="-Np1"
+
+case "$XBPS_TARGET_MACHINE" in
+	(arm*) makedepends+=" libatomic-devel" ;;
+esac
+
+libtd-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.a"
+		vmove usr/include
+		vmove usr/lib/cmake
+	}
+}

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] New package: libtd-1.6.0
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
  2020-07-19  7:42 ` [PR PATCH] [Updated] " sirikid
@ 2020-07-19  8:29 ` sirikid
  2020-07-19 10:30 ` New package: libtd-1.6.6 sirikid
                   ` (24 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-19  8:29 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

There is an updated pull request by sirikid against master on the void-packages repository

https://github.com/sirikid/void-packages package/libtd
https://github.com/void-linux/void-packages/pull/23645

New package: libtd-1.6.0
Pretty ugly patch, but their cross compilation is super cursed.

A patch file from https://github.com/void-linux/void-packages/pull/23645.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/libtd-23645.patch --]
[-- Type: text/x-diff, Size: 7037 bytes --]

From 9c749cf1e9f451a8f8d8f0be73d6d9351e6a7696 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Thu, 16 Jul 2020 14:03:58 +0300
Subject: [PATCH] New package: libtd-1.6.6

---
 common/shlibs                               |   1 +
 srcpkgs/libtd-devel                         |   1 +
 srcpkgs/libtd/patches/cross-compiling.patch | 122 ++++++++++++++++++++
 srcpkgs/libtd/template                      |  30 +++++
 4 files changed, 154 insertions(+)
 create mode 120000 srcpkgs/libtd-devel
 create mode 100644 srcpkgs/libtd/patches/cross-compiling.patch
 create mode 100644 srcpkgs/libtd/template

diff --git a/common/shlibs b/common/shlibs
index 42bb0996d24..d461f6830c3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3979,3 +3979,4 @@ libtexluajit.so.2 texlive-LuaTeX-20200406_1
 libtexlua53.so.5 texlive-LuaTeX-20200406_1
 libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
+libtdjson.so.1.6.6 libtd-1.6.6_1
diff --git a/srcpkgs/libtd-devel b/srcpkgs/libtd-devel
new file mode 120000
index 00000000000..ee1a79b2bad
--- /dev/null
+++ b/srcpkgs/libtd-devel
@@ -0,0 +1 @@
+libtd
\ No newline at end of file
diff --git a/srcpkgs/libtd/patches/cross-compiling.patch b/srcpkgs/libtd/patches/cross-compiling.patch
new file mode 100644
index 00000000000..b1273726cd2
--- /dev/null
+++ b/srcpkgs/libtd/patches/cross-compiling.patch
@@ -0,0 +1,122 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46524dba..5b7265c4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -261,7 +261,7 @@ add_subdirectory(tdutils)
+ 
+ add_subdirectory(td/generate)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_custom_target(prepare_cross_compiling DEPENDS tl_generate_common tdmime_auto tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_custom_target(remove_cpp_documentation
+@@ -785,7 +785,7 @@ target_include_directories(tdcore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURC
+ target_include_directories(tdcore SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
+ target_link_libraries(tdcore PUBLIC tdapi tdactor tdutils tdnet tddb PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdcore tl_generate_common)
+   if (TD_ENABLE_JNI)
+     add_dependencies(tdcore td_generate_java_api)
+@@ -813,7 +813,7 @@ if (TD_ENABLE_DOTNET)
+   target_include_directories(tddotnet PUBLIC
+     $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>
+   )
+-  if (NOT CMAKE_CROSSCOMPILING)
++  if (YES)
+     add_dependencies(tddotnet generate_dotnet_api)
+   endif()
+ 
+@@ -833,7 +833,7 @@ target_include_directories(tdc PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdc PRIVATE tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdc tl_generate_c)
+ endif()
+ 
+@@ -842,7 +842,7 @@ target_include_directories(tdjson_private PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdjson_private PUBLIC tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdjson_private tl_generate_common tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_dependencies(tdjson_private remove_cpp_documentation)
+@@ -899,7 +899,7 @@ if (EMSCRIPTEN)
+ endif()
+ 
+ #EXECUTABLES
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(tg_cli td/telegram/cli.cpp ${TL_TD_JSON_SOURCE})
+ 
+   if (NOT READLINE_FOUND)
+diff --git a/td/generate/CMakeLists.txt b/td/generate/CMakeLists.txt
+index adbaa266..49947baa 100644
+--- a/td/generate/CMakeLists.txt
++++ b/td/generate/CMakeLists.txt
+@@ -93,7 +93,7 @@ set(TL_GENERATE_JSON_SOURCE
+   tl_json_converter.h
+ )
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(PHP_EXECUTABLE php)
+ 
+   if ((CMAKE_SYSTEM_NAME MATCHES "FreeBSD") AND (CMAKE_SYSTEM_VERSION MATCHES "HBSD"))
+diff --git a/tddb/CMakeLists.txt b/tddb/CMakeLists.txt
+index 9a80b6cf..8cc9b0f5 100644
+--- a/tddb/CMakeLists.txt
++++ b/tddb/CMakeLists.txt
+@@ -48,7 +48,7 @@ add_library(tddb STATIC ${TDDB_SOURCE})
+ target_include_directories(tddb PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+ target_link_libraries(tddb PUBLIC tdactor tdutils PRIVATE tdsqlite)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(binlog_dump td/db/binlog/binlog_dump.cpp)
+   target_link_libraries(binlog_dump PRIVATE tddb)
+ endif()
+diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
+index d57d93c8..89c1a21c 100644
+--- a/tdutils/CMakeLists.txt
++++ b/tdutils/CMakeLists.txt
+@@ -291,7 +291,7 @@ if (WIN32)
+   # target_link_libraries(tdutils PRIVATE ${WS2_32_LIBRARY} ${MSWSOCK_LIBRARY})
+   target_link_libraries(tdutils PRIVATE ws2_32 Mswsock Normaliz)
+ endif()
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdutils tdmime_auto)
+ endif()
+ 
+@@ -329,6 +329,11 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "NetBSD")
+   target_link_libraries(tdutils PUBLIC /usr/pkg/gcc5/i486--netbsdelf/lib/libatomic.so)
+ endif()
+ 
++# armv6l missing atomic operations without libatomic
++if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
++  target_link_libraries(tdutils PUBLIC atomic)
++endif()
++
+ install(TARGETS tdutils EXPORT TdTargets
+   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+diff --git a/tdutils/generate/CMakeLists.txt b/tdutils/generate/CMakeLists.txt
+index 9eca574a..72e51c9a 100644
+--- a/tdutils/generate/CMakeLists.txt
++++ b/tdutils/generate/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(TDMIME_AUTO
+ 
+ add_custom_target(tdmime_auto DEPENDS ${TDMIME_SOURCE})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(GPERF_EXECUTABLE gperf)
+   if (NOT GPERF_EXECUTABLE)
+     message(FATAL_ERROR "Could NOT find gperf. Add path to gperf executable to PATH environment variable or specify it manually using GPERF_EXECUTABLE option, i. e. 'cmake -DGPERF_EXECUTABLE:FILEPATH=\"<path to gperf executable>\"'.")
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
new file mode 100644
index 00000000000..021ae4e8475
--- /dev/null
+++ b/srcpkgs/libtd/template
@@ -0,0 +1,30 @@
+# Template file for 'libtd'
+pkgname=libtd
+version=1.6.6
+revision=1
+_commit=c78fbe4bc5e31395e08f916816704e8051f27296
+wrksrc="td-${_commit}"
+build_style=cmake
+build_helper=qemu
+hostmakedepends="gperf"
+makedepends="libressl-devel zlib-devel"
+short_desc="Cross-platform library for building Telegram clients"
+maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
+license="BSL-1.0"
+homepage="https://core.telegram.org/tdlib"
+distfiles="https://github.com/tdlib/td/archive/${_commit}.tar.gz"
+checksum=adb84e39d95c3cde8a70d47410acd91af3953fc6ebbca152a1afbef9c7135e1e
+patch_args="-Np1"
+
+case "$XBPS_TARGET_MACHINE" in
+	(arm*) makedepends+=" libatomic-devel" ;;
+esac
+
+libtd-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.a"
+		vmove usr/include
+		vmove usr/lib/cmake
+	}
+}

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
  2020-07-19  7:42 ` [PR PATCH] [Updated] " sirikid
  2020-07-19  8:29 ` sirikid
@ 2020-07-19 10:30 ` sirikid
  2020-07-22 13:37 ` [PR REVIEW] " sgn
                   ` (23 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-19 10:30 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 224 bytes --]

New comment by sirikid on void-packages repository

https://github.com/void-linux/void-packages/pull/23645#issuecomment-660622694

Comment:
The tdlib team does not tag the patch bumps, so tdlib has to be build from a commit

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (2 preceding siblings ...)
  2020-07-19 10:30 ` New package: libtd-1.6.6 sirikid
@ 2020-07-22 13:37 ` sgn
  2020-07-22 14:21 ` sirikid
                   ` (22 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sgn @ 2020-07-22 13:37 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 231 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/23645#discussion_r458797339

Comment:
```sh
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
	makedepends+=" libatomic-devel"
fi
```

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (3 preceding siblings ...)
  2020-07-22 13:37 ` [PR REVIEW] " sgn
@ 2020-07-22 14:21 ` sirikid
  2020-07-22 20:41 ` Chocimier
                   ` (21 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-22 14:21 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 345 bytes --]

New review comment by sirikid on void-packages repository

https://github.com/void-linux/void-packages/pull/23645#discussion_r458829615

Comment:
What are these systems? I also have to change [the patch](https://github.com/void-linux/void-packages/blob/9c749cf1e9f451a8f8d8f0be73d6d9351e6a7696/srcpkgs/libtd/patches/cross-compiling.patch#L103).

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (4 preceding siblings ...)
  2020-07-22 14:21 ` sirikid
@ 2020-07-22 20:41 ` Chocimier
  2020-07-22 22:18 ` [PR PATCH] [Updated] " sirikid
                   ` (20 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: Chocimier @ 2020-07-22 20:41 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 317 bytes --]

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/23645#discussion_r459070332

Comment:
Use https://github.com/void-linux/void-packages/blob/c4f6b779bcf998f462249c14946a29eecfa4be4f/srcpkgs/grpc/template#L27 instead of  patch fragment that links libatomic.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (5 preceding siblings ...)
  2020-07-22 20:41 ` Chocimier
@ 2020-07-22 22:18 ` sirikid
  2020-07-23  1:27 ` [PR PATCH] [Updated] WIP: " sirikid
                   ` (19 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-22 22:18 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

There is an updated pull request by sirikid against master on the void-packages repository

https://github.com/sirikid/void-packages package/libtd
https://github.com/void-linux/void-packages/pull/23645

New package: libtd-1.6.6
Pretty ugly patch, but their cross compilation is super cursed.

A patch file from https://github.com/void-linux/void-packages/pull/23645.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/libtd-23645.patch --]
[-- Type: text/x-diff, Size: 9446 bytes --]

From 73d6552306a9841e8fe6bd62841360b90497ffc8 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Thu, 16 Jul 2020 14:03:58 +0300
Subject: [PATCH 1/2] New package: libtd-1.6.6

---
 common/shlibs                               |   1 +
 srcpkgs/libtd-devel                         |   1 +
 srcpkgs/libtd/patches/cross-compiling.patch | 122 ++++++++++++++++++++
 srcpkgs/libtd/template                      |  30 +++++
 4 files changed, 154 insertions(+)
 create mode 120000 srcpkgs/libtd-devel
 create mode 100644 srcpkgs/libtd/patches/cross-compiling.patch
 create mode 100644 srcpkgs/libtd/template

diff --git a/common/shlibs b/common/shlibs
index fdbd5558b7c..74dbc50c9a0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3974,3 +3974,4 @@ libtexluajit.so.2 texlive-LuaTeX-20200406_1
 libtexlua53.so.5 texlive-LuaTeX-20200406_1
 libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
+libtdjson.so.1.6.6 libtd-1.6.6_1
diff --git a/srcpkgs/libtd-devel b/srcpkgs/libtd-devel
new file mode 120000
index 00000000000..ee1a79b2bad
--- /dev/null
+++ b/srcpkgs/libtd-devel
@@ -0,0 +1 @@
+libtd
\ No newline at end of file
diff --git a/srcpkgs/libtd/patches/cross-compiling.patch b/srcpkgs/libtd/patches/cross-compiling.patch
new file mode 100644
index 00000000000..b1273726cd2
--- /dev/null
+++ b/srcpkgs/libtd/patches/cross-compiling.patch
@@ -0,0 +1,122 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46524dba..5b7265c4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -261,7 +261,7 @@ add_subdirectory(tdutils)
+ 
+ add_subdirectory(td/generate)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_custom_target(prepare_cross_compiling DEPENDS tl_generate_common tdmime_auto tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_custom_target(remove_cpp_documentation
+@@ -785,7 +785,7 @@ target_include_directories(tdcore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURC
+ target_include_directories(tdcore SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
+ target_link_libraries(tdcore PUBLIC tdapi tdactor tdutils tdnet tddb PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdcore tl_generate_common)
+   if (TD_ENABLE_JNI)
+     add_dependencies(tdcore td_generate_java_api)
+@@ -813,7 +813,7 @@ if (TD_ENABLE_DOTNET)
+   target_include_directories(tddotnet PUBLIC
+     $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>
+   )
+-  if (NOT CMAKE_CROSSCOMPILING)
++  if (YES)
+     add_dependencies(tddotnet generate_dotnet_api)
+   endif()
+ 
+@@ -833,7 +833,7 @@ target_include_directories(tdc PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdc PRIVATE tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdc tl_generate_c)
+ endif()
+ 
+@@ -842,7 +842,7 @@ target_include_directories(tdjson_private PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdjson_private PUBLIC tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdjson_private tl_generate_common tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_dependencies(tdjson_private remove_cpp_documentation)
+@@ -899,7 +899,7 @@ if (EMSCRIPTEN)
+ endif()
+ 
+ #EXECUTABLES
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(tg_cli td/telegram/cli.cpp ${TL_TD_JSON_SOURCE})
+ 
+   if (NOT READLINE_FOUND)
+diff --git a/td/generate/CMakeLists.txt b/td/generate/CMakeLists.txt
+index adbaa266..49947baa 100644
+--- a/td/generate/CMakeLists.txt
++++ b/td/generate/CMakeLists.txt
+@@ -93,7 +93,7 @@ set(TL_GENERATE_JSON_SOURCE
+   tl_json_converter.h
+ )
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(PHP_EXECUTABLE php)
+ 
+   if ((CMAKE_SYSTEM_NAME MATCHES "FreeBSD") AND (CMAKE_SYSTEM_VERSION MATCHES "HBSD"))
+diff --git a/tddb/CMakeLists.txt b/tddb/CMakeLists.txt
+index 9a80b6cf..8cc9b0f5 100644
+--- a/tddb/CMakeLists.txt
++++ b/tddb/CMakeLists.txt
+@@ -48,7 +48,7 @@ add_library(tddb STATIC ${TDDB_SOURCE})
+ target_include_directories(tddb PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+ target_link_libraries(tddb PUBLIC tdactor tdutils PRIVATE tdsqlite)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(binlog_dump td/db/binlog/binlog_dump.cpp)
+   target_link_libraries(binlog_dump PRIVATE tddb)
+ endif()
+diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
+index d57d93c8..89c1a21c 100644
+--- a/tdutils/CMakeLists.txt
++++ b/tdutils/CMakeLists.txt
+@@ -291,7 +291,7 @@ if (WIN32)
+   # target_link_libraries(tdutils PRIVATE ${WS2_32_LIBRARY} ${MSWSOCK_LIBRARY})
+   target_link_libraries(tdutils PRIVATE ws2_32 Mswsock Normaliz)
+ endif()
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdutils tdmime_auto)
+ endif()
+ 
+@@ -329,6 +329,11 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "NetBSD")
+   target_link_libraries(tdutils PUBLIC /usr/pkg/gcc5/i486--netbsdelf/lib/libatomic.so)
+ endif()
+ 
++# armv6l missing atomic operations without libatomic
++if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
++  target_link_libraries(tdutils PUBLIC atomic)
++endif()
++
+ install(TARGETS tdutils EXPORT TdTargets
+   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+diff --git a/tdutils/generate/CMakeLists.txt b/tdutils/generate/CMakeLists.txt
+index 9eca574a..72e51c9a 100644
+--- a/tdutils/generate/CMakeLists.txt
++++ b/tdutils/generate/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(TDMIME_AUTO
+ 
+ add_custom_target(tdmime_auto DEPENDS ${TDMIME_SOURCE})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(GPERF_EXECUTABLE gperf)
+   if (NOT GPERF_EXECUTABLE)
+     message(FATAL_ERROR "Could NOT find gperf. Add path to gperf executable to PATH environment variable or specify it manually using GPERF_EXECUTABLE option, i. e. 'cmake -DGPERF_EXECUTABLE:FILEPATH=\"<path to gperf executable>\"'.")
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
new file mode 100644
index 00000000000..021ae4e8475
--- /dev/null
+++ b/srcpkgs/libtd/template
@@ -0,0 +1,30 @@
+# Template file for 'libtd'
+pkgname=libtd
+version=1.6.6
+revision=1
+_commit=c78fbe4bc5e31395e08f916816704e8051f27296
+wrksrc="td-${_commit}"
+build_style=cmake
+build_helper=qemu
+hostmakedepends="gperf"
+makedepends="libressl-devel zlib-devel"
+short_desc="Cross-platform library for building Telegram clients"
+maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
+license="BSL-1.0"
+homepage="https://core.telegram.org/tdlib"
+distfiles="https://github.com/tdlib/td/archive/${_commit}.tar.gz"
+checksum=adb84e39d95c3cde8a70d47410acd91af3953fc6ebbca152a1afbef9c7135e1e
+patch_args="-Np1"
+
+case "$XBPS_TARGET_MACHINE" in
+	(arm*) makedepends+=" libatomic-devel" ;;
+esac
+
+libtd-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.a"
+		vmove usr/include
+		vmove usr/lib/cmake
+	}
+}

From dd5d8ee9b323424affba7b8369917015683476c2 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Thu, 23 Jul 2020 01:17:26 +0300
Subject: [PATCH 2/2] WIP: libtd: link libatomic using configure_args

---
 srcpkgs/libtd/patches/cross-compiling.patch | 14 +-------------
 srcpkgs/libtd/template                      |  7 ++++---
 2 files changed, 5 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 srcpkgs/libtd/template

diff --git a/srcpkgs/libtd/patches/cross-compiling.patch b/srcpkgs/libtd/patches/cross-compiling.patch
index b1273726cd2..c2b2333fb85 100644
--- a/srcpkgs/libtd/patches/cross-compiling.patch
+++ b/srcpkgs/libtd/patches/cross-compiling.patch
@@ -83,7 +83,7 @@ index 9a80b6cf..8cc9b0f5 100644
    target_link_libraries(binlog_dump PRIVATE tddb)
  endif()
 diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
-index d57d93c8..89c1a21c 100644
+index d57d93c8..8150188c 100644
 --- a/tdutils/CMakeLists.txt
 +++ b/tdutils/CMakeLists.txt
 @@ -291,7 +291,7 @@ if (WIN32)
@@ -95,18 +95,6 @@ index d57d93c8..89c1a21c 100644
    add_dependencies(tdutils tdmime_auto)
  endif()
  
-@@ -329,6 +329,11 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "NetBSD")
-   target_link_libraries(tdutils PUBLIC /usr/pkg/gcc5/i486--netbsdelf/lib/libatomic.so)
- endif()
- 
-+# armv6l missing atomic operations without libatomic
-+if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
-+  target_link_libraries(tdutils PUBLIC atomic)
-+endif()
-+
- install(TARGETS tdutils EXPORT TdTargets
-   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
 diff --git a/tdutils/generate/CMakeLists.txt b/tdutils/generate/CMakeLists.txt
 index 9eca574a..72e51c9a 100644
 --- a/tdutils/generate/CMakeLists.txt
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
old mode 100644
new mode 100755
index 021ae4e8475..e21f11ff933
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -16,9 +16,10 @@ distfiles="https://github.com/tdlib/td/archive/${_commit}.tar.gz"
 checksum=adb84e39d95c3cde8a70d47410acd91af3953fc6ebbca152a1afbef9c7135e1e
 patch_args="-Np1"
 
-case "$XBPS_TARGET_MACHINE" in
-	(arm*) makedepends+=" libatomic-devel" ;;
-esac
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	configure_args+=" -DCMAKE_CXX_STADARD_LIBRARIES=-latomic"
+	makedepends+=" libatomic-devel"
+fi
 
 libtd-devel_package() {
 	short_desc+=" - development files"

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] WIP: New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (6 preceding siblings ...)
  2020-07-22 22:18 ` [PR PATCH] [Updated] " sirikid
@ 2020-07-23  1:27 ` sirikid
  2020-07-23  1:29 ` [PR REVIEW] " sgn
                   ` (18 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-23  1:27 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 388 bytes --]

There is an updated pull request by sirikid against master on the void-packages repository

https://github.com/sirikid/void-packages package/libtd
https://github.com/void-linux/void-packages/pull/23645

WIP: New package: libtd-1.6.6
Pretty ugly patch, but their cross compilation is super cursed.

A patch file from https://github.com/void-linux/void-packages/pull/23645.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/libtd-23645.patch --]
[-- Type: text/x-diff, Size: 10195 bytes --]

From 73d6552306a9841e8fe6bd62841360b90497ffc8 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Thu, 16 Jul 2020 14:03:58 +0300
Subject: [PATCH 1/3] New package: libtd-1.6.6

---
 common/shlibs                               |   1 +
 srcpkgs/libtd-devel                         |   1 +
 srcpkgs/libtd/patches/cross-compiling.patch | 122 ++++++++++++++++++++
 srcpkgs/libtd/template                      |  30 +++++
 4 files changed, 154 insertions(+)
 create mode 120000 srcpkgs/libtd-devel
 create mode 100644 srcpkgs/libtd/patches/cross-compiling.patch
 create mode 100644 srcpkgs/libtd/template

diff --git a/common/shlibs b/common/shlibs
index fdbd5558b7c..74dbc50c9a0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3974,3 +3974,4 @@ libtexluajit.so.2 texlive-LuaTeX-20200406_1
 libtexlua53.so.5 texlive-LuaTeX-20200406_1
 libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
+libtdjson.so.1.6.6 libtd-1.6.6_1
diff --git a/srcpkgs/libtd-devel b/srcpkgs/libtd-devel
new file mode 120000
index 00000000000..ee1a79b2bad
--- /dev/null
+++ b/srcpkgs/libtd-devel
@@ -0,0 +1 @@
+libtd
\ No newline at end of file
diff --git a/srcpkgs/libtd/patches/cross-compiling.patch b/srcpkgs/libtd/patches/cross-compiling.patch
new file mode 100644
index 00000000000..b1273726cd2
--- /dev/null
+++ b/srcpkgs/libtd/patches/cross-compiling.patch
@@ -0,0 +1,122 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46524dba..5b7265c4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -261,7 +261,7 @@ add_subdirectory(tdutils)
+ 
+ add_subdirectory(td/generate)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_custom_target(prepare_cross_compiling DEPENDS tl_generate_common tdmime_auto tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_custom_target(remove_cpp_documentation
+@@ -785,7 +785,7 @@ target_include_directories(tdcore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURC
+ target_include_directories(tdcore SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
+ target_link_libraries(tdcore PUBLIC tdapi tdactor tdutils tdnet tddb PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdcore tl_generate_common)
+   if (TD_ENABLE_JNI)
+     add_dependencies(tdcore td_generate_java_api)
+@@ -813,7 +813,7 @@ if (TD_ENABLE_DOTNET)
+   target_include_directories(tddotnet PUBLIC
+     $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>
+   )
+-  if (NOT CMAKE_CROSSCOMPILING)
++  if (YES)
+     add_dependencies(tddotnet generate_dotnet_api)
+   endif()
+ 
+@@ -833,7 +833,7 @@ target_include_directories(tdc PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdc PRIVATE tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdc tl_generate_c)
+ endif()
+ 
+@@ -842,7 +842,7 @@ target_include_directories(tdjson_private PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdjson_private PUBLIC tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdjson_private tl_generate_common tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_dependencies(tdjson_private remove_cpp_documentation)
+@@ -899,7 +899,7 @@ if (EMSCRIPTEN)
+ endif()
+ 
+ #EXECUTABLES
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(tg_cli td/telegram/cli.cpp ${TL_TD_JSON_SOURCE})
+ 
+   if (NOT READLINE_FOUND)
+diff --git a/td/generate/CMakeLists.txt b/td/generate/CMakeLists.txt
+index adbaa266..49947baa 100644
+--- a/td/generate/CMakeLists.txt
++++ b/td/generate/CMakeLists.txt
+@@ -93,7 +93,7 @@ set(TL_GENERATE_JSON_SOURCE
+   tl_json_converter.h
+ )
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(PHP_EXECUTABLE php)
+ 
+   if ((CMAKE_SYSTEM_NAME MATCHES "FreeBSD") AND (CMAKE_SYSTEM_VERSION MATCHES "HBSD"))
+diff --git a/tddb/CMakeLists.txt b/tddb/CMakeLists.txt
+index 9a80b6cf..8cc9b0f5 100644
+--- a/tddb/CMakeLists.txt
++++ b/tddb/CMakeLists.txt
+@@ -48,7 +48,7 @@ add_library(tddb STATIC ${TDDB_SOURCE})
+ target_include_directories(tddb PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+ target_link_libraries(tddb PUBLIC tdactor tdutils PRIVATE tdsqlite)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(binlog_dump td/db/binlog/binlog_dump.cpp)
+   target_link_libraries(binlog_dump PRIVATE tddb)
+ endif()
+diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
+index d57d93c8..89c1a21c 100644
+--- a/tdutils/CMakeLists.txt
++++ b/tdutils/CMakeLists.txt
+@@ -291,7 +291,7 @@ if (WIN32)
+   # target_link_libraries(tdutils PRIVATE ${WS2_32_LIBRARY} ${MSWSOCK_LIBRARY})
+   target_link_libraries(tdutils PRIVATE ws2_32 Mswsock Normaliz)
+ endif()
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdutils tdmime_auto)
+ endif()
+ 
+@@ -329,6 +329,11 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "NetBSD")
+   target_link_libraries(tdutils PUBLIC /usr/pkg/gcc5/i486--netbsdelf/lib/libatomic.so)
+ endif()
+ 
++# armv6l missing atomic operations without libatomic
++if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
++  target_link_libraries(tdutils PUBLIC atomic)
++endif()
++
+ install(TARGETS tdutils EXPORT TdTargets
+   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+diff --git a/tdutils/generate/CMakeLists.txt b/tdutils/generate/CMakeLists.txt
+index 9eca574a..72e51c9a 100644
+--- a/tdutils/generate/CMakeLists.txt
++++ b/tdutils/generate/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(TDMIME_AUTO
+ 
+ add_custom_target(tdmime_auto DEPENDS ${TDMIME_SOURCE})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(GPERF_EXECUTABLE gperf)
+   if (NOT GPERF_EXECUTABLE)
+     message(FATAL_ERROR "Could NOT find gperf. Add path to gperf executable to PATH environment variable or specify it manually using GPERF_EXECUTABLE option, i. e. 'cmake -DGPERF_EXECUTABLE:FILEPATH=\"<path to gperf executable>\"'.")
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
new file mode 100644
index 00000000000..021ae4e8475
--- /dev/null
+++ b/srcpkgs/libtd/template
@@ -0,0 +1,30 @@
+# Template file for 'libtd'
+pkgname=libtd
+version=1.6.6
+revision=1
+_commit=c78fbe4bc5e31395e08f916816704e8051f27296
+wrksrc="td-${_commit}"
+build_style=cmake
+build_helper=qemu
+hostmakedepends="gperf"
+makedepends="libressl-devel zlib-devel"
+short_desc="Cross-platform library for building Telegram clients"
+maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
+license="BSL-1.0"
+homepage="https://core.telegram.org/tdlib"
+distfiles="https://github.com/tdlib/td/archive/${_commit}.tar.gz"
+checksum=adb84e39d95c3cde8a70d47410acd91af3953fc6ebbca152a1afbef9c7135e1e
+patch_args="-Np1"
+
+case "$XBPS_TARGET_MACHINE" in
+	(arm*) makedepends+=" libatomic-devel" ;;
+esac
+
+libtd-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.a"
+		vmove usr/include
+		vmove usr/lib/cmake
+	}
+}

From dd5d8ee9b323424affba7b8369917015683476c2 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Thu, 23 Jul 2020 01:17:26 +0300
Subject: [PATCH 2/3] WIP: libtd: link libatomic using configure_args

---
 srcpkgs/libtd/patches/cross-compiling.patch | 14 +-------------
 srcpkgs/libtd/template                      |  7 ++++---
 2 files changed, 5 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 srcpkgs/libtd/template

diff --git a/srcpkgs/libtd/patches/cross-compiling.patch b/srcpkgs/libtd/patches/cross-compiling.patch
index b1273726cd2..c2b2333fb85 100644
--- a/srcpkgs/libtd/patches/cross-compiling.patch
+++ b/srcpkgs/libtd/patches/cross-compiling.patch
@@ -83,7 +83,7 @@ index 9a80b6cf..8cc9b0f5 100644
    target_link_libraries(binlog_dump PRIVATE tddb)
  endif()
 diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
-index d57d93c8..89c1a21c 100644
+index d57d93c8..8150188c 100644
 --- a/tdutils/CMakeLists.txt
 +++ b/tdutils/CMakeLists.txt
 @@ -291,7 +291,7 @@ if (WIN32)
@@ -95,18 +95,6 @@ index d57d93c8..89c1a21c 100644
    add_dependencies(tdutils tdmime_auto)
  endif()
  
-@@ -329,6 +329,11 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "NetBSD")
-   target_link_libraries(tdutils PUBLIC /usr/pkg/gcc5/i486--netbsdelf/lib/libatomic.so)
- endif()
- 
-+# armv6l missing atomic operations without libatomic
-+if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
-+  target_link_libraries(tdutils PUBLIC atomic)
-+endif()
-+
- install(TARGETS tdutils EXPORT TdTargets
-   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
 diff --git a/tdutils/generate/CMakeLists.txt b/tdutils/generate/CMakeLists.txt
 index 9eca574a..72e51c9a 100644
 --- a/tdutils/generate/CMakeLists.txt
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
old mode 100644
new mode 100755
index 021ae4e8475..e21f11ff933
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -16,9 +16,10 @@ distfiles="https://github.com/tdlib/td/archive/${_commit}.tar.gz"
 checksum=adb84e39d95c3cde8a70d47410acd91af3953fc6ebbca152a1afbef9c7135e1e
 patch_args="-Np1"
 
-case "$XBPS_TARGET_MACHINE" in
-	(arm*) makedepends+=" libatomic-devel" ;;
-esac
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	configure_args+=" -DCMAKE_CXX_STADARD_LIBRARIES=-latomic"
+	makedepends+=" libatomic-devel"
+fi
 
 libtd-devel_package() {
 	short_desc+=" - development files"

From 1b9c335a5d6d5f7d0a543252425651d9b6d4c38d Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Thu, 23 Jul 2020 04:27:02 +0300
Subject: [PATCH 3/3] WIP: libtd: fix typo

---
 srcpkgs/libtd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index e21f11ff933..7d26c590943 100755
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -17,7 +17,7 @@ checksum=adb84e39d95c3cde8a70d47410acd91af3953fc6ebbca152a1afbef9c7135e1e
 patch_args="-Np1"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_CXX_STADARD_LIBRARIES=-latomic"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
 	makedepends+=" libatomic-devel"
 fi
 

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] WIP: New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (7 preceding siblings ...)
  2020-07-23  1:27 ` [PR PATCH] [Updated] WIP: " sirikid
@ 2020-07-23  1:29 ` sgn
  2020-07-23  1:52 ` [PR PATCH] [Updated] " sirikid
                   ` (17 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sgn @ 2020-07-23  1:29 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 596 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/23645#discussion_r459171303

Comment:
> What are these systems? I also have to change [the patch](https://github.com/void-linux/void-packages/blob/9c749cf1e9f451a8f8d8f0be73d6d9351e6a7696/srcpkgs/libtd/patches/cross-compiling.patch#L103).

Using Chocimier's suggestion, patch is unnecessary, right?

armv5, armv6, mips, and ppc (32 bits) all missed it.
https://github.com/void-linux/void-packages/blob/c4f6b779bcf998f462249c14946a29eecfa4be4f/common/xbps-src/shutils/common.sh#L292-L302

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] WIP: New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (8 preceding siblings ...)
  2020-07-23  1:29 ` [PR REVIEW] " sgn
@ 2020-07-23  1:52 ` sirikid
  2020-07-23  6:03 ` [PR REVIEW] " sirikid
                   ` (16 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-23  1:52 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 388 bytes --]

There is an updated pull request by sirikid against master on the void-packages repository

https://github.com/sirikid/void-packages package/libtd
https://github.com/void-linux/void-packages/pull/23645

WIP: New package: libtd-1.6.6
Pretty ugly patch, but their cross compilation is super cursed.

A patch file from https://github.com/void-linux/void-packages/pull/23645.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/libtd-23645.patch --]
[-- Type: text/x-diff, Size: 10195 bytes --]

From 73d6552306a9841e8fe6bd62841360b90497ffc8 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Thu, 16 Jul 2020 14:03:58 +0300
Subject: [PATCH 1/3] New package: libtd-1.6.6

---
 common/shlibs                               |   1 +
 srcpkgs/libtd-devel                         |   1 +
 srcpkgs/libtd/patches/cross-compiling.patch | 122 ++++++++++++++++++++
 srcpkgs/libtd/template                      |  30 +++++
 4 files changed, 154 insertions(+)
 create mode 120000 srcpkgs/libtd-devel
 create mode 100644 srcpkgs/libtd/patches/cross-compiling.patch
 create mode 100644 srcpkgs/libtd/template

diff --git a/common/shlibs b/common/shlibs
index fdbd5558b7c..74dbc50c9a0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3974,3 +3974,4 @@ libtexluajit.so.2 texlive-LuaTeX-20200406_1
 libtexlua53.so.5 texlive-LuaTeX-20200406_1
 libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
+libtdjson.so.1.6.6 libtd-1.6.6_1
diff --git a/srcpkgs/libtd-devel b/srcpkgs/libtd-devel
new file mode 120000
index 00000000000..ee1a79b2bad
--- /dev/null
+++ b/srcpkgs/libtd-devel
@@ -0,0 +1 @@
+libtd
\ No newline at end of file
diff --git a/srcpkgs/libtd/patches/cross-compiling.patch b/srcpkgs/libtd/patches/cross-compiling.patch
new file mode 100644
index 00000000000..b1273726cd2
--- /dev/null
+++ b/srcpkgs/libtd/patches/cross-compiling.patch
@@ -0,0 +1,122 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46524dba..5b7265c4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -261,7 +261,7 @@ add_subdirectory(tdutils)
+ 
+ add_subdirectory(td/generate)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_custom_target(prepare_cross_compiling DEPENDS tl_generate_common tdmime_auto tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_custom_target(remove_cpp_documentation
+@@ -785,7 +785,7 @@ target_include_directories(tdcore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURC
+ target_include_directories(tdcore SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
+ target_link_libraries(tdcore PUBLIC tdapi tdactor tdutils tdnet tddb PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdcore tl_generate_common)
+   if (TD_ENABLE_JNI)
+     add_dependencies(tdcore td_generate_java_api)
+@@ -813,7 +813,7 @@ if (TD_ENABLE_DOTNET)
+   target_include_directories(tddotnet PUBLIC
+     $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>
+   )
+-  if (NOT CMAKE_CROSSCOMPILING)
++  if (YES)
+     add_dependencies(tddotnet generate_dotnet_api)
+   endif()
+ 
+@@ -833,7 +833,7 @@ target_include_directories(tdc PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdc PRIVATE tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdc tl_generate_c)
+ endif()
+ 
+@@ -842,7 +842,7 @@ target_include_directories(tdjson_private PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdjson_private PUBLIC tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdjson_private tl_generate_common tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_dependencies(tdjson_private remove_cpp_documentation)
+@@ -899,7 +899,7 @@ if (EMSCRIPTEN)
+ endif()
+ 
+ #EXECUTABLES
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(tg_cli td/telegram/cli.cpp ${TL_TD_JSON_SOURCE})
+ 
+   if (NOT READLINE_FOUND)
+diff --git a/td/generate/CMakeLists.txt b/td/generate/CMakeLists.txt
+index adbaa266..49947baa 100644
+--- a/td/generate/CMakeLists.txt
++++ b/td/generate/CMakeLists.txt
+@@ -93,7 +93,7 @@ set(TL_GENERATE_JSON_SOURCE
+   tl_json_converter.h
+ )
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(PHP_EXECUTABLE php)
+ 
+   if ((CMAKE_SYSTEM_NAME MATCHES "FreeBSD") AND (CMAKE_SYSTEM_VERSION MATCHES "HBSD"))
+diff --git a/tddb/CMakeLists.txt b/tddb/CMakeLists.txt
+index 9a80b6cf..8cc9b0f5 100644
+--- a/tddb/CMakeLists.txt
++++ b/tddb/CMakeLists.txt
+@@ -48,7 +48,7 @@ add_library(tddb STATIC ${TDDB_SOURCE})
+ target_include_directories(tddb PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+ target_link_libraries(tddb PUBLIC tdactor tdutils PRIVATE tdsqlite)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(binlog_dump td/db/binlog/binlog_dump.cpp)
+   target_link_libraries(binlog_dump PRIVATE tddb)
+ endif()
+diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
+index d57d93c8..89c1a21c 100644
+--- a/tdutils/CMakeLists.txt
++++ b/tdutils/CMakeLists.txt
+@@ -291,7 +291,7 @@ if (WIN32)
+   # target_link_libraries(tdutils PRIVATE ${WS2_32_LIBRARY} ${MSWSOCK_LIBRARY})
+   target_link_libraries(tdutils PRIVATE ws2_32 Mswsock Normaliz)
+ endif()
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdutils tdmime_auto)
+ endif()
+ 
+@@ -329,6 +329,11 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "NetBSD")
+   target_link_libraries(tdutils PUBLIC /usr/pkg/gcc5/i486--netbsdelf/lib/libatomic.so)
+ endif()
+ 
++# armv6l missing atomic operations without libatomic
++if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
++  target_link_libraries(tdutils PUBLIC atomic)
++endif()
++
+ install(TARGETS tdutils EXPORT TdTargets
+   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+diff --git a/tdutils/generate/CMakeLists.txt b/tdutils/generate/CMakeLists.txt
+index 9eca574a..72e51c9a 100644
+--- a/tdutils/generate/CMakeLists.txt
++++ b/tdutils/generate/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(TDMIME_AUTO
+ 
+ add_custom_target(tdmime_auto DEPENDS ${TDMIME_SOURCE})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(GPERF_EXECUTABLE gperf)
+   if (NOT GPERF_EXECUTABLE)
+     message(FATAL_ERROR "Could NOT find gperf. Add path to gperf executable to PATH environment variable or specify it manually using GPERF_EXECUTABLE option, i. e. 'cmake -DGPERF_EXECUTABLE:FILEPATH=\"<path to gperf executable>\"'.")
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
new file mode 100644
index 00000000000..021ae4e8475
--- /dev/null
+++ b/srcpkgs/libtd/template
@@ -0,0 +1,30 @@
+# Template file for 'libtd'
+pkgname=libtd
+version=1.6.6
+revision=1
+_commit=c78fbe4bc5e31395e08f916816704e8051f27296
+wrksrc="td-${_commit}"
+build_style=cmake
+build_helper=qemu
+hostmakedepends="gperf"
+makedepends="libressl-devel zlib-devel"
+short_desc="Cross-platform library for building Telegram clients"
+maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
+license="BSL-1.0"
+homepage="https://core.telegram.org/tdlib"
+distfiles="https://github.com/tdlib/td/archive/${_commit}.tar.gz"
+checksum=adb84e39d95c3cde8a70d47410acd91af3953fc6ebbca152a1afbef9c7135e1e
+patch_args="-Np1"
+
+case "$XBPS_TARGET_MACHINE" in
+	(arm*) makedepends+=" libatomic-devel" ;;
+esac
+
+libtd-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.a"
+		vmove usr/include
+		vmove usr/lib/cmake
+	}
+}

From dd5d8ee9b323424affba7b8369917015683476c2 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Thu, 23 Jul 2020 01:17:26 +0300
Subject: [PATCH 2/3] WIP: libtd: link libatomic using configure_args

---
 srcpkgs/libtd/patches/cross-compiling.patch | 14 +-------------
 srcpkgs/libtd/template                      |  7 ++++---
 2 files changed, 5 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 srcpkgs/libtd/template

diff --git a/srcpkgs/libtd/patches/cross-compiling.patch b/srcpkgs/libtd/patches/cross-compiling.patch
index b1273726cd2..c2b2333fb85 100644
--- a/srcpkgs/libtd/patches/cross-compiling.patch
+++ b/srcpkgs/libtd/patches/cross-compiling.patch
@@ -83,7 +83,7 @@ index 9a80b6cf..8cc9b0f5 100644
    target_link_libraries(binlog_dump PRIVATE tddb)
  endif()
 diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
-index d57d93c8..89c1a21c 100644
+index d57d93c8..8150188c 100644
 --- a/tdutils/CMakeLists.txt
 +++ b/tdutils/CMakeLists.txt
 @@ -291,7 +291,7 @@ if (WIN32)
@@ -95,18 +95,6 @@ index d57d93c8..89c1a21c 100644
    add_dependencies(tdutils tdmime_auto)
  endif()
  
-@@ -329,6 +329,11 @@ if (CMAKE_HOST_SYSTEM_NAME MATCHES "NetBSD")
-   target_link_libraries(tdutils PUBLIC /usr/pkg/gcc5/i486--netbsdelf/lib/libatomic.so)
- endif()
- 
-+# armv6l missing atomic operations without libatomic
-+if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm")
-+  target_link_libraries(tdutils PUBLIC atomic)
-+endif()
-+
- install(TARGETS tdutils EXPORT TdTargets
-   LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-   ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
 diff --git a/tdutils/generate/CMakeLists.txt b/tdutils/generate/CMakeLists.txt
 index 9eca574a..72e51c9a 100644
 --- a/tdutils/generate/CMakeLists.txt
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
old mode 100644
new mode 100755
index 021ae4e8475..e21f11ff933
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -16,9 +16,10 @@ distfiles="https://github.com/tdlib/td/archive/${_commit}.tar.gz"
 checksum=adb84e39d95c3cde8a70d47410acd91af3953fc6ebbca152a1afbef9c7135e1e
 patch_args="-Np1"
 
-case "$XBPS_TARGET_MACHINE" in
-	(arm*) makedepends+=" libatomic-devel" ;;
-esac
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	configure_args+=" -DCMAKE_CXX_STADARD_LIBRARIES=-latomic"
+	makedepends+=" libatomic-devel"
+fi
 
 libtd-devel_package() {
 	short_desc+=" - development files"

From 1b9c335a5d6d5f7d0a543252425651d9b6d4c38d Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Thu, 23 Jul 2020 04:27:02 +0300
Subject: [PATCH 3/3] WIP: libtd: fix typo

---
 srcpkgs/libtd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index e21f11ff933..7d26c590943 100755
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -17,7 +17,7 @@ checksum=adb84e39d95c3cde8a70d47410acd91af3953fc6ebbca152a1afbef9c7135e1e
 patch_args="-Np1"
 
 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	configure_args+=" -DCMAKE_CXX_STADARD_LIBRARIES=-latomic"
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
 	makedepends+=" libatomic-devel"
 fi
 

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (9 preceding siblings ...)
  2020-07-23  1:52 ` [PR PATCH] [Updated] " sirikid
@ 2020-07-23  6:03 ` sirikid
  2020-07-24 16:32 ` [PR PATCH] [Updated] " sirikid
                   ` (15 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-23  6:03 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 274 bytes --]

New review comment by sirikid on void-packages repository

https://github.com/void-linux/void-packages/pull/23645#discussion_r459230182

Comment:
> Using Chocimier's suggestion, patch is unnecessary, right?

No, the patch is still needed to ignore `CMAKE_CROSSCOMPILING`.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (10 preceding siblings ...)
  2020-07-23  6:03 ` [PR REVIEW] " sirikid
@ 2020-07-24 16:32 ` sirikid
  2020-07-24 16:33 ` sirikid
                   ` (14 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-24 16:32 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

There is an updated pull request by sirikid against master on the void-packages repository

https://github.com/sirikid/void-packages package/libtd
https://github.com/void-linux/void-packages/pull/23645

New package: libtd-1.6.6
Pretty ugly patch, but their cross compilation is super cursed.

A patch file from https://github.com/void-linux/void-packages/pull/23645.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/libtd-23645.patch --]
[-- Type: text/x-diff, Size: 6604 bytes --]

From b32e5e1e7eed5d9a186bc83c3d7492187048a8f6 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Thu, 16 Jul 2020 14:03:58 +0300
Subject: [PATCH] New package: libtd-1.6.6

---
 common/shlibs                               |   1 +
 srcpkgs/libtd-devel                         |   1 +
 srcpkgs/libtd/patches/cross-compiling.patch | 110 ++++++++++++++++++++
 srcpkgs/libtd/template                      |  31 ++++++
 4 files changed, 143 insertions(+)
 create mode 120000 srcpkgs/libtd-devel
 create mode 100644 srcpkgs/libtd/patches/cross-compiling.patch
 create mode 100755 srcpkgs/libtd/template

diff --git a/common/shlibs b/common/shlibs
index 75bf83002d5..c843e644ec7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3975,3 +3975,4 @@ libtexlua53.so.5 texlive-LuaTeX-20200406_1
 libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
+libtdjson.so.1.6.6 libtd-1.6.6_1
diff --git a/srcpkgs/libtd-devel b/srcpkgs/libtd-devel
new file mode 120000
index 00000000000..ee1a79b2bad
--- /dev/null
+++ b/srcpkgs/libtd-devel
@@ -0,0 +1 @@
+libtd
\ No newline at end of file
diff --git a/srcpkgs/libtd/patches/cross-compiling.patch b/srcpkgs/libtd/patches/cross-compiling.patch
new file mode 100644
index 00000000000..c2b2333fb85
--- /dev/null
+++ b/srcpkgs/libtd/patches/cross-compiling.patch
@@ -0,0 +1,110 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46524dba..5b7265c4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -261,7 +261,7 @@ add_subdirectory(tdutils)
+ 
+ add_subdirectory(td/generate)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_custom_target(prepare_cross_compiling DEPENDS tl_generate_common tdmime_auto tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_custom_target(remove_cpp_documentation
+@@ -785,7 +785,7 @@ target_include_directories(tdcore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURC
+ target_include_directories(tdcore SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
+ target_link_libraries(tdcore PUBLIC tdapi tdactor tdutils tdnet tddb PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdcore tl_generate_common)
+   if (TD_ENABLE_JNI)
+     add_dependencies(tdcore td_generate_java_api)
+@@ -813,7 +813,7 @@ if (TD_ENABLE_DOTNET)
+   target_include_directories(tddotnet PUBLIC
+     $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>
+   )
+-  if (NOT CMAKE_CROSSCOMPILING)
++  if (YES)
+     add_dependencies(tddotnet generate_dotnet_api)
+   endif()
+ 
+@@ -833,7 +833,7 @@ target_include_directories(tdc PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdc PRIVATE tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdc tl_generate_c)
+ endif()
+ 
+@@ -842,7 +842,7 @@ target_include_directories(tdjson_private PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdjson_private PUBLIC tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdjson_private tl_generate_common tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_dependencies(tdjson_private remove_cpp_documentation)
+@@ -899,7 +899,7 @@ if (EMSCRIPTEN)
+ endif()
+ 
+ #EXECUTABLES
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(tg_cli td/telegram/cli.cpp ${TL_TD_JSON_SOURCE})
+ 
+   if (NOT READLINE_FOUND)
+diff --git a/td/generate/CMakeLists.txt b/td/generate/CMakeLists.txt
+index adbaa266..49947baa 100644
+--- a/td/generate/CMakeLists.txt
++++ b/td/generate/CMakeLists.txt
+@@ -93,7 +93,7 @@ set(TL_GENERATE_JSON_SOURCE
+   tl_json_converter.h
+ )
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(PHP_EXECUTABLE php)
+ 
+   if ((CMAKE_SYSTEM_NAME MATCHES "FreeBSD") AND (CMAKE_SYSTEM_VERSION MATCHES "HBSD"))
+diff --git a/tddb/CMakeLists.txt b/tddb/CMakeLists.txt
+index 9a80b6cf..8cc9b0f5 100644
+--- a/tddb/CMakeLists.txt
++++ b/tddb/CMakeLists.txt
+@@ -48,7 +48,7 @@ add_library(tddb STATIC ${TDDB_SOURCE})
+ target_include_directories(tddb PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+ target_link_libraries(tddb PUBLIC tdactor tdutils PRIVATE tdsqlite)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(binlog_dump td/db/binlog/binlog_dump.cpp)
+   target_link_libraries(binlog_dump PRIVATE tddb)
+ endif()
+diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
+index d57d93c8..8150188c 100644
+--- a/tdutils/CMakeLists.txt
++++ b/tdutils/CMakeLists.txt
+@@ -291,7 +291,7 @@ if (WIN32)
+   # target_link_libraries(tdutils PRIVATE ${WS2_32_LIBRARY} ${MSWSOCK_LIBRARY})
+   target_link_libraries(tdutils PRIVATE ws2_32 Mswsock Normaliz)
+ endif()
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdutils tdmime_auto)
+ endif()
+ 
+diff --git a/tdutils/generate/CMakeLists.txt b/tdutils/generate/CMakeLists.txt
+index 9eca574a..72e51c9a 100644
+--- a/tdutils/generate/CMakeLists.txt
++++ b/tdutils/generate/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(TDMIME_AUTO
+ 
+ add_custom_target(tdmime_auto DEPENDS ${TDMIME_SOURCE})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(GPERF_EXECUTABLE gperf)
+   if (NOT GPERF_EXECUTABLE)
+     message(FATAL_ERROR "Could NOT find gperf. Add path to gperf executable to PATH environment variable or specify it manually using GPERF_EXECUTABLE option, i. e. 'cmake -DGPERF_EXECUTABLE:FILEPATH=\"<path to gperf executable>\"'.")
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
new file mode 100755
index 00000000000..7d26c590943
--- /dev/null
+++ b/srcpkgs/libtd/template
@@ -0,0 +1,31 @@
+# Template file for 'libtd'
+pkgname=libtd
+version=1.6.6
+revision=1
+_commit=c78fbe4bc5e31395e08f916816704e8051f27296
+wrksrc="td-${_commit}"
+build_style=cmake
+build_helper=qemu
+hostmakedepends="gperf"
+makedepends="libressl-devel zlib-devel"
+short_desc="Cross-platform library for building Telegram clients"
+maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
+license="BSL-1.0"
+homepage="https://core.telegram.org/tdlib"
+distfiles="https://github.com/tdlib/td/archive/${_commit}.tar.gz"
+checksum=adb84e39d95c3cde8a70d47410acd91af3953fc6ebbca152a1afbef9c7135e1e
+patch_args="-Np1"
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+	makedepends+=" libatomic-devel"
+fi
+
+libtd-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.a"
+		vmove usr/include
+		vmove usr/lib/cmake
+	}
+}

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (11 preceding siblings ...)
  2020-07-24 16:32 ` [PR PATCH] [Updated] " sirikid
@ 2020-07-24 16:33 ` sirikid
  2020-07-25  4:46 ` [PR REVIEW] " sgn
                   ` (13 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-24 16:33 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

There is an updated pull request by sirikid against master on the void-packages repository

https://github.com/sirikid/void-packages package/libtd
https://github.com/void-linux/void-packages/pull/23645

New package: libtd-1.6.6
Pretty ugly patch, but their cross compilation is super cursed.

A patch file from https://github.com/void-linux/void-packages/pull/23645.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/libtd-23645.patch --]
[-- Type: text/x-diff, Size: 6604 bytes --]

From b15a5337e97d33b903e579bd765029dedeb78aad Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Thu, 16 Jul 2020 14:03:58 +0300
Subject: [PATCH] New package: libtd-1.6.6

---
 common/shlibs                               |   1 +
 srcpkgs/libtd-devel                         |   1 +
 srcpkgs/libtd/patches/cross-compiling.patch | 110 ++++++++++++++++++++
 srcpkgs/libtd/template                      |  31 ++++++
 4 files changed, 143 insertions(+)
 create mode 120000 srcpkgs/libtd-devel
 create mode 100644 srcpkgs/libtd/patches/cross-compiling.patch
 create mode 100755 srcpkgs/libtd/template

diff --git a/common/shlibs b/common/shlibs
index ef2869d632e..8353f0931f7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3975,3 +3975,4 @@ libtexlua53.so.5 texlive-LuaTeX-20200406_1
 libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
+libtdjson.so.1.6.6 libtd-1.6.6_1
diff --git a/srcpkgs/libtd-devel b/srcpkgs/libtd-devel
new file mode 120000
index 00000000000..ee1a79b2bad
--- /dev/null
+++ b/srcpkgs/libtd-devel
@@ -0,0 +1 @@
+libtd
\ No newline at end of file
diff --git a/srcpkgs/libtd/patches/cross-compiling.patch b/srcpkgs/libtd/patches/cross-compiling.patch
new file mode 100644
index 00000000000..c2b2333fb85
--- /dev/null
+++ b/srcpkgs/libtd/patches/cross-compiling.patch
@@ -0,0 +1,110 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46524dba..5b7265c4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -261,7 +261,7 @@ add_subdirectory(tdutils)
+ 
+ add_subdirectory(td/generate)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_custom_target(prepare_cross_compiling DEPENDS tl_generate_common tdmime_auto tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_custom_target(remove_cpp_documentation
+@@ -785,7 +785,7 @@ target_include_directories(tdcore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURC
+ target_include_directories(tdcore SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
+ target_link_libraries(tdcore PUBLIC tdapi tdactor tdutils tdnet tddb PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdcore tl_generate_common)
+   if (TD_ENABLE_JNI)
+     add_dependencies(tdcore td_generate_java_api)
+@@ -813,7 +813,7 @@ if (TD_ENABLE_DOTNET)
+   target_include_directories(tddotnet PUBLIC
+     $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>
+   )
+-  if (NOT CMAKE_CROSSCOMPILING)
++  if (YES)
+     add_dependencies(tddotnet generate_dotnet_api)
+   endif()
+ 
+@@ -833,7 +833,7 @@ target_include_directories(tdc PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdc PRIVATE tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdc tl_generate_c)
+ endif()
+ 
+@@ -842,7 +842,7 @@ target_include_directories(tdjson_private PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdjson_private PUBLIC tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdjson_private tl_generate_common tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_dependencies(tdjson_private remove_cpp_documentation)
+@@ -899,7 +899,7 @@ if (EMSCRIPTEN)
+ endif()
+ 
+ #EXECUTABLES
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(tg_cli td/telegram/cli.cpp ${TL_TD_JSON_SOURCE})
+ 
+   if (NOT READLINE_FOUND)
+diff --git a/td/generate/CMakeLists.txt b/td/generate/CMakeLists.txt
+index adbaa266..49947baa 100644
+--- a/td/generate/CMakeLists.txt
++++ b/td/generate/CMakeLists.txt
+@@ -93,7 +93,7 @@ set(TL_GENERATE_JSON_SOURCE
+   tl_json_converter.h
+ )
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(PHP_EXECUTABLE php)
+ 
+   if ((CMAKE_SYSTEM_NAME MATCHES "FreeBSD") AND (CMAKE_SYSTEM_VERSION MATCHES "HBSD"))
+diff --git a/tddb/CMakeLists.txt b/tddb/CMakeLists.txt
+index 9a80b6cf..8cc9b0f5 100644
+--- a/tddb/CMakeLists.txt
++++ b/tddb/CMakeLists.txt
+@@ -48,7 +48,7 @@ add_library(tddb STATIC ${TDDB_SOURCE})
+ target_include_directories(tddb PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+ target_link_libraries(tddb PUBLIC tdactor tdutils PRIVATE tdsqlite)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(binlog_dump td/db/binlog/binlog_dump.cpp)
+   target_link_libraries(binlog_dump PRIVATE tddb)
+ endif()
+diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
+index d57d93c8..8150188c 100644
+--- a/tdutils/CMakeLists.txt
++++ b/tdutils/CMakeLists.txt
+@@ -291,7 +291,7 @@ if (WIN32)
+   # target_link_libraries(tdutils PRIVATE ${WS2_32_LIBRARY} ${MSWSOCK_LIBRARY})
+   target_link_libraries(tdutils PRIVATE ws2_32 Mswsock Normaliz)
+ endif()
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdutils tdmime_auto)
+ endif()
+ 
+diff --git a/tdutils/generate/CMakeLists.txt b/tdutils/generate/CMakeLists.txt
+index 9eca574a..72e51c9a 100644
+--- a/tdutils/generate/CMakeLists.txt
++++ b/tdutils/generate/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(TDMIME_AUTO
+ 
+ add_custom_target(tdmime_auto DEPENDS ${TDMIME_SOURCE})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(GPERF_EXECUTABLE gperf)
+   if (NOT GPERF_EXECUTABLE)
+     message(FATAL_ERROR "Could NOT find gperf. Add path to gperf executable to PATH environment variable or specify it manually using GPERF_EXECUTABLE option, i. e. 'cmake -DGPERF_EXECUTABLE:FILEPATH=\"<path to gperf executable>\"'.")
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
new file mode 100755
index 00000000000..7d26c590943
--- /dev/null
+++ b/srcpkgs/libtd/template
@@ -0,0 +1,31 @@
+# Template file for 'libtd'
+pkgname=libtd
+version=1.6.6
+revision=1
+_commit=c78fbe4bc5e31395e08f916816704e8051f27296
+wrksrc="td-${_commit}"
+build_style=cmake
+build_helper=qemu
+hostmakedepends="gperf"
+makedepends="libressl-devel zlib-devel"
+short_desc="Cross-platform library for building Telegram clients"
+maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
+license="BSL-1.0"
+homepage="https://core.telegram.org/tdlib"
+distfiles="https://github.com/tdlib/td/archive/${_commit}.tar.gz"
+checksum=adb84e39d95c3cde8a70d47410acd91af3953fc6ebbca152a1afbef9c7135e1e
+patch_args="-Np1"
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+	makedepends+=" libatomic-devel"
+fi
+
+libtd-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.a"
+		vmove usr/include
+		vmove usr/lib/cmake
+	}
+}

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (12 preceding siblings ...)
  2020-07-24 16:33 ` sirikid
@ 2020-07-25  4:46 ` sgn
  2020-07-25 22:14 ` sirikid
                   ` (12 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sgn @ 2020-07-25  4:46 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 188 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/23645#discussion_r460364661

Comment:
I was talking about your change for ATOMIC ;)

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (13 preceding siblings ...)
  2020-07-25  4:46 ` [PR REVIEW] " sgn
@ 2020-07-25 22:14 ` sirikid
  2020-07-25 22:16 ` sirikid
                   ` (11 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-25 22:14 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New review comment by sirikid on void-packages repository

https://github.com/void-linux/void-packages/pull/23645#discussion_r460451791

Comment:
It goes without saying. Thanks for your work.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (14 preceding siblings ...)
  2020-07-25 22:14 ` sirikid
@ 2020-07-25 22:16 ` sirikid
  2020-07-26 16:13 ` sirikid
                   ` (10 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-25 22:16 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 192 bytes --]

New review comment by sirikid on void-packages repository

https://github.com/void-linux/void-packages/pull/23645#discussion_r460451791

Comment:
It goes without saying. Thanks for your work.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (15 preceding siblings ...)
  2020-07-25 22:16 ` sirikid
@ 2020-07-26 16:13 ` sirikid
  2020-07-27 12:37 ` [PR PATCH] [Updated] " sirikid
                   ` (9 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-26 16:13 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 159 bytes --]

New review comment by sirikid on void-packages repository

https://github.com/void-linux/void-packages/pull/23645#discussion_r460545320

Comment:
Already done

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (16 preceding siblings ...)
  2020-07-26 16:13 ` sirikid
@ 2020-07-27 12:37 ` sirikid
  2020-07-27 12:41 ` sirikid
                   ` (8 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-27 12:37 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

There is an updated pull request by sirikid against master on the void-packages repository

https://github.com/sirikid/void-packages package/libtd
https://github.com/void-linux/void-packages/pull/23645

New package: libtd-1.6.6
Pretty ugly patch, but their cross compilation is super cursed.

A patch file from https://github.com/void-linux/void-packages/pull/23645.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/libtd-23645.patch --]
[-- Type: text/x-diff, Size: 6587 bytes --]

From cbbbca3a0f8fec88bb980e5f90b90ceeb4c4e4d6 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Thu, 16 Jul 2020 14:03:58 +0300
Subject: [PATCH] New package: libtd-1.6.6

---
 common/shlibs                               |   1 +
 srcpkgs/libtd-devel                         |   1 +
 srcpkgs/libtd/patches/cross-compiling.patch | 110 ++++++++++++++++++++
 srcpkgs/libtd/template                      |  31 ++++++
 4 files changed, 143 insertions(+)
 create mode 120000 srcpkgs/libtd-devel
 create mode 100644 srcpkgs/libtd/patches/cross-compiling.patch
 create mode 100755 srcpkgs/libtd/template

diff --git a/common/shlibs b/common/shlibs
index 61d5531b0a2..90d6c918efd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3976,3 +3976,4 @@ libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
+libtdjson.so.1.6.6 libtd-1.6.6_1
diff --git a/srcpkgs/libtd-devel b/srcpkgs/libtd-devel
new file mode 120000
index 00000000000..ee1a79b2bad
--- /dev/null
+++ b/srcpkgs/libtd-devel
@@ -0,0 +1 @@
+libtd
\ No newline at end of file
diff --git a/srcpkgs/libtd/patches/cross-compiling.patch b/srcpkgs/libtd/patches/cross-compiling.patch
new file mode 100644
index 00000000000..c2b2333fb85
--- /dev/null
+++ b/srcpkgs/libtd/patches/cross-compiling.patch
@@ -0,0 +1,110 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46524dba..5b7265c4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -261,7 +261,7 @@ add_subdirectory(tdutils)
+ 
+ add_subdirectory(td/generate)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_custom_target(prepare_cross_compiling DEPENDS tl_generate_common tdmime_auto tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_custom_target(remove_cpp_documentation
+@@ -785,7 +785,7 @@ target_include_directories(tdcore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURC
+ target_include_directories(tdcore SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
+ target_link_libraries(tdcore PUBLIC tdapi tdactor tdutils tdnet tddb PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdcore tl_generate_common)
+   if (TD_ENABLE_JNI)
+     add_dependencies(tdcore td_generate_java_api)
+@@ -813,7 +813,7 @@ if (TD_ENABLE_DOTNET)
+   target_include_directories(tddotnet PUBLIC
+     $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>
+   )
+-  if (NOT CMAKE_CROSSCOMPILING)
++  if (YES)
+     add_dependencies(tddotnet generate_dotnet_api)
+   endif()
+ 
+@@ -833,7 +833,7 @@ target_include_directories(tdc PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdc PRIVATE tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdc tl_generate_c)
+ endif()
+ 
+@@ -842,7 +842,7 @@ target_include_directories(tdjson_private PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdjson_private PUBLIC tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdjson_private tl_generate_common tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_dependencies(tdjson_private remove_cpp_documentation)
+@@ -899,7 +899,7 @@ if (EMSCRIPTEN)
+ endif()
+ 
+ #EXECUTABLES
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(tg_cli td/telegram/cli.cpp ${TL_TD_JSON_SOURCE})
+ 
+   if (NOT READLINE_FOUND)
+diff --git a/td/generate/CMakeLists.txt b/td/generate/CMakeLists.txt
+index adbaa266..49947baa 100644
+--- a/td/generate/CMakeLists.txt
++++ b/td/generate/CMakeLists.txt
+@@ -93,7 +93,7 @@ set(TL_GENERATE_JSON_SOURCE
+   tl_json_converter.h
+ )
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(PHP_EXECUTABLE php)
+ 
+   if ((CMAKE_SYSTEM_NAME MATCHES "FreeBSD") AND (CMAKE_SYSTEM_VERSION MATCHES "HBSD"))
+diff --git a/tddb/CMakeLists.txt b/tddb/CMakeLists.txt
+index 9a80b6cf..8cc9b0f5 100644
+--- a/tddb/CMakeLists.txt
++++ b/tddb/CMakeLists.txt
+@@ -48,7 +48,7 @@ add_library(tddb STATIC ${TDDB_SOURCE})
+ target_include_directories(tddb PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+ target_link_libraries(tddb PUBLIC tdactor tdutils PRIVATE tdsqlite)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(binlog_dump td/db/binlog/binlog_dump.cpp)
+   target_link_libraries(binlog_dump PRIVATE tddb)
+ endif()
+diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
+index d57d93c8..8150188c 100644
+--- a/tdutils/CMakeLists.txt
++++ b/tdutils/CMakeLists.txt
+@@ -291,7 +291,7 @@ if (WIN32)
+   # target_link_libraries(tdutils PRIVATE ${WS2_32_LIBRARY} ${MSWSOCK_LIBRARY})
+   target_link_libraries(tdutils PRIVATE ws2_32 Mswsock Normaliz)
+ endif()
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdutils tdmime_auto)
+ endif()
+ 
+diff --git a/tdutils/generate/CMakeLists.txt b/tdutils/generate/CMakeLists.txt
+index 9eca574a..72e51c9a 100644
+--- a/tdutils/generate/CMakeLists.txt
++++ b/tdutils/generate/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(TDMIME_AUTO
+ 
+ add_custom_target(tdmime_auto DEPENDS ${TDMIME_SOURCE})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(GPERF_EXECUTABLE gperf)
+   if (NOT GPERF_EXECUTABLE)
+     message(FATAL_ERROR "Could NOT find gperf. Add path to gperf executable to PATH environment variable or specify it manually using GPERF_EXECUTABLE option, i. e. 'cmake -DGPERF_EXECUTABLE:FILEPATH=\"<path to gperf executable>\"'.")
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
new file mode 100755
index 00000000000..7d26c590943
--- /dev/null
+++ b/srcpkgs/libtd/template
@@ -0,0 +1,31 @@
+# Template file for 'libtd'
+pkgname=libtd
+version=1.6.6
+revision=1
+_commit=c78fbe4bc5e31395e08f916816704e8051f27296
+wrksrc="td-${_commit}"
+build_style=cmake
+build_helper=qemu
+hostmakedepends="gperf"
+makedepends="libressl-devel zlib-devel"
+short_desc="Cross-platform library for building Telegram clients"
+maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
+license="BSL-1.0"
+homepage="https://core.telegram.org/tdlib"
+distfiles="https://github.com/tdlib/td/archive/${_commit}.tar.gz"
+checksum=adb84e39d95c3cde8a70d47410acd91af3953fc6ebbca152a1afbef9c7135e1e
+patch_args="-Np1"
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+	makedepends+=" libatomic-devel"
+fi
+
+libtd-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.a"
+		vmove usr/include
+		vmove usr/lib/cmake
+	}
+}

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (17 preceding siblings ...)
  2020-07-27 12:37 ` [PR PATCH] [Updated] " sirikid
@ 2020-07-27 12:41 ` sirikid
  2020-07-27 13:26 ` [PR REVIEW] " ericonr
                   ` (7 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-27 12:41 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

New comment by sirikid on void-packages repository

https://github.com/void-linux/void-packages/pull/23645#issuecomment-664371780

Comment:
I keep rebasing because there are new conflicts in shlibs, but the package is complete.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (18 preceding siblings ...)
  2020-07-27 12:41 ` sirikid
@ 2020-07-27 13:26 ` ericonr
  2020-07-27 13:26 ` ericonr
                   ` (6 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-07-27 13:26 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 229 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23645#discussion_r460885647

Comment:
Could this patch be replaced by a `vsed` command? Would make updates much simpler.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (19 preceding siblings ...)
  2020-07-27 13:26 ` [PR REVIEW] " ericonr
@ 2020-07-27 13:26 ` ericonr
  2020-07-27 13:26 ` ericonr
                   ` (5 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-07-27 13:26 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 251 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23645#discussion_r460886129

Comment:
You can put this in the middle of the file (e.g. close to related libs) to avoid conflicts all the time.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (20 preceding siblings ...)
  2020-07-27 13:26 ` ericonr
@ 2020-07-27 13:26 ` ericonr
  2020-07-27 15:09 ` [PR PATCH] [Updated] " sirikid
                   ` (4 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2020-07-27 13:26 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23645#discussion_r460887759

Comment:
This should at least depend on the sourcepkg, and possibly also `makedepends`. Do you need to have `libressl-devel` and/or `zlib-devel` in order to develop and link against this library?

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (21 preceding siblings ...)
  2020-07-27 13:26 ` ericonr
@ 2020-07-27 15:09 ` sirikid
  2020-07-27 15:09 ` sirikid
                   ` (3 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-27 15:09 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

There is an updated pull request by sirikid against master on the void-packages repository

https://github.com/sirikid/void-packages package/libtd
https://github.com/void-linux/void-packages/pull/23645

New package: libtd-1.6.6
Pretty ugly patch, but their cross compilation is super cursed.

A patch file from https://github.com/void-linux/void-packages/pull/23645.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/libtd-23645.patch --]
[-- Type: text/x-diff, Size: 13392 bytes --]

From cbbbca3a0f8fec88bb980e5f90b90ceeb4c4e4d6 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Thu, 16 Jul 2020 14:03:58 +0300
Subject: [PATCH 1/3] New package: libtd-1.6.6

---
 common/shlibs                               |   1 +
 srcpkgs/libtd-devel                         |   1 +
 srcpkgs/libtd/patches/cross-compiling.patch | 110 ++++++++++++++++++++
 srcpkgs/libtd/template                      |  31 ++++++
 4 files changed, 143 insertions(+)
 create mode 120000 srcpkgs/libtd-devel
 create mode 100644 srcpkgs/libtd/patches/cross-compiling.patch
 create mode 100755 srcpkgs/libtd/template

diff --git a/common/shlibs b/common/shlibs
index 61d5531b0a2..90d6c918efd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3976,3 +3976,4 @@ libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
+libtdjson.so.1.6.6 libtd-1.6.6_1
diff --git a/srcpkgs/libtd-devel b/srcpkgs/libtd-devel
new file mode 120000
index 00000000000..ee1a79b2bad
--- /dev/null
+++ b/srcpkgs/libtd-devel
@@ -0,0 +1 @@
+libtd
\ No newline at end of file
diff --git a/srcpkgs/libtd/patches/cross-compiling.patch b/srcpkgs/libtd/patches/cross-compiling.patch
new file mode 100644
index 00000000000..c2b2333fb85
--- /dev/null
+++ b/srcpkgs/libtd/patches/cross-compiling.patch
@@ -0,0 +1,110 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46524dba..5b7265c4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -261,7 +261,7 @@ add_subdirectory(tdutils)
+ 
+ add_subdirectory(td/generate)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_custom_target(prepare_cross_compiling DEPENDS tl_generate_common tdmime_auto tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_custom_target(remove_cpp_documentation
+@@ -785,7 +785,7 @@ target_include_directories(tdcore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURC
+ target_include_directories(tdcore SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
+ target_link_libraries(tdcore PUBLIC tdapi tdactor tdutils tdnet tddb PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdcore tl_generate_common)
+   if (TD_ENABLE_JNI)
+     add_dependencies(tdcore td_generate_java_api)
+@@ -813,7 +813,7 @@ if (TD_ENABLE_DOTNET)
+   target_include_directories(tddotnet PUBLIC
+     $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>
+   )
+-  if (NOT CMAKE_CROSSCOMPILING)
++  if (YES)
+     add_dependencies(tddotnet generate_dotnet_api)
+   endif()
+ 
+@@ -833,7 +833,7 @@ target_include_directories(tdc PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdc PRIVATE tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdc tl_generate_c)
+ endif()
+ 
+@@ -842,7 +842,7 @@ target_include_directories(tdjson_private PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdjson_private PUBLIC tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdjson_private tl_generate_common tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_dependencies(tdjson_private remove_cpp_documentation)
+@@ -899,7 +899,7 @@ if (EMSCRIPTEN)
+ endif()
+ 
+ #EXECUTABLES
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(tg_cli td/telegram/cli.cpp ${TL_TD_JSON_SOURCE})
+ 
+   if (NOT READLINE_FOUND)
+diff --git a/td/generate/CMakeLists.txt b/td/generate/CMakeLists.txt
+index adbaa266..49947baa 100644
+--- a/td/generate/CMakeLists.txt
++++ b/td/generate/CMakeLists.txt
+@@ -93,7 +93,7 @@ set(TL_GENERATE_JSON_SOURCE
+   tl_json_converter.h
+ )
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(PHP_EXECUTABLE php)
+ 
+   if ((CMAKE_SYSTEM_NAME MATCHES "FreeBSD") AND (CMAKE_SYSTEM_VERSION MATCHES "HBSD"))
+diff --git a/tddb/CMakeLists.txt b/tddb/CMakeLists.txt
+index 9a80b6cf..8cc9b0f5 100644
+--- a/tddb/CMakeLists.txt
++++ b/tddb/CMakeLists.txt
+@@ -48,7 +48,7 @@ add_library(tddb STATIC ${TDDB_SOURCE})
+ target_include_directories(tddb PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+ target_link_libraries(tddb PUBLIC tdactor tdutils PRIVATE tdsqlite)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(binlog_dump td/db/binlog/binlog_dump.cpp)
+   target_link_libraries(binlog_dump PRIVATE tddb)
+ endif()
+diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
+index d57d93c8..8150188c 100644
+--- a/tdutils/CMakeLists.txt
++++ b/tdutils/CMakeLists.txt
+@@ -291,7 +291,7 @@ if (WIN32)
+   # target_link_libraries(tdutils PRIVATE ${WS2_32_LIBRARY} ${MSWSOCK_LIBRARY})
+   target_link_libraries(tdutils PRIVATE ws2_32 Mswsock Normaliz)
+ endif()
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdutils tdmime_auto)
+ endif()
+ 
+diff --git a/tdutils/generate/CMakeLists.txt b/tdutils/generate/CMakeLists.txt
+index 9eca574a..72e51c9a 100644
+--- a/tdutils/generate/CMakeLists.txt
++++ b/tdutils/generate/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(TDMIME_AUTO
+ 
+ add_custom_target(tdmime_auto DEPENDS ${TDMIME_SOURCE})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(GPERF_EXECUTABLE gperf)
+   if (NOT GPERF_EXECUTABLE)
+     message(FATAL_ERROR "Could NOT find gperf. Add path to gperf executable to PATH environment variable or specify it manually using GPERF_EXECUTABLE option, i. e. 'cmake -DGPERF_EXECUTABLE:FILEPATH=\"<path to gperf executable>\"'.")
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
new file mode 100755
index 00000000000..7d26c590943
--- /dev/null
+++ b/srcpkgs/libtd/template
@@ -0,0 +1,31 @@
+# Template file for 'libtd'
+pkgname=libtd
+version=1.6.6
+revision=1
+_commit=c78fbe4bc5e31395e08f916816704e8051f27296
+wrksrc="td-${_commit}"
+build_style=cmake
+build_helper=qemu
+hostmakedepends="gperf"
+makedepends="libressl-devel zlib-devel"
+short_desc="Cross-platform library for building Telegram clients"
+maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
+license="BSL-1.0"
+homepage="https://core.telegram.org/tdlib"
+distfiles="https://github.com/tdlib/td/archive/${_commit}.tar.gz"
+checksum=adb84e39d95c3cde8a70d47410acd91af3953fc6ebbca152a1afbef9c7135e1e
+patch_args="-Np1"
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+	makedepends+=" libatomic-devel"
+fi
+
+libtd-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.a"
+		vmove usr/include
+		vmove usr/lib/cmake
+	}
+}

From 7ad85cc64ccee3cb05ea709b202502ca16e8d4b9 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Mon, 27 Jul 2020 17:59:15 +0300
Subject: [PATCH 2/3] WIP: libtd

- use vsed instead of patch
- add libtd to libtd-devel dependencies
---
 srcpkgs/libtd/patches/cross-compiling.patch | 110 --------------------
 srcpkgs/libtd/template                      |   8 ++
 2 files changed, 8 insertions(+), 110 deletions(-)
 delete mode 100644 srcpkgs/libtd/patches/cross-compiling.patch

diff --git a/srcpkgs/libtd/patches/cross-compiling.patch b/srcpkgs/libtd/patches/cross-compiling.patch
deleted file mode 100644
index c2b2333fb85..00000000000
--- a/srcpkgs/libtd/patches/cross-compiling.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 46524dba..5b7265c4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -261,7 +261,7 @@ add_subdirectory(tdutils)
- 
- add_subdirectory(td/generate)
- 
--if (NOT CMAKE_CROSSCOMPILING)
-+if (YES)
-   add_custom_target(prepare_cross_compiling DEPENDS tl_generate_common tdmime_auto tl_generate_json)
-   if (TD_ENABLE_DOTNET)
-     add_custom_target(remove_cpp_documentation
-@@ -785,7 +785,7 @@ target_include_directories(tdcore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURC
- target_include_directories(tdcore SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
- target_link_libraries(tdcore PUBLIC tdapi tdactor tdutils tdnet tddb PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
- 
--if (NOT CMAKE_CROSSCOMPILING)
-+if (YES)
-   add_dependencies(tdcore tl_generate_common)
-   if (TD_ENABLE_JNI)
-     add_dependencies(tdcore td_generate_java_api)
-@@ -813,7 +813,7 @@ if (TD_ENABLE_DOTNET)
-   target_include_directories(tddotnet PUBLIC
-     $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>
-   )
--  if (NOT CMAKE_CROSSCOMPILING)
-+  if (YES)
-     add_dependencies(tddotnet generate_dotnet_api)
-   endif()
- 
-@@ -833,7 +833,7 @@ target_include_directories(tdc PUBLIC
-   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
- target_link_libraries(tdc PRIVATE tdclient tdutils)
--if (NOT CMAKE_CROSSCOMPILING)
-+if (YES)
-   add_dependencies(tdc tl_generate_c)
- endif()
- 
-@@ -842,7 +842,7 @@ target_include_directories(tdjson_private PUBLIC
-   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
- target_link_libraries(tdjson_private PUBLIC tdclient tdutils)
--if (NOT CMAKE_CROSSCOMPILING)
-+if (YES)
-   add_dependencies(tdjson_private tl_generate_common tl_generate_json)
-   if (TD_ENABLE_DOTNET)
-     add_dependencies(tdjson_private remove_cpp_documentation)
-@@ -899,7 +899,7 @@ if (EMSCRIPTEN)
- endif()
- 
- #EXECUTABLES
--if (NOT CMAKE_CROSSCOMPILING)
-+if (YES)
-   add_executable(tg_cli td/telegram/cli.cpp ${TL_TD_JSON_SOURCE})
- 
-   if (NOT READLINE_FOUND)
-diff --git a/td/generate/CMakeLists.txt b/td/generate/CMakeLists.txt
-index adbaa266..49947baa 100644
---- a/td/generate/CMakeLists.txt
-+++ b/td/generate/CMakeLists.txt
-@@ -93,7 +93,7 @@ set(TL_GENERATE_JSON_SOURCE
-   tl_json_converter.h
- )
- 
--if (NOT CMAKE_CROSSCOMPILING)
-+if (YES)
-   find_program(PHP_EXECUTABLE php)
- 
-   if ((CMAKE_SYSTEM_NAME MATCHES "FreeBSD") AND (CMAKE_SYSTEM_VERSION MATCHES "HBSD"))
-diff --git a/tddb/CMakeLists.txt b/tddb/CMakeLists.txt
-index 9a80b6cf..8cc9b0f5 100644
---- a/tddb/CMakeLists.txt
-+++ b/tddb/CMakeLists.txt
-@@ -48,7 +48,7 @@ add_library(tddb STATIC ${TDDB_SOURCE})
- target_include_directories(tddb PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
- target_link_libraries(tddb PUBLIC tdactor tdutils PRIVATE tdsqlite)
- 
--if (NOT CMAKE_CROSSCOMPILING)
-+if (YES)
-   add_executable(binlog_dump td/db/binlog/binlog_dump.cpp)
-   target_link_libraries(binlog_dump PRIVATE tddb)
- endif()
-diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
-index d57d93c8..8150188c 100644
---- a/tdutils/CMakeLists.txt
-+++ b/tdutils/CMakeLists.txt
-@@ -291,7 +291,7 @@ if (WIN32)
-   # target_link_libraries(tdutils PRIVATE ${WS2_32_LIBRARY} ${MSWSOCK_LIBRARY})
-   target_link_libraries(tdutils PRIVATE ws2_32 Mswsock Normaliz)
- endif()
--if (NOT CMAKE_CROSSCOMPILING)
-+if (YES)
-   add_dependencies(tdutils tdmime_auto)
- endif()
- 
-diff --git a/tdutils/generate/CMakeLists.txt b/tdutils/generate/CMakeLists.txt
-index 9eca574a..72e51c9a 100644
---- a/tdutils/generate/CMakeLists.txt
-+++ b/tdutils/generate/CMakeLists.txt
-@@ -16,7 +16,7 @@ set(TDMIME_AUTO
- 
- add_custom_target(tdmime_auto DEPENDS ${TDMIME_SOURCE})
- 
--if (NOT CMAKE_CROSSCOMPILING)
-+if (YES)
-   find_program(GPERF_EXECUTABLE gperf)
-   if (NOT GPERF_EXECUTABLE)
-     message(FATAL_ERROR "Could NOT find gperf. Add path to gperf executable to PATH environment variable or specify it manually using GPERF_EXECUTABLE option, i. e. 'cmake -DGPERF_EXECUTABLE:FILEPATH=\"<path to gperf executable>\"'.")
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
index 7d26c590943..ab683a5a321 100755
--- a/srcpkgs/libtd/template
+++ b/srcpkgs/libtd/template
@@ -21,8 +21,16 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
+pre_configure() {
+	vsed -e 's/NOT CMAKE_CROSSCOMPILING/YES/g' -e CMakeLists.txt \
+		-e td/generate/CMakeLists.txt -e tdactor/CMakeLists.txt \
+		-e tddb/CMakeLists.txt -e tdutils/CMakeLists.txt \
+		-e tdutils/generate/CMakeLists.txt -e test/CMakeLists.txt
+}
+
 libtd-devel_package() {
 	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove "usr/lib/*.a"
 		vmove usr/include

From aebf803839b5d690d42bf2ca614658b7883160ea Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Mon, 27 Jul 2020 18:08:39 +0300
Subject: [PATCH 3/3] New package: telega-0.6.28

---
 srcpkgs/telega/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100755 srcpkgs/telega/template

diff --git a/srcpkgs/telega/template b/srcpkgs/telega/template
new file mode 100755
index 00000000000..113575d89fb
--- /dev/null
+++ b/srcpkgs/telega/template
@@ -0,0 +1,22 @@
+# Template file for 'telega'
+pkgname=telega
+version=0.6.28
+revision=1
+#archs="i686 x86_64"
+wrksrc="telega.el-${version}"
+#create_wrksrc=yes
+build_style=gnu-makefile
+#configure_args=""
+#make_build_args=""
+#make_install_args=""
+#conf_files=""
+#make_dirs="/var/log/dir 0755 root root"
+hostmakedepends=""
+makedepends="libtd-devel"
+depends=""
+short_desc="GNU Emacs telegram client (unofficial)"
+maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/zevlg/telega.el"
+distfiles="https://github.com/zevlg/telega.el/archive/v${version}.tar.gz"
+checksum=47c42fd1f4f36485067cce488e4eb4ee7a60692f8ce77d5da07b1fb69ab2ffe5

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (22 preceding siblings ...)
  2020-07-27 15:09 ` [PR PATCH] [Updated] " sirikid
@ 2020-07-27 15:09 ` sirikid
  2020-07-30  3:44 ` [PR PATCH] [Updated] WIP: " sirikid
                   ` (2 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-27 15:09 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

There is an updated pull request by sirikid against master on the void-packages repository

https://github.com/sirikid/void-packages package/libtd
https://github.com/void-linux/void-packages/pull/23645

New package: libtd-1.6.6
Pretty ugly patch, but their cross compilation is super cursed.

A patch file from https://github.com/void-linux/void-packages/pull/23645.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/libtd-23645.patch --]
[-- Type: text/x-diff, Size: 6587 bytes --]

From cbbbca3a0f8fec88bb980e5f90b90ceeb4c4e4d6 Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Thu, 16 Jul 2020 14:03:58 +0300
Subject: [PATCH] New package: libtd-1.6.6

---
 common/shlibs                               |   1 +
 srcpkgs/libtd-devel                         |   1 +
 srcpkgs/libtd/patches/cross-compiling.patch | 110 ++++++++++++++++++++
 srcpkgs/libtd/template                      |  31 ++++++
 4 files changed, 143 insertions(+)
 create mode 120000 srcpkgs/libtd-devel
 create mode 100644 srcpkgs/libtd/patches/cross-compiling.patch
 create mode 100755 srcpkgs/libtd/template

diff --git a/common/shlibs b/common/shlibs
index 61d5531b0a2..90d6c918efd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3976,3 +3976,4 @@ libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
+libtdjson.so.1.6.6 libtd-1.6.6_1
diff --git a/srcpkgs/libtd-devel b/srcpkgs/libtd-devel
new file mode 120000
index 00000000000..ee1a79b2bad
--- /dev/null
+++ b/srcpkgs/libtd-devel
@@ -0,0 +1 @@
+libtd
\ No newline at end of file
diff --git a/srcpkgs/libtd/patches/cross-compiling.patch b/srcpkgs/libtd/patches/cross-compiling.patch
new file mode 100644
index 00000000000..c2b2333fb85
--- /dev/null
+++ b/srcpkgs/libtd/patches/cross-compiling.patch
@@ -0,0 +1,110 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 46524dba..5b7265c4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -261,7 +261,7 @@ add_subdirectory(tdutils)
+ 
+ add_subdirectory(td/generate)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_custom_target(prepare_cross_compiling DEPENDS tl_generate_common tdmime_auto tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_custom_target(remove_cpp_documentation
+@@ -785,7 +785,7 @@ target_include_directories(tdcore PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURC
+ target_include_directories(tdcore SYSTEM PRIVATE ${OPENSSL_INCLUDE_DIR})
+ target_link_libraries(tdcore PUBLIC tdapi tdactor tdutils tdnet tddb PRIVATE ${OPENSSL_CRYPTO_LIBRARY} ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdcore tl_generate_common)
+   if (TD_ENABLE_JNI)
+     add_dependencies(tdcore td_generate_java_api)
+@@ -813,7 +813,7 @@ if (TD_ENABLE_DOTNET)
+   target_include_directories(tddotnet PUBLIC
+     $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>
+   )
+-  if (NOT CMAKE_CROSSCOMPILING)
++  if (YES)
+     add_dependencies(tddotnet generate_dotnet_api)
+   endif()
+ 
+@@ -833,7 +833,7 @@ target_include_directories(tdc PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdc PRIVATE tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdc tl_generate_c)
+ endif()
+ 
+@@ -842,7 +842,7 @@ target_include_directories(tdjson_private PUBLIC
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+   $<BUILD_INTERFACE:${TL_TD_AUTO_INCLUDE_DIR}>)
+ target_link_libraries(tdjson_private PUBLIC tdclient tdutils)
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdjson_private tl_generate_common tl_generate_json)
+   if (TD_ENABLE_DOTNET)
+     add_dependencies(tdjson_private remove_cpp_documentation)
+@@ -899,7 +899,7 @@ if (EMSCRIPTEN)
+ endif()
+ 
+ #EXECUTABLES
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(tg_cli td/telegram/cli.cpp ${TL_TD_JSON_SOURCE})
+ 
+   if (NOT READLINE_FOUND)
+diff --git a/td/generate/CMakeLists.txt b/td/generate/CMakeLists.txt
+index adbaa266..49947baa 100644
+--- a/td/generate/CMakeLists.txt
++++ b/td/generate/CMakeLists.txt
+@@ -93,7 +93,7 @@ set(TL_GENERATE_JSON_SOURCE
+   tl_json_converter.h
+ )
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(PHP_EXECUTABLE php)
+ 
+   if ((CMAKE_SYSTEM_NAME MATCHES "FreeBSD") AND (CMAKE_SYSTEM_VERSION MATCHES "HBSD"))
+diff --git a/tddb/CMakeLists.txt b/tddb/CMakeLists.txt
+index 9a80b6cf..8cc9b0f5 100644
+--- a/tddb/CMakeLists.txt
++++ b/tddb/CMakeLists.txt
+@@ -48,7 +48,7 @@ add_library(tddb STATIC ${TDDB_SOURCE})
+ target_include_directories(tddb PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+ target_link_libraries(tddb PUBLIC tdactor tdutils PRIVATE tdsqlite)
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_executable(binlog_dump td/db/binlog/binlog_dump.cpp)
+   target_link_libraries(binlog_dump PRIVATE tddb)
+ endif()
+diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt
+index d57d93c8..8150188c 100644
+--- a/tdutils/CMakeLists.txt
++++ b/tdutils/CMakeLists.txt
+@@ -291,7 +291,7 @@ if (WIN32)
+   # target_link_libraries(tdutils PRIVATE ${WS2_32_LIBRARY} ${MSWSOCK_LIBRARY})
+   target_link_libraries(tdutils PRIVATE ws2_32 Mswsock Normaliz)
+ endif()
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   add_dependencies(tdutils tdmime_auto)
+ endif()
+ 
+diff --git a/tdutils/generate/CMakeLists.txt b/tdutils/generate/CMakeLists.txt
+index 9eca574a..72e51c9a 100644
+--- a/tdutils/generate/CMakeLists.txt
++++ b/tdutils/generate/CMakeLists.txt
+@@ -16,7 +16,7 @@ set(TDMIME_AUTO
+ 
+ add_custom_target(tdmime_auto DEPENDS ${TDMIME_SOURCE})
+ 
+-if (NOT CMAKE_CROSSCOMPILING)
++if (YES)
+   find_program(GPERF_EXECUTABLE gperf)
+   if (NOT GPERF_EXECUTABLE)
+     message(FATAL_ERROR "Could NOT find gperf. Add path to gperf executable to PATH environment variable or specify it manually using GPERF_EXECUTABLE option, i. e. 'cmake -DGPERF_EXECUTABLE:FILEPATH=\"<path to gperf executable>\"'.")
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
new file mode 100755
index 00000000000..7d26c590943
--- /dev/null
+++ b/srcpkgs/libtd/template
@@ -0,0 +1,31 @@
+# Template file for 'libtd'
+pkgname=libtd
+version=1.6.6
+revision=1
+_commit=c78fbe4bc5e31395e08f916816704e8051f27296
+wrksrc="td-${_commit}"
+build_style=cmake
+build_helper=qemu
+hostmakedepends="gperf"
+makedepends="libressl-devel zlib-devel"
+short_desc="Cross-platform library for building Telegram clients"
+maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
+license="BSL-1.0"
+homepage="https://core.telegram.org/tdlib"
+distfiles="https://github.com/tdlib/td/archive/${_commit}.tar.gz"
+checksum=adb84e39d95c3cde8a70d47410acd91af3953fc6ebbca152a1afbef9c7135e1e
+patch_args="-Np1"
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+	makedepends+=" libatomic-devel"
+fi
+
+libtd-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.a"
+		vmove usr/include
+		vmove usr/lib/cmake
+	}
+}

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] WIP: New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (23 preceding siblings ...)
  2020-07-27 15:09 ` sirikid
@ 2020-07-30  3:44 ` sirikid
  2020-07-31  9:02 ` [PR REVIEW] " sirikid
  2020-08-04  3:30 ` sirikid
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-30  3:44 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 388 bytes --]

There is an updated pull request by sirikid against master on the void-packages repository

https://github.com/sirikid/void-packages package/libtd
https://github.com/void-linux/void-packages/pull/23645

WIP: New package: libtd-1.6.6
Pretty ugly patch, but their cross compilation is super cursed.

A patch file from https://github.com/void-linux/void-packages/pull/23645.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-package/libtd-23645.patch --]
[-- Type: text/x-diff, Size: 2302 bytes --]

From 05fb0700298ebe16e7bdb40dd5b040464c432c6b Mon Sep 17 00:00:00 2001
From: Ivan Sokolov <ivan-p-sokolov@ya.ru>
Date: Thu, 16 Jul 2020 14:03:58 +0300
Subject: [PATCH] New package: libtd-1.6.6

---
 common/shlibs          |  1 +
 srcpkgs/libtd-devel    |  1 +
 srcpkgs/libtd/template | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+)
 create mode 120000 srcpkgs/libtd-devel
 create mode 100755 srcpkgs/libtd/template

diff --git a/common/shlibs b/common/shlibs
index a1abc82974e..57ca29f047c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3977,3 +3977,4 @@ libptexenc.so.1 texlive-20200406_1
 libdolphinvcs.so.5 dolphin-20.04.3_1
 libcglm.so.0 cglm-0.7.6_1
 libfcft.so.3 fcft-2.2.2_1
+libtdjson.so.1.6.6 libtd-1.6.6_1
diff --git a/srcpkgs/libtd-devel b/srcpkgs/libtd-devel
new file mode 120000
index 00000000000..ee1a79b2bad
--- /dev/null
+++ b/srcpkgs/libtd-devel
@@ -0,0 +1 @@
+libtd
\ No newline at end of file
diff --git a/srcpkgs/libtd/template b/srcpkgs/libtd/template
new file mode 100755
index 00000000000..d4fc8614a26
--- /dev/null
+++ b/srcpkgs/libtd/template
@@ -0,0 +1,38 @@
+# Template file for 'libtd'
+pkgname=libtd
+version=1.6.6
+revision=1
+_commit=c78fbe4bc5e31395e08f916816704e8051f27296
+wrksrc="td-${_commit}"
+build_style=cmake
+build_helper=qemu
+hostmakedepends="gperf"
+makedepends="libressl-devel zlib-devel"
+short_desc="Cross-platform library for building Telegram clients"
+maintainer="Ivan Sokolov <ivan-p-sokolov@ya.ru>"
+license="BSL-1.0"
+homepage="https://core.telegram.org/tdlib"
+distfiles="https://github.com/tdlib/td/archive/${_commit}.tar.gz"
+checksum=adb84e39d95c3cde8a70d47410acd91af3953fc6ebbca152a1afbef9c7135e1e
+
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	configure_args+=" -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic"
+	makedepends+=" libatomic-devel"
+fi
+
+pre_configure() {
+	vsed -e 's/NOT CMAKE_CROSSCOMPILING/YES/g' -i CMakeLists.txt \
+		-i td/generate/CMakeLists.txt -i tdactor/CMakeLists.txt \
+		-i tddb/CMakeLists.txt -i tdutils/CMakeLists.txt \
+		-i tdutils/generate/CMakeLists.txt -i test/CMakeLists.txt
+}
+
+libtd-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove "usr/lib/*.a"
+		vmove usr/include
+		vmove usr/lib/cmake
+	}
+}

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] WIP: New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (24 preceding siblings ...)
  2020-07-30  3:44 ` [PR PATCH] [Updated] WIP: " sirikid
@ 2020-07-31  9:02 ` sirikid
  2020-08-04  3:30 ` sirikid
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-07-31  9:02 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 222 bytes --]

New review comment by sirikid on void-packages repository

https://github.com/void-linux/void-packages/pull/23645#discussion_r463493031

Comment:
Added sourcepkg, libressl-devel and zlib-devel not needed as far as I know.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: New package: libtd-1.6.6
  2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
                   ` (25 preceding siblings ...)
  2020-07-31  9:02 ` [PR REVIEW] " sirikid
@ 2020-08-04  3:30 ` sirikid
  26 siblings, 0 replies; 28+ messages in thread
From: sirikid @ 2020-08-04  3:30 UTC (permalink / raw)
  To: ml


[-- Attachment #1: Type: text/plain, Size: 208 bytes --]

New comment by sirikid on void-packages repository

https://github.com/void-linux/void-packages/pull/23645#issuecomment-668359452

Comment:
> .so symlinks should go to -devel too, see libpng template

Done

^ permalink raw reply	[flat|nested] 28+ messages in thread

end of thread, back to index

Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-19  5:32 [PR PATCH] New package: libtd-1.6.0 sirikid
2020-07-19  7:42 ` [PR PATCH] [Updated] " sirikid
2020-07-19  8:29 ` sirikid
2020-07-19 10:30 ` New package: libtd-1.6.6 sirikid
2020-07-22 13:37 ` [PR REVIEW] " sgn
2020-07-22 14:21 ` sirikid
2020-07-22 20:41 ` Chocimier
2020-07-22 22:18 ` [PR PATCH] [Updated] " sirikid
2020-07-23  1:27 ` [PR PATCH] [Updated] WIP: " sirikid
2020-07-23  1:29 ` [PR REVIEW] " sgn
2020-07-23  1:52 ` [PR PATCH] [Updated] " sirikid
2020-07-23  6:03 ` [PR REVIEW] " sirikid
2020-07-24 16:32 ` [PR PATCH] [Updated] " sirikid
2020-07-24 16:33 ` sirikid
2020-07-25  4:46 ` [PR REVIEW] " sgn
2020-07-25 22:14 ` sirikid
2020-07-25 22:16 ` sirikid
2020-07-26 16:13 ` sirikid
2020-07-27 12:37 ` [PR PATCH] [Updated] " sirikid
2020-07-27 12:41 ` sirikid
2020-07-27 13:26 ` [PR REVIEW] " ericonr
2020-07-27 13:26 ` ericonr
2020-07-27 13:26 ` ericonr
2020-07-27 15:09 ` [PR PATCH] [Updated] " sirikid
2020-07-27 15:09 ` sirikid
2020-07-30  3:44 ` [PR PATCH] [Updated] WIP: " sirikid
2020-07-31  9:02 ` [PR REVIEW] " sirikid
2020-08-04  3:30 ` sirikid

Github messages for voidlinux

Archives are clonable: git clone --mirror http://inbox.vuxu.org/voidlinux-github

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git