On 2024-10-25, Lucas de Sena wrote:
> Hi,
>
> Update net/tdlib to its last "unofficial minor version".
>
> Tested with net/tdlib-purple (new port, mailed to ports@) under bitlbee.
>
> Upstream removed ${WRKSRC}/gen_git_commit_h.sh in an earlier commit.
> The corresponding patch file and post-patch target got removed then.
>
> Cc'ed maintainer.
>
> Ok?
>
> --
> Lucas de Sena
>
>
> diff /usr/ports
> commit - dca0564f40e748605730135f76a145d75741b36f
> path + /usr/ports
> blob - 64c582485206c115f00f0659e655e70e72be9a80
> file + net/tdlib/Makefile
> --- net/tdlib/Makefile
> +++ net/tdlib/Makefile
> @@ -3,13 +3,12 @@ NOT_FOR_ARCHS = ${BE_ARCHS}
>
> COMMENT = cross-platform library for building Telegram clients
>
> +PKGNAME = tdlib-1.8.38
> +
> # upstream tags stable versions, but various clients using this library
> # track "unofficial minor versions" which are only present as commit hashes.
> -GH_ACCOUNT = tdlib
> -GH_PROJECT = td
> -GH_COMMIT = 7eabd8ca60de025e45e99d4e5edd39f4ebd9467e
> -DISTNAME = tdlib-1.8.4
> -REVISION = 0
> +COMMIT = d321984b75fccdb76239529e8aadcf7f80b0e35a
> +DIST_TUPLE = github tdlib td ${COMMIT} .
>
> SHARED_LIBS += tdjson 0.1
> CATEGORIES = net
> @@ -30,11 +29,4 @@ COMPILER = base-clang ports-gcc
>
> WANTLIB += ${COMPILER_LIBCXX} crypto m ssl z
>
> -# if moving from GH_COMMIT to GH_TAGNAME, include the actual commit hash here
> -COMMIT = ${GH_COMMIT}
> -SUBST_VARS += COMMIT
> -
> -post-patch:
> - ${SUBST_CMD} ${WRKSRC}/gen_git_commit_h.sh
> -
> .include <bsd.port.mk>
> blob - 6eabfae393e0b70cba062b91311c165d79572966
> file + net/tdlib/distinfo
> --- net/tdlib/distinfo
> +++ net/tdlib/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (tdlib-1.8.4-7eabd8ca.tar.gz) =
> 3qE4QUPH9FiNEjpOREEZ1xNsUOgWamoH8mbRE/mE2ms=
> -SIZE (tdlib-1.8.4-7eabd8ca.tar.gz) = 4648576
> +SHA256 (tdlib-1.8.38-d321984b.tar.gz) =
> seP5PU2A/tVlYlAR8KuJbgQJG4fjtrTmFuenQt5A2+0=
> +SIZE (tdlib-1.8.38-d321984b.tar.gz) = 5279869
> blob - 14a202c85d5cef8f38a5a881e7515cc0fa7e47ec
> file + net/tdlib/patches/patch-CMakeLists_txt
> --- net/tdlib/patches/patch-CMakeLists_txt
> +++ net/tdlib/patches/patch-CMakeLists_txt
> @@ -4,7 +4,7 @@ Index: CMakeLists.txt
> @@ -73,8 +73,8 @@ if (POLICY CMP0069)
> endif()
>
> - # Configure CCache if available
> + # Configure Ccache if available
> -find_program(CCACHE_FOUND ccache)
> -#set(CCACHE_FOUND 0)
> +#find_program(CCACHE_FOUND ccache)
> blob - 7faf5165753d4630224137146dd9fbd5a8c35f89
> file + /dev/null
> --- net/tdlib/patches/patch-gen_git_commit_h_sh
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -Index: gen_git_commit_h.sh
> ---- gen_git_commit_h.sh.orig
> -+++ gen_git_commit_h.sh
> -@@ -1,8 +1,7 @@
> - #!/bin/sh
> - cd $(dirname $0)
> --commit=$(git rev-parse HEAD)
> --git diff-index --quiet HEAD
> --dirty=$?
> -+commit=${COMMIT}
> -+dirty=0
> - printf "#pragma once\n#define GIT_COMMIT \"$commit\"\n#define GIT_DIRTY
> $dirty\n" > auto/git_info.h.new
> - if cmp -s auto/git_info.h.new auto/git_info.h 2>&1 > /dev/null
> - then
> blob - 2a6d1f6d020de94d9755f9ffa428eef7903f8ae1
> file + net/tdlib/patches/patch-td_generate_CMakeLists_txt
> --- net/tdlib/patches/patch-td_generate_CMakeLists_txt
> +++ net/tdlib/patches/patch-td_generate_CMakeLists_txt
> @@ -4,12 +4,12 @@ Forcefully disable php/doxygen.
> Index: td/generate/CMakeLists.txt
> --- td/generate/CMakeLists.txt.orig
> +++ td/generate/CMakeLists.txt
> -@@ -100,7 +100,7 @@ if (NOT CMAKE_CROSSCOMPILING)
> +@@ -110,7 +110,7 @@ if (NOT CMAKE_CROSSCOMPILING)
> set(PHP_EXECUTABLE "PHP_EXECUTABLE-NOTFOUND")
> endif()
>
> - if (PHP_EXECUTABLE AND NOT TD_ENABLE_DOTNET)
> + if (FALSE AND NOT TD_ENABLE_DOTNET)
> - set(GENERATE_COMMON_CMD generate_common && ${PHP_EXECUTABLE}
> DoxygenTlDocumentationGenerator.php scheme/td_api.tl
> auto/td/telegram/td_api.h)
> + set(GENERATE_COMMON_CMD generate_common && ${PHP_EXECUTABLE}
> ../DoxygenTlDocumentationGenerator.php ../scheme/td_api.tl
> td/telegram/td_api.h)
> else()
> set(GENERATE_COMMON_CMD generate_common)
> blob - 324d12c644a789f2ce2aa6dd263b51273bccaf77
> file + net/tdlib/pkg/PLIST
> --- net/tdlib/pkg/PLIST
> +++ net/tdlib/pkg/PLIST
> @@ -13,6 +13,8 @@ lib/cmake/
> lib/cmake/Td/
> lib/cmake/Td/TdConfig.cmake
> lib/cmake/Td/TdConfigVersion.cmake
> +lib/cmake/Td/TdStaticTargets${MODCMAKE_BUILD_SUFFIX}
> +lib/cmake/Td/TdStaticTargets.cmake
> lib/cmake/Td/TdTargets${MODCMAKE_BUILD_SUFFIX}
> lib/cmake/Td/TdTargets.cmake
> @static-lib lib/libtdactor.a
> @@ -23,6 +25,7 @@ lib/cmake/Td/TdTargets.cmake
> @lib lib/libtdjson.so.${LIBtdjson_VERSION}
> @static-lib lib/libtdjson_private.a
> @static-lib lib/libtdjson_static.a
> +@static-lib lib/libtdmtproto.a
> @static-lib lib/libtdnet.a
> @static-lib lib/libtdsqlite.a
> @static-lib lib/libtdutils.a
> @@ -34,6 +37,7 @@ lib/pkgconfig/tddb.pc
> lib/pkgconfig/tdjson.pc
> lib/pkgconfig/tdjson_private.pc
> lib/pkgconfig/tdjson_static.pc
> +lib/pkgconfig/tdmtproto.pc
> lib/pkgconfig/tdnet.pc
> lib/pkgconfig/tdsqlite.pc
> lib/pkgconfig/tdutils.pc
>
Telegram ping.
