gentoo resync : 13.11.2021

3 files changed, 3 insertions, 18 deletions

diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 03b8e787753b..9a25c2c2ac88 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,11 +1,10 @@
-AUX tdesktop-2.9.3-add-libdl-dependency.patch 615 BLAKE2B f87d48b6c36116bad13f4f930fc69de132e9b916f02b6055fb5b770e9ab4944c4d8c0e0b7d3e7da580ba1e3b848fd94636a36221c35b29518ca349cd0ed727bf SHA512 86f54fd463c6a681d17e1beb0cbbe0f67e6fd74fa8e5dce350a61ff92da19f3879e81cbb996b97195091794bca174742cb1203aba08d1b95e9389d878f05f254
 AUX tdesktop-2.9.3-jemalloc-only-telegram.patch 988 BLAKE2B 487ce32454a5bfb51a081c7bd6803ff6cc956b349569d5ddf17d2abb7d7d5f0714002de654e149d8aefe6880e6b827c2ffb42c22e3ffa3fc6f10286c3e805463 SHA512 a1645bac4b715bad17a78226b9e76e30117f64715b1833df17950c882940a2ebbf18c70ab9ec628002408859292b57b9c4a48f9212bd15d9d2903867012eb3cf
 AUX tdesktop-3.1.0-fix-openssl3.patch 641 BLAKE2B 0354e0c8931311e5b6561c601cd0e78d436aeda53f14332803484b278fe60c90fa74e761ac005f79d6f44f18053fa870dc9246de1ab6e63986d7bf9b7214e12c SHA512 cfbf1798a290674e1f4589db1f5f43e61a6c691c19d936090ec9b7396e6cb720aa86b86cfdbff197de68a8723c04a20e7bf858f8511b48cc8e7b924a8d6876ec
 AUX tdesktop-3.1.0-jemalloc-only-telegram.patch 1136 BLAKE2B 06811696df84c1648f63843e937d18542ec5185aee6c3fde99dcfabe982aaad49e97387910882e405ec0ec9e8a12bef615f6f920c7f603224bce347bbff3bf22 SHA512 59c3f508c4be10e182fca52e4069e88af8cd26d150625dbe14214e505f9a5461e1492450896b1e9e229444a4f403eff43e4066d7f0c866bc9631c76f2c1f847e
 DIST tdesktop-3.0.1-full.tar.gz 37531917 BLAKE2B c139501f23c742f76d4acd43def69963413ffafef1be584f13d7359b3c20625def7ec283a981556c795aa4dc5ad2e117e1f8aada28cd4815f66f02510e607435 SHA512 6bff6be5f2c0c7a17df61dccc5a3216dcbb95a1c6d3176442c530e2c1b525e6d15079b230d40751f20684da2a1067d4518a9a1ab90d49d1a7338d3e05239d447
-DIST tdesktop-3.1.11-full.tar.gz 38541579 BLAKE2B 0c0c5d9591a6f517d3859ecc1bc6a8410c76a46b03db7267dec3354d54382c590bda86aff46e4cda518a512ae5539815553defc8b4b20929894324fee876b826 SHA512 7d67f2895797d4f7f1edd5e5e7e8509044fad5d5cfe6bbdb5613689da9519dab2fde707a452aad6788193addf84f2ebcc69342955607e0be8507397c22557709
 DIST tdesktop-3.1.8-full.tar.gz 38494235 BLAKE2B 50da0fdfe48f6492dc255c0fdfdb584750fd137ab0f847d226f9f62012ed1c34cc1a597f97735ca6aae1ba7e262562be2c88b92fe22c2868ed2cda437341a1f9 SHA512 787c92d6aaad2998d7195f2e1c98eddc6e87c3cb04a0d9ab80ea9a4a2dd1a798004109f8cc1ad82136c511ae191cea5b15cc23cc541ce86ccdb79dbc65367f09
+DIST tdesktop-3.2.0-full.tar.gz 38545930 BLAKE2B 03816a90ad283d0620964848514ac271a93fc0eba85f11f1945ad04816f3ff6b09de1359836dbf94661f6b744cbc35d3b57d92a7e9a2a04608c4be83a61346c8 SHA512 39d45234e5cd24b7fcb7dbb7d7f20baa1f7b74b33f5c50486842fa6c0ce5d94314f05594241b44722f101df3ef78462aac8e1290bf42bfb649f6aa664d2466b5
 EBUILD telegram-desktop-3.0.1-r1.ebuild 4374 BLAKE2B 1bec2055cdc156572815286d0050aeacd2c388a7cd62d3b60af8140902c0b2dec0ba03a64c8ecc8e143949bcaafe24c84a4e3c79b90593c6246129ff0f60db7d SHA512 754094c452ce7c7e81034c816bab884a6b95f092e619f5774fe887fd4627db0209198e9ef666ed174ee22a3aae78f17c3373c2556c14ef94bca41a7688a90487
-EBUILD telegram-desktop-3.1.11.ebuild 4359 BLAKE2B 7410ce5fa9f3d8548525dd6b38d6eaece35cfdf3986e8c0f076139fe2d581736b3ee1d94a5138043ac8389faa530621b0a5e38438075d9751347052cb83d051a SHA512 49464cdeff4d99bbab809b66f742d5851c19bab0fc3d809067571da45a6ac3960277da168bed539a374cf17057cb9169146a18ca847558676339540feac7f433
 EBUILD telegram-desktop-3.1.8.ebuild 4359 BLAKE2B 7410ce5fa9f3d8548525dd6b38d6eaece35cfdf3986e8c0f076139fe2d581736b3ee1d94a5138043ac8389faa530621b0a5e38438075d9751347052cb83d051a SHA512 49464cdeff4d99bbab809b66f742d5851c19bab0fc3d809067571da45a6ac3960277da168bed539a374cf17057cb9169146a18ca847558676339540feac7f433
+EBUILD telegram-desktop-3.2.0.ebuild 4383 BLAKE2B 913ac75f99f969a25be2c8d8de4a922abb1b599a0e3800e2102dfcdc031dd317435d3f62b5058572ecc275a9e6028e8eb697479a24e7d4d89f63bb1fbe11a32d SHA512 83fdb75cbd8aaf643484f9a3b0345bb0eb5e0a261f06af506e2da6d47d9b6c8494828e4395b71a433d863fe99e8eea216397efcfcd1342250e35d1c2af27be43
 MISC metadata.xml 709 BLAKE2B 02eee6916528198d1b28ebf883f84a94cb979f507d559d74e1b9a4e4f7b8b82930fd19a30c2f86a3e71ec2b6aa93e7836faf64ab23e23c59850b5b5260b305e8 SHA512 3c26cde38da1cb3e6700b52a50bb91d1b41230b89f7603d19d25156a1ae53603906cbf94b3257e189c6d24b5cd5627729b652ed412d9c3ac94dedbde5a721f5e
diff --git a/net-im/telegram-desktop/files/tdesktop-2.9.3-add-libdl-dependency.patch b/net-im/telegram-desktop/files/tdesktop-2.9.3-add-libdl-dependency.patch
deleted file mode 100644
index 3df0601b454b..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-2.9.3-add-libdl-dependency.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Add missed dependency on libdl
-
-https://github.com/desktop-app/lib_webview/commit/3cb51ac668d4e1b4f7f2b95fed1192350ba403af
-
---- tdesktop-2.9.3-full.orig/Telegram/lib_webview/CMakeLists.txt
-+++ tdesktop-2.9.3-full/Telegram/lib_webview/CMakeLists.txt
-@@ -56,6 +56,8 @@
- 
-         pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.0)
-         target_include_directories(lib_webview SYSTEM PUBLIC ${WEBKIT_INCLUDE_DIRS})
-+
-+        target_link_libraries(lib_webview PUBLIC ${CMAKE_DL_LIBS})
-     else()
-         remove_target_sources(lib_webview ${src_loc}
-             webview/platform/linux/webview_linux_webkit_gtk.cpp
diff --git a/net-im/telegram-desktop/telegram-desktop-3.1.11.ebuild b/net-im/telegram-desktop/telegram-desktop-3.2.0.ebuild
index 65f4899c98bf..8bf892956dfc 100644
--- a/net-im/telegram-desktop/telegram-desktop-3.1.11.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-3.2.0.ebuild
@@ -99,6 +99,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
 		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON  # header only lib, some git version. prevents warnings.
+		-DDESKTOP_APP_QT6=OFF
 
 		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X no yes)
 		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland no yes)