Re: update tdlib/py-telegram

On Sat, 25 Jan 2025 13:54:03 +0100,
Stuart Henderson <stu@spacehopper.org> wrote:
>
> [1 <text/plain; us-ascii (7bit)>]
> Our current tdlib version no longer works with Telegram (not sure how
> long ago this happened but I suspect probably quite a long time now).
> py-telegram needs an update too (which has a new dep).
>
> Diff below for tdlib/py-telegram, tgz for textproc/py-telegram-text
> attached. Tested with net/tg. OK to import/update?
>

Tested with net/tg as well. Works on -current/amd64.

OK kirill@

> Index: net/tdlib/Makefile
> ===================================================================
> RCS file: /cvs/ports/net/tdlib/Makefile,v
> diff -u -p -r1.8 Makefile
> --- net/tdlib/Makefile 27 Jun 2022 11:54:58 -0000 1.8
> +++ net/tdlib/Makefile 25 Jan 2025 12:50:31 -0000
> @@ -7,9 +7,8 @@ COMMENT = cross-platform library for bui
> # 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
> +GH_COMMIT = 28c6f2e9c045372d50217919bf5768b7fbbe0294
> +DISTNAME = tdlib-1.8.44
>
> SHARED_LIBS += tdjson 0.1
> CATEGORIES = net
> @@ -35,6 +34,6 @@ COMMIT = ${GH_COMMIT}
> SUBST_VARS += COMMIT
>
> post-patch:
> - ${SUBST_CMD} ${WRKSRC}/gen_git_commit_h.sh
> + ${SUBST_CMD} ${WRKSRC}/CMake/GetGitRevisionDescription.cmake
>
> .include <bsd.port.mk>
> Index: net/tdlib/distinfo
> ===================================================================
> RCS file: /cvs/ports/net/tdlib/distinfo,v
> diff -u -p -r1.5 distinfo
> --- net/tdlib/distinfo 27 Jun 2022 09:59:54 -0000 1.5
> +++ net/tdlib/distinfo 25 Jan 2025 12:50:31 -0000
> @@ -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.44-28c6f2e9.tar.gz) = r8muEMHx7cfexQUJW6vJz12QiRWdIfmkhTRJ2E6epXQ=
> +SIZE (tdlib-1.8.44-28c6f2e9.tar.gz) = 5344537
> Index: net/tdlib/patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/net/tdlib/patches/patch-CMakeLists_txt,v
> diff -u -p -r1.3 patch-CMakeLists_txt
> --- net/tdlib/patches/patch-CMakeLists_txt 27 Jun 2022 11:54:58 -0000 1.3
> +++ net/tdlib/patches/patch-CMakeLists_txt 25 Jan 2025 12:50:31 -0000
> @@ -1,10 +1,10 @@
> Index: CMakeLists.txt
> --- CMakeLists.txt.orig
> +++ CMakeLists.txt
> -@@ -73,8 +73,8 @@ if (POLICY CMP0069)
> +@@ -78,8 +78,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)
> Index: net/tdlib/patches/patch-CMake_GetGitRevisionDescription_cmake
> ===================================================================
> RCS file: net/tdlib/patches/patch-CMake_GetGitRevisionDescription_cmake
> diff -N net/tdlib/patches/patch-CMake_GetGitRevisionDescription_cmake
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ net/tdlib/patches/patch-CMake_GetGitRevisionDescription_cmake 25 Jan 2025 12:50:31 -0000
> @@ -0,0 +1,12 @@
> +Index: CMake/GetGitRevisionDescription.cmake
> +--- CMake/GetGitRevisionDescription.cmake.orig
> ++++ CMake/GetGitRevisionDescription.cmake
> +@@ -67,7 +67,7 @@ function(get_git_head_revision _refspecvar _hashvar)
> + endif()
> + if (GIT_DIR STREQUAL "")
> + set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
> +- set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
> ++ set(${_hashvar} "${COMMIT}" PARENT_SCOPE)
> + return()
> + endif()
> +
> Index: net/tdlib/patches/patch-gen_git_commit_h_sh
> ===================================================================
> RCS file: net/tdlib/patches/patch-gen_git_commit_h_sh
> diff -N net/tdlib/patches/patch-gen_git_commit_h_sh
> --- net/tdlib/patches/patch-gen_git_commit_h_sh 27 Jun 2022 11:54:58 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -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
> Index: net/tdlib/patches/patch-td_generate_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/net/tdlib/patches/patch-td_generate_CMakeLists_txt,v
> diff -u -p -r1.1 patch-td_generate_CMakeLists_txt
> --- net/tdlib/patches/patch-td_generate_CMakeLists_txt 30 Jun 2022 13:00:35 -0000 1.1
> +++ net/tdlib/patches/patch-td_generate_CMakeLists_txt 25 Jan 2025 12:50:31 -0000
> @@ -1,15 +1,14 @@
> -
> 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)
> Index: net/tdlib/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/net/tdlib/pkg/PLIST,v
> diff -u -p -r1.2 PLIST
> --- net/tdlib/pkg/PLIST 10 Mar 2022 15:21:48 -0000 1.2
> +++ net/tdlib/pkg/PLIST 25 Jan 2025 12:50:31 -0000
> @@ -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
> Index: net/py-telegram/Makefile
> ===================================================================
> RCS file: /cvs/ports/net/py-telegram/Makefile,v
> diff -u -p -r1.9 Makefile
> --- net/py-telegram/Makefile 21 Dec 2024 11:38:35 -0000 1.9
> +++ net/py-telegram/Makefile 25 Jan 2025 12:50:31 -0000
> @@ -1,10 +1,9 @@
> COMMENT = Python wrapper for Telegram tdlib
>
> -MODPY_DISTV = 0.16.0
> +MODPY_DISTV = 0.19.0
>
> -DISTNAME = python-telegram-${MODPY_DISTV}
> -PKGNAME = ${DISTNAME:S/^python-/py-/}
> -REVISION = 1
> +DISTNAME = python_telegram-${MODPY_DISTV}
> +PKGNAME = py-telegram-${MODPY_DISTV}
>
> CATEGORIES = net
>
> @@ -16,10 +15,10 @@ PERMIT_PACKAGE = Yes
> MODULES = lang/python
>
> MODPY_PI = Yes
> -MODPY_PYBUILD = setuptools
> +MODPY_PYBUILD = setuptools_scm
>
> -RUN_DEPENDS = net/tdlib
> -NO_TEST = Yes
> +RUN_DEPENDS = net/tdlib \
> + textproc/py-telegram-text
>
> # remove bundled binaries
> post-install:
> Index: net/py-telegram/distinfo
> ===================================================================
> RCS file: /cvs/ports/net/py-telegram/distinfo,v
> diff -u -p -r1.3 distinfo
> --- net/py-telegram/distinfo 26 Jan 2023 12:57:56 -0000 1.3
> +++ net/py-telegram/distinfo 25 Jan 2025 12:50:31 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (python-telegram-0.16.0.tar.gz) = uNRy6DKSdOqfqW0QFMqpGowP1VEL7xa+3iR1nDWIKxo=
> -SIZE (python-telegram-0.16.0.tar.gz) = 15597183
> +SHA256 (python_telegram-0.19.0.tar.gz) = e1sto9AdTPV3bJL5H901oPmJdu7CNWcmszj1m6AdE3M=
> +SIZE (python_telegram-0.19.0.tar.gz) = 20313048
> Index: net/py-telegram/patches/patch-telegram_tdjson_py
> ===================================================================
> RCS file: net/py-telegram/patches/patch-telegram_tdjson_py
> diff -N net/py-telegram/patches/patch-telegram_tdjson_py
> --- net/py-telegram/patches/patch-telegram_tdjson_py 26 Jan 2023 12:57:56 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,16 +0,0 @@
> -we have the system library and ctypes.util.find_library("tdjson") finds it
> -correctly, the fallback to pkg_resources isn't used (and wouldn't work anyway
> -as that only provides linux/darwin libraries so they're removed)
> -
> -Index: telegram/tdjson.py
> ---- telegram/tdjson.py.orig
> -+++ telegram/tdjson.py
> -@@ -5,8 +5,6 @@ import ctypes.util
> - from ctypes import CDLL, CFUNCTYPE, c_int, c_char_p, c_double, c_void_p, c_longlong
> - from typing import Any, Dict, Optional, Union
> -
> --import pkg_resources
> --
> - logger = logging.getLogger(__name__)
> -
> -
> Index: net/py-telegram/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/net/py-telegram/pkg/PLIST,v
> diff -u -p -r1.4 PLIST
> --- net/py-telegram/pkg/PLIST 21 Dec 2024 11:38:35 -0000 1.4
> +++ net/py-telegram/pkg/PLIST 25 Jan 2025 12:50:31 -0000
> @@ -1,5 +1,6 @@
> @pkgpath net/py-telegram,python3
> lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_DISTV}.dist-info/
> +lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_DISTV}.dist-info/LICENSE
> lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_DISTV}.dist-info/METADATA
> lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_DISTV}.dist-info/RECORD
> lib/python${MODPY_VERSION}/site-packages/python_telegram-${MODPY_DISTV}.dist-info/WHEEL
> @@ -9,15 +10,22 @@ lib/python${MODPY_VERSION}/site-packages
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}/
> lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}tdjson.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}tdjson.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}text.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}text.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}worker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> lib/python${MODPY_VERSION}/site-packages/telegram/${MODPY_PYCACHE}worker.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/telegram/_version.py
> lib/python${MODPY_VERSION}/site-packages/telegram/client.py
> +lib/python${MODPY_VERSION}/site-packages/telegram/py.typed
> lib/python${MODPY_VERSION}/site-packages/telegram/tdjson.py
> +lib/python${MODPY_VERSION}/site-packages/telegram/text.py
> lib/python${MODPY_VERSION}/site-packages/telegram/utils.py
> lib/python${MODPY_VERSION}/site-packages/telegram/worker.py
> [2 py-telegram-text.tgz <application/x-tar-gz (base64)>]

--
wbr, Kirill