29.08.2026 13:24, Kirill A. Korinsky пишет:
> Klemens, Andrew,
> 
> I'd like to update tdesktop to 7.1.3 and drop my scroll patches.
> 
> fido's patches came from Nazarenko Mykyta's 64gram port.
> 
> Why? Upstream suggested to try the latest version of tdesktop to check does
> scroll work better. It more or less works on my case and I can't say that my
> patches makes it better, but here no more custom hacky patches.

Thanks, see comments inline.

OK kn with the patch comment fixed.

> 
> If anyone wouldlike to try it, the prebuild amd64 packages is here:
> https://kirill.korins.ky/pub/packages/tdesktop-7.1.3.tgz
> 
> Thoutgs? Ok?
> 

> Index: patches/patch-Telegram_SourceFiles_platform_linux_specific_linux_cpp
> ===================================================================
> RCS file: /home/cvs/ports/net/tdesktop/patches/patch-Telegram_SourceFiles_platform_linux_specific_linux_cpp,v
> diff -u -p -r1.12 patch-Telegram_SourceFiles_platform_linux_specific_linux_cpp
> --- patches/patch-Telegram_SourceFiles_platform_linux_specific_linux_cpp	14 Aug 2026 13:20:06 -0000	1.12
> +++ patches/patch-Telegram_SourceFiles_platform_linux_specific_linux_cpp	29 Aug 2026 00:47:53 -0000
> @@ -1,8 +1,5 @@
>  /usr/ports/pobj/tdesktop-6.2.5/tdesktop-6.2.5-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp:71:7: error: reference to 'GObject' is ambiguous
>  
> -plus fix scroll on X11
> -https://github.com/desktop-app/lib_ui/pull/339
> -
>  Index: Telegram/SourceFiles/platform/linux/specific_linux.cpp
>  --- Telegram/SourceFiles/platform/linux/specific_linux.cpp.orig
>  +++ Telegram/SourceFiles/platform/linux/specific_linux.cpp

Looks as if you forgot to remove hunks from this patch,
but it does not contain anything related to scrolling,
so that's fine.

> Index: patches/patch-Telegram_SourceFiles_webauthn_webauthn_common_cpp
> ===================================================================
> RCS file: patches/patch-Telegram_SourceFiles_webauthn_webauthn_common_cpp
> diff -N patches/patch-Telegram_SourceFiles_webauthn_webauthn_common_cpp
> --- /dev/null	1 Jan 1970 00:00:00 -0000
> +++ patches/patch-Telegram_SourceFiles_webauthn_webauthn_common_cpp	29 Aug 2026 09:08:34 -0000
> @@ -0,0 +1,18 @@
> +Replace `raw_ptr` and `raw_len` with `_ptr` and `_len` to ensure
> +compatibility with lib_fido2. Otherwise, the 64gram will fail to
> +compile.

This is not 64gram, though.

Is upstream aware of this?

> +
> +Index: Telegram/SourceFiles/webauthn/webauthn_common.cpp
> +--- Telegram/SourceFiles/webauthn/webauthn_common.cpp.orig
> ++++ Telegram/SourceFiles/webauthn/webauthn_common.cpp
> +@@ -353,8 +353,8 @@ void CloseBox(const std::shared_ptr<State> &state) {
> + 				fido_assert_id_len(assert, 0));
> + 			out.authenticatorData = QByteArray(
> + 				reinterpret_cast<const char*>(
> +-					fido_assert_authdata_raw_ptr(assert, 0)),
> +-				fido_assert_authdata_raw_len(assert, 0));
> ++					fido_assert_authdata_ptr(assert, 0)),
> ++				fido_assert_authdata_len(assert, 0));
> + 			out.signature = QByteArray(
> + 				reinterpret_cast<const char*>(fido_assert_sig_ptr(assert, 0)),
> + 				fido_assert_sig_len(assert, 0));
> Index: patches/patch-Telegram_cmake_lib_fido2_cmake
> ===================================================================
> RCS file: patches/patch-Telegram_cmake_lib_fido2_cmake
> diff -N patches/patch-Telegram_cmake_lib_fido2_cmake
> --- /dev/null	1 Jan 1970 00:00:00 -0000
> +++ patches/patch-Telegram_cmake_lib_fido2_cmake	29 Aug 2026 00:55:28 -0000
> @@ -0,0 +1,19 @@
> +Fix libfido2 detection on OpenBSD
> +
> +Index: Telegram/cmake/lib_fido2.cmake
> +--- Telegram/cmake/lib_fido2.cmake.orig
> ++++ Telegram/cmake/lib_fido2.cmake
> +@@ -9,6 +9,13 @@
> + # On Windows it serves only systems without webauthn.dll (Win7/8/8.1,
> + # Win10 < 1903); winhello.c is left out.
> + 
> ++if (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
> ++   add_library(lib_fido2 INTERFACE)
> ++   add_library(tdesktop::lib_fido2 ALIAS lib_fido2)
> ++   target_link_libraries(lib_fido2 INTERFACE fido2)
> ++   return()
> ++endif()

That's an easy candidate for an upstream PR.
 > ++
> + if (DESKTOP_APP_USE_PACKAGED)
> +     find_package(PkgConfig)
> +     if (PkgConfig_FOUND)