telegram-desktop: 5.13.1 -> 5.14.3 (#405944)

pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/qt-6.9.patch

@@ -1,44 +0,0 @@
-diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp
-index 4e1d7c136..7c8f95888 100644
---- a/Telegram/SourceFiles/media/view/media_view_pip.cpp
-+++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp
-@@ -362,6 +362,10 @@ void PipPanel::init() {
- 	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
- 		// Workaround Qt's forced transient parent.
- 		Ui::Platform::ClearTransientParent(widget());
-+	}, rp()->lifetime());
-+
-+	rp()->shownValue(
-+	) | rpl::filter(rpl::mappers::_1) | rpl::start_with_next([=] {
- 		Ui::Platform::SetWindowMargins(widget(), _padding);
- 	}, rp()->lifetime());
- 
-Submodule Telegram/lib_base contains modified content
-diff --git a/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp b/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp
-index 8aca67c..6b781fb 100644
---- a/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp
-+++ b/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp
-@@ -16,7 +16,11 @@
- #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
- #include <qpa/qplatformintegration.h>
- #include <private/qguiapplication_p.h>
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
-+#include <private/qdesktopunixservices_p.h>
-+#else // Qt >= 6.9.0
- #include <private/qgenericunixservices_p.h>
-+#endif // Qt < 6.9.0
- #endif // Qt >= 6.5.0
- 
- #include <sstream>
-@@ -39,7 +43,10 @@ std::string ParentWindowID(QWindow *window) {
- 	}
- 
- #if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
--	if (const auto services = dynamic_cast<QGenericUnixServices*>(
-+#if QT_VERSION < QT_VERSION_CHECK(6, 9, 0)
-+	using QDesktopUnixServices = QGenericUnixServices;
-+#endif // Qt < 6.9.0
-+	if (const auto services = dynamic_cast<QDesktopUnixServices*>(
- 			QGuiApplicationPrivate::platformIntegration()->services())) {
- 		return services->portalWindowIdentifier(window).toStdString();
- 	}

pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix

@@ -8,6 +8,7 @@
   ninja,
   clang,
   python3,
+  tdlib,
   tg_owt ? callPackage ./tg_owt.nix { inherit stdenv; },
   qtbase,
   qtimageformats,
@@ -46,24 +47,16 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "telegram-desktop-unwrapped";
-  version = "5.13.1";
+  version = "5.14.3";
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-E9d5jWw4HeCO4sqDB0tXXgxM91kg1Gixi9B0xZQYe14=";
+    hash = "sha256-nNYQpWbBK+E/LAbwTWpNUhs2+wb8iuMfqkxJKjaFmhg=";
   };
 
-  # Combined backport to fix Qt 6.9 issues:
-  # - https://github.com/telegramdesktop/tdesktop/commit/8b92ab25c776899c5432bf935447cac6f0b3ea2d
-  # - https://github.com/telegramdesktop/tdesktop/commit/c261c3367a11eeef69e6e346d339706dc4f00406
-  # FIXME: remove in next update
-  patches = [
-    ./qt-6.9.patch
-  ];
-
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \
       --replace-fail '"libasound.so.2"' '"${lib.getLib alsa-lib}/lib/libasound.so.2"'
@@ -104,6 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
       microsoft-gsl
       boost
       ada
+      (tdlib.override { tde2eOnly = true; })
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
       protobuf

pkgs/by-name/ay/ayugram-desktop/package.nix

@@ -13,13 +13,13 @@ telegram-desktop.override {
   unwrapped = telegram-desktop.unwrapped.overrideAttrs (
     finalAttrs: previousAttrs: {
       pname = "ayugram-desktop-unwrapped";
-      version = "5.12.3";
+      version = "5.14.3";
 
       src = fetchFromGitHub {
         owner = "AyuGram";
         repo = "AyuGramDesktop";
         tag = "v${finalAttrs.version}";
-        hash = "sha256-Zjik+9J0YtabVW1VEkJr/Bl3SIakVQ8EiTLYm28rEIk=";
+        hash = "sha256-cirUnGtjEc8aQzXH0r5kVhobEqf63eoZ17Gg99e+FCQ=";
         fetchSubmodules = true;
       };
 

pkgs/by-name/ma/materialgram/package.nix

@@ -11,13 +11,13 @@ telegram-desktop.override {
   unwrapped = telegram-desktop.unwrapped.overrideAttrs (
     finalAttrs: previousAttrs: {
       pname = "materialgram-unwrapped";
-      version = "5.12.5.1";
+      version = "5.14.3.1";
 
       src = fetchFromGitHub {
         owner = "kukuruzka165";
         repo = "materialgram";
         rev = "refs/tags/v${finalAttrs.version}";
-        hash = "sha256-l6pVqmz8rfNhta2nCJISLl/nZqoSDBD3QrskmmhoQM4=";
+        hash = "sha256-wnhEnhNeuY7eRvmsDnpZ2CiKHXFvgIYpZp2ftjq54/Q=";
         fetchSubmodules = true;
       };
 

pkgs/by-name/td/tdlib/package.nix

@@ -11,6 +11,8 @@
   common-updater-scripts,
   jq,
   buildPackages,
+
+  tde2eOnly ? false,
 }:
 
 let
@@ -35,8 +37,8 @@ let
 in
 
 stdenv.mkDerivation {
-  pname = "tdlib";
-  version = "1.8.47";
+  pname = if tde2eOnly then "tde2e" else "tdlib";
+  version = "1.8.49";
 
   src = fetchFromGitHub {
     owner = "tdlib";
@@ -45,8 +47,8 @@ stdenv.mkDerivation {
     # The tdlib authors do not set tags for minor versions, but
     # external programs depending on tdlib constrain the minor
     # version, hence we set a specific commit with a known version.
-    rev = "a03a90470d6fca9a5a3db747ba3f3e4a465b5fe7";
-    hash = "sha256-RS7N+MMie/gNtcvPT4yjE2ymhZCsByS96O9nhiJ/bNY=";
+    rev = "51743dfd01dff6179e2d8f7095729caa4e2222e9";
+    hash = "sha256-duD8a/fppkmaKrvkHnbSxRnCLS60aNVcgaYyCoHzKgE=";
   };
 
   buildInputs = [
@@ -73,6 +75,10 @@ stdenv.mkDerivation {
     cmake --build native-build -j $NIX_BUILD_CORES
   '';
 
+  cmakeFlags = [
+    (lib.cmakeBool "TD_E2E_ONLY" tde2eOnly)
+  ];
+
   # https://github.com/tdlib/td/issues/1974
   postPatch =
     ''