From cbbbca3a0f8fec88bb980e5f90b90ceeb4c4e4d6 Mon Sep 17 00:00:00 2001 From: Ivan Sokolov 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 $ + ) +- if (NOT CMAKE_CROSSCOMPILING) ++ if (YES) + add_dependencies(tddotnet generate_dotnet_api) + endif() + +@@ -833,7 +833,7 @@ target_include_directories(tdc PUBLIC + $ + $) + 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 + $ + $) + 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 $) + 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=\"\"'.") 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 " +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 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 $ - ) -- if (NOT CMAKE_CROSSCOMPILING) -+ if (YES) - add_dependencies(tddotnet generate_dotnet_api) - endif() - -@@ -833,7 +833,7 @@ target_include_directories(tdc PUBLIC - $ - $) - 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 - $ - $) - 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 $) - 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=\"\"'.") 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 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 " +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