diff options
Diffstat (limited to 'net-im/telegram-desktop')
10 files changed, 21 insertions, 483 deletions
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest index 6a0e5842ccb3..8e25acbfb57b 100644 --- a/net-im/telegram-desktop/Manifest +++ b/net-im/telegram-desktop/Manifest @@ -1,13 +1,7 @@ -AUX tdesktop-2.8.10-jemalloc-only-telegram.patch 973 BLAKE2B 6efc62db44ea8d26f469d937fc91135c77eea38e6e51b1c6cc772bc91afb7372292731b0369544ea52f67075ce9800fdcadc150ec72df571c29f2818b88cc56d SHA512 754e7286aebd183891b3808b66979df4b8e62355147a8f6bd860bf37360e089928247073b7adf9fc8d09ed4edc35746e50a4eff3d0bdc2d74888e8cb74042cf0 -AUX tdesktop-2.8.11-fix-build-without-pipewire.patch 1171 BLAKE2B c6d9bf98363e17e1da04c8540c1ea9a187dbfea9fb80849a9c54ead8f43b21b0a8b83ff31d0127e7d4b144b8353be9918d8c631a347fcad340bacfb0b438f01c SHA512 7e43d53a8f601a2bf5d4b3a3b3888329cc1162967ac75fda2769c8c4b25982a1cdc991d22b445842dbb97b874af724b458db8c861b9df12fe739fbca6a08641e -AUX tdesktop-2.8.11-load-gtk-with-qlibrary.patch 4451 BLAKE2B 3d490ce1dd43aed8bf29812b3be5ed916ece4b4da61d8e2a5fdefe0360e5c71580cd5348a5b0dc3977d6f1ac300b4d98881242c8313fa22a3a0d767dae72e2e3 SHA512 080c77c010ea4d5a766f4b9b7f0f321d953d265c2c145ee4cf8fc03a2ba29e2c305521292403f8845308adab67482e4c0c61ce89660eef0af169f5dbf5b0a5f4 -AUX tdesktop-2.8.9-disable-webkit-separately.patch 4643 BLAKE2B 7d84cedd4b7b5879fb402193774e40c2b72f6028592e4dc1df1c4a9002dd4e9cbaff505dceb77e443b84c26b4dff6abfc5a99ff28699fb031cc9cb0ea3612280 SHA512 fc3da934e04d19b6f1be42cb095e3aba2a13f0e6a14164558f3da45152b9fa19bc8235d08fd6537933b9fb25d7aee27ec7763173e6395f55bcb9869f71b31088 -AUX tdesktop-2.8.9-webview-fix-glib.patch 1838 BLAKE2B 16b861f0fda72ba1725779880eb67b3adfd0a3dad4c7614beb8f96fa55fecc613f248477557569904c44e6875adbf7912ac9281f1ff71b4b8a6e5d97f9f71e97 SHA512 c3932b6471150d71469606bdbc93d26b57e8eb556e24df9366bad9e51aed073ab18dd7ee14b7445f8df180806a0ca591afdc8c00b0ce34db29575d2dc114b58a +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 -DIST tdesktop-2.8.11-full.tar.gz 37105468 BLAKE2B 1ec5a0003bd1b948b45213509fa0649dfde5ec8e3dff097bf45aa0951c7963930788b0bee853f286d04b008b78704c464b6614b8391350767affebc2623b25af SHA512 a553313b04fbb562745be2381a84117657172952e46e280980a73c9fcfe2a7cf29c0e012e4b1259816d1e6652418e7a1ddfc4e394544fcc3aeb33704cbe80860 DIST tdesktop-2.9.3-full.tar.gz 37335782 BLAKE2B 197583ba6568c455218c51f590c1ba1a3f10c390caa4fd03657098f499ce113a4f5f57ca9dd53bc4baba31992d4229768ed35e68ad6b0685010bc335817edcac SHA512 810cfac5d7e6ce9413b1b2406927e89c1383ea5b725233a68b2cb29dd374b4c3386c22186640afde4492c844516c88889a5db8e5b167a09d6d6c1270ac965ac4 DIST tdesktop-3.0.1-full.tar.gz 37531917 BLAKE2B c139501f23c742f76d4acd43def69963413ffafef1be584f13d7359b3c20625def7ec283a981556c795aa4dc5ad2e117e1f8aada28cd4815f66f02510e607435 SHA512 6bff6be5f2c0c7a17df61dccc5a3216dcbb95a1c6d3176442c530e2c1b525e6d15079b230d40751f20684da2a1067d4518a9a1ab90d49d1a7338d3e05239d447 -EBUILD telegram-desktop-2.8.11-r2.ebuild 4623 BLAKE2B 8726574359a9c4f222f10a676f27f2fa2e0870fefec15598393f6933b899a2bd3a71c5467a02ef021deb50ad468a50901a18a43199fe099a7b535e61c8e1ce84 SHA512 57a93a202b69851b37ddaf7a54e4ec8c02464eb297bf4716ec291e43bd58d84ee6749cf34222a3e494b9dc3b387b9f6b768aa020cbcb2408788073d087a8703c -EBUILD telegram-desktop-2.9.3.ebuild 4280 BLAKE2B 12525c38e8c2dc09fe79115576fc88ca4cc98a085ef06cd89f9924d680a287bfd3bc13d8dd68722e766e261ff26185ce349ebd2a3f76cb5a033d1fe5dbf5a603 SHA512 67367fe897db0914777063092d810540126a3366ac7f4ad86e36391aa65ec1944e54bbb6197a9c36dc832b6dcac18f56beea1ecc25fdfb2a9efc079f39952a33 +EBUILD telegram-desktop-2.9.3.ebuild 4336 BLAKE2B ca0dd4416d7b2bbda13e8adfa548eca9db4140f50970c20fdeb2893ef019eb6a201006acda6e87ec4cd667750f37289f5fcae5e47e944a90d0c6325b26018254 SHA512 0d4ee5774bca8406eda829a119ef7e01e37824cddbf21c3033d6cf7d5dd3896fc055093a924c7eabd5f859d3af60701df72aec75b733c45b69327b014f6055cd EBUILD telegram-desktop-3.0.1.ebuild 4216 BLAKE2B 3c74c83e74625be07b36b867bd7c6722c1dc7003e724aaa2bfc40ce824783cb2cb1659865fb068ba2940b9dc35aa5953f0431b5d676c55aac86919bcfd021665 SHA512 8f21fdb4bab4fca0636ea0da87f7ba2ab5f90601e20b67862852fdcf6150ad62e89c3c5994b67d0d2757658b238ec3efde620c6cf170d5e7a18a066109bf5603 -MISC metadata.xml 708 BLAKE2B 9aab7bce0728ac85db3d20f58d0f4360e01f133570d42145a43e2eb0b41e275888764fd7da0a749dd37ce72c6e0286f47be36c57adc6330e74a36308197fc202 SHA512 cad9265a882e0c9cda070cebdbcd5c6c096f2b7242772a1e9877eb0a4210a98768c8de75f197a1649e08f68010aa450d043a9decfaf976d90bf147458fbbb086 +MISC metadata.xml 709 BLAKE2B 02eee6916528198d1b28ebf883f84a94cb979f507d559d74e1b9a4e4f7b8b82930fd19a30c2f86a3e71ec2b6aa93e7836faf64ab23e23c59850b5b5260b305e8 SHA512 3c26cde38da1cb3e6700b52a50bb91d1b41230b89f7603d19d25156a1ae53603906cbf94b3257e189c6d24b5cd5627729b652ed412d9c3ac94dedbde5a721f5e diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch deleted file mode 100644 index 8604acc6a74d..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch +++ /dev/null @@ -1,31 +0,0 @@ -Only link jemalloc for the Telegram binary - -Some combination of factors is making the different codegen tools hang when -jemalloc is linked for those, and they're ran under portage's sandbox. Since -this is only used during build-time, and jemalloc is merely necessary to -improve runtime memory use, it's unnecessary to use it for anything else. - ---- tdesktop-2.8.10-full.orig/Telegram/CMakeLists.txt -+++ tdesktop-2.8.10-full/Telegram/CMakeLists.txt -@@ -87,6 +87,7 @@ - PRIVATE - desktop-app::external_glibmm - desktop-app::external_glib -+ desktop-app::external_jemalloc - ) - - if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) ---- tdesktop-2.8.10-full.orig/cmake/options_linux.cmake -+++ tdesktop-2.8.10-full/cmake/options_linux.cmake -@@ -58,11 +58,6 @@ - endif() - endif() - --target_link_libraries(common_options --INTERFACE -- desktop-app::external_jemalloc --) -- - if (DESKTOP_APP_USE_PACKAGED) - find_library(ATOMIC_LIBRARY atomic) - else() diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.11-fix-build-without-pipewire.patch b/net-im/telegram-desktop/files/tdesktop-2.8.11-fix-build-without-pipewire.patch deleted file mode 100644 index ecfc63abeb58..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-2.8.11-fix-build-without-pipewire.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix build without pipewire - -set_allow_pipewire isn't available if WEBRTC_USE_PIPEWIRE isn't set - ---- tdesktop-2.8.11-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/desktop_capturer/DesktopCaptureSourceHelper.cpp -+++ tdesktop-2.8.11-full/Telegram/ThirdParty/tgcalls/tgcalls/desktop_capturer/DesktopCaptureSourceHelper.cpp -@@ -286,7 +286,7 @@ - options.set_allow_use_magnification_api(false); - #elif defined WEBRTC_MAC - options.set_allow_iosurface(true); --#elif defined WEBRTC_LINUX -+#elif defined WEBRTC_USE_PIPEWIRE - options.set_allow_pipewire(true); - #endif // WEBRTC_WIN || WEBRTC_MAC - ---- tdesktop-2.8.11-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/desktop_capturer/DesktopCaptureSourceManager.cpp -+++ tdesktop-2.8.11-full/Telegram/ThirdParty/tgcalls/tgcalls/desktop_capturer/DesktopCaptureSourceManager.cpp -@@ -33,7 +33,7 @@ - result.set_allow_use_magnification_api(false); - #elif defined WEBRTC_MAC - result.set_allow_iosurface(type == DesktopCaptureType::Screen); --#elif defined WEBRTC_LINUX -+#elif defined WEBRTC_USE_PIPEWIRE - result.set_allow_pipewire(true); - #endif // WEBRTC_WIN || WEBRTC_MAC - result.set_detect_updated_region(true); diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.11-load-gtk-with-qlibrary.patch b/net-im/telegram-desktop/files/tdesktop-2.8.11-load-gtk-with-qlibrary.patch deleted file mode 100644 index 91e3f859eebc..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-2.8.11-load-gtk-with-qlibrary.patch +++ /dev/null @@ -1,112 +0,0 @@ -Fix running with QT_QPA_PLATFORMTHEME=gtk2 - -From: https://bugs.archlinux.org/task/71541 - ---- tdesktop-2.8.11-full.orig/Telegram/CMakeLists.txt -+++ tdesktop-2.8.11-full/Telegram/CMakeLists.txt -@@ -114,25 +114,16 @@ - endif() - - if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION) -- target_link_libraries(Telegram PRIVATE rt) - find_package(PkgConfig REQUIRED) - -- if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) -- pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0) -- target_link_libraries(Telegram PRIVATE PkgConfig::GTK3) -- -- if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION) -- pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11) -- target_link_libraries(Telegram PRIVATE PkgConfig::X11) -- endif() -- else() -- pkg_check_modules(GTK REQUIRED gtk+-3.0) -- target_include_directories(Telegram PRIVATE ${GTK_INCLUDE_DIRS}) -+ pkg_check_modules(GTK REQUIRED gtk+-3.0) -+ target_include_directories(Telegram PRIVATE ${GTK_INCLUDE_DIRS}) - -- if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION) -- target_link_libraries(Telegram PRIVATE X11) -- endif() -+ if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION) -+ target_link_libraries(Telegram PRIVATE X11) - endif() -+ -+ target_link_libraries(Telegram PRIVATE rt) - endif() - endif() - ---- tdesktop-2.8.11-full.orig/Telegram/lib_base/CMakeLists.txt -+++ tdesktop-2.8.11-full/Telegram/lib_base/CMakeLists.txt -@@ -254,13 +254,8 @@ - if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION) - find_package(PkgConfig REQUIRED) - -- if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) -- pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0) -- target_link_libraries(lib_base PUBLIC PkgConfig::GTK3) -- else() -- pkg_check_modules(GTK REQUIRED gtk+-3.0) -- target_include_directories(lib_base PUBLIC ${GTK_INCLUDE_DIRS}) -- endif() -+ pkg_check_modules(GTK REQUIRED gtk+-3.0) -+ target_include_directories(lib_base PUBLIC ${GTK_INCLUDE_DIRS}) - endif() - endif() - ---- tdesktop-2.8.11-full.orig/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration_p.h -+++ tdesktop-2.8.11-full/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration_p.h -@@ -13,15 +13,7 @@ - #include <gdk/gdk.h> - } // extern "C" - --#if defined DESKTOP_APP_USE_PACKAGED && !defined DESKTOP_APP_USE_PACKAGED_LAZY --#define LINK_TO_GTK --#endif // DESKTOP_APP_USE_PACKAGED && !DESKTOP_APP_USE_PACKAGED_LAZY -- --#ifdef LINK_TO_GTK --#define LOAD_GTK_SYMBOL(lib, func) (func = ::func) --#else // LINK_TO_GTK - #define LOAD_GTK_SYMBOL LOAD_LIBRARY_SYMBOL --#endif // !LINK_TO_GTK - - namespace base { - namespace Platform { -@@ -31,11 +23,7 @@ - QLibrary &lib, - const char *name, - std::optional<int> version = std::nullopt) { --#ifdef LINK_TO_GTK -- return true; --#else // LINK_TO_GTK - return LoadLibrary(lib, name, version); --#endif // LINK_TO_GTK - } - - inline gboolean (*gtk_init_check)(int *argc, char ***argv) = nullptr; ---- tdesktop-2.8.11-full.orig/Telegram/lib_webview/CMakeLists.txt -+++ tdesktop-2.8.11-full/Telegram/lib_webview/CMakeLists.txt -@@ -51,19 +51,11 @@ - if (NOT DESKTOP_APP_DISABLE_WEBKIT) - find_package(PkgConfig REQUIRED) - -- if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) -- pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0) -- target_link_libraries(lib_webview PUBLIC PkgConfig::GTK3) -+ pkg_check_modules(GTK3 REQUIRED gtk+-3.0) -+ target_include_directories(lib_webview PUBLIC ${GTK3_INCLUDE_DIRS}) - -- pkg_check_modules(WEBKIT REQUIRED IMPORTED_TARGET webkit2gtk-4.0) -- target_link_libraries(lib_webview PUBLIC PkgConfig::WEBKIT) -- else() -- pkg_check_modules(GTK3 REQUIRED gtk+-3.0) -- target_include_directories(lib_webview PUBLIC ${GTK3_INCLUDE_DIRS}) -- -- pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.0) -- target_include_directories(lib_webview PUBLIC ${WEBKIT_INCLUDE_DIRS}) -- endif() -+ pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.0) -+ target_include_directories(lib_webview PUBLIC ${WEBKIT_INCLUDE_DIRS}) - else() - remove_target_sources(lib_webview ${src_loc} - webview/platform/linux/webview_linux_webkit_gtk.cpp diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-webkit-separately.patch b/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-webkit-separately.patch deleted file mode 100644 index 388e09fa58d2..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-webkit-separately.patch +++ /dev/null @@ -1,122 +0,0 @@ -Allow controlling the use of webkit-gtk - -WebKitGTK is used to display payment pages when buying things in Telegram -shops. This library can be disabled properly alongside the GTK integration with -its flag. However, I reckon *most* users want the GTK integration (fixes -pasting big images, amongst other things), but hardly anyone actually buys -things through Telegram. Controlling these two things separately is trivial, and -the user gets a nice dialog telling them WebKitGTK isn't available in the event -they *do* attempt to use the related features. - -NOTE: GTK integration *must* be enabled for WebKitGTK to work. - ---- tdesktop-2.8.9-full.orig/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp -+++ tdesktop-2.8.9-full/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp -@@ -587,9 +587,11 @@ - if (const auto integration = BaseGtkIntegration::Instance()) { - return integration->exec(parentDBusName); - } -+#ifndef DESKTOP_APP_DISABLE_WEBKIT - } else if (type == Type::Webview) { - Webview::WebKit2Gtk::SetServiceName(serviceName.toStdString()); - return Webview::WebKit2Gtk::Exec(parentDBusName.toStdString()); -+#endif - } else if (type == Type::TDesktop) { - ServiceName = serviceName.toStdString(); - if (const auto integration = Instance()) { -@@ -602,7 +604,9 @@ - - void GtkIntegration::Start(Type type) { - if (type != Type::Base -+#ifndef DESKTOP_APP_DISABLE_WEBKIT - && type != Type::Webview -+#endif - && type != Type::TDesktop) { - return; - } -@@ -613,11 +617,13 @@ - - if (type == Type::Base) { - BaseGtkIntegration::SetServiceName(kBaseService.utf16().arg(h)); -+#ifndef DESKTOP_APP_DISABLE_WEBKIT - } else if (type == Type::Webview) { - Webview::WebKit2Gtk::SetServiceName( - kWebviewService.utf16().arg(h).arg("%1").toStdString()); - - return; -+#endif - } else { - ServiceName = kService.utf16().arg(h).toStdString(); - } ---- tdesktop-2.8.9-full.orig/Telegram/lib_webview/CMakeLists.txt -+++ tdesktop-2.8.9-full/Telegram/lib_webview/CMakeLists.txt -@@ -48,7 +48,7 @@ - nuget_add_webview(lib_webview) - nuget_add_winrt(lib_webview) - elseif (LINUX) -- if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION) -+ if (NOT DESKTOP_APP_DISABLE_WEBKIT) - find_package(PkgConfig REQUIRED) - - if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY) ---- tdesktop-2.8.9-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp -+++ tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp -@@ -11,14 +11,14 @@ - namespace Webview { - - Available Availability() { --#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION -+#ifndef DESKTOP_APP_DISABLE_WEBKIT - return WebKit2Gtk::Availability(); --#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION -+#else // !DESKTOP_APP_DISABLE_WEBKIT - return Available{ - .error = Available::Error::NoGtkOrWebkit2Gtk, - .details = "This feature was disabled at build time.", - }; --#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION -+#endif // DESKTOP_APP_DISABLE_WEBKIT - } - - bool SupportsEmbedAfterCreate() { -@@ -26,11 +26,11 @@ - } - - std::unique_ptr<Interface> CreateInstance(Config config) { --#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION -+#ifndef DESKTOP_APP_DISABLE_WEBKIT - return WebKit2Gtk::CreateInstance(std::move(config)); --#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION -+#else // !DESKTOP_APP_DISABLE_WEBKIT - return nullptr; --#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION -+#endif // DESKTOP_APP_DISABLE_WEBKIT - } - - } // namespace Webview ---- tdesktop-2.8.9-full.orig/cmake/options.cmake -+++ tdesktop-2.8.9-full/cmake/options.cmake -@@ -49,6 +49,13 @@ - ) - endif() - -+if (DESKTOP_APP_DISABLE_WEBKIT) -+ target_compile_definitions(common_options -+ INTERFACE -+ DESKTOP_APP_DISABLE_WEBKIT -+ ) -+endif() -+ - if (DESKTOP_APP_USE_PACKAGED) - target_compile_definitions(common_options - INTERFACE ---- tdesktop-2.8.9-full.orig/cmake/variables.cmake -+++ tdesktop-2.8.9-full/cmake/variables.cmake -@@ -37,6 +37,7 @@ - option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages. (Linux only)" OFF) - option(DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC "Link ffmpeg statically in packaged mode." OFF) - option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." ${osx_special_target}) -+option(DESKTOP_APP_DISABLE_WEBKIT "Disable WebkitGTK library (Linux only)." OFF) - option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no_special_target}) - option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate}) - option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF) diff --git a/net-im/telegram-desktop/files/tdesktop-2.8.9-webview-fix-glib.patch b/net-im/telegram-desktop/files/tdesktop-2.8.9-webview-fix-glib.patch deleted file mode 100644 index 02c96d28b2c1..000000000000 --- a/net-im/telegram-desktop/files/tdesktop-2.8.9-webview-fix-glib.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fixes an issue with glib headers including a C++ header inside extern "C" - -This patch is a hacky workaround, proper solution doesn't seem trivial. - -In file included from /usr/include/glib-2.0/glib/gatomic.h:31, - from /usr/include/glib-2.0/glib/gthread.h:32, - from /usr/include/glib-2.0/glib/gasyncqueue.h:32, - from /usr/include/glib-2.0/glib.h:32, - from /usr/include/gtk-3.0/gdk/gdkconfig.h:13, - from /usr/include/gtk-3.0/gdk/gdk.h:30, - from /usr/include/gtk-3.0/gtk/gtk.h:30, - from /var/tmp/portage/net-im/telegram-desktop-2.8.9/work/tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h:11, - from /var/tmp/portage/net-im/telegram-desktop-2.8.9/work/tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp:7: -/usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/include/g++-v11/type_traits:56:3: error: template with C linkage - 56 | template<typename _Tp, _Tp __v> - | ^~~~~~~~ -In file included from /var/tmp/portage/net-im/telegram-desktop-2.8.9/work/tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp:7: -/var/tmp/portage/net-im/telegram-desktop-2.8.9/work/tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h:9:1: note: extern "C" linkage started here - 9 | extern "C" { - | ^~~~~~~~~~ - ---- tdesktop-2.8.9-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h -+++ tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h -@@ -6,6 +6,7 @@ - // - #pragma once - -+#include <type_traits> // Required for glib/gatomic.h - extern "C" { - #include <JavaScriptCore/JavaScript.h> - #include <gtk/gtk.h> 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 new file mode 100644 index 000000000000..3df0601b454b --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-2.9.3-add-libdl-dependency.patch @@ -0,0 +1,15 @@ +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/metadata.xml b/net-im/telegram-desktop/metadata.xml index ffde9e742c69..d0e2c0f4aa4f 100644 --- a/net-im/telegram-desktop/metadata.xml +++ b/net-im/telegram-desktop/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>esteve.varela@gmail.com</email> diff --git a/net-im/telegram-desktop/telegram-desktop-2.8.11-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-2.8.11-r2.ebuild deleted file mode 100644 index 940c5b1aed20..000000000000 --- a/net-im/telegram-desktop/telegram-desktop-2.8.11-r2.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 2020-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} ) - -inherit xdg cmake python-any-r1 flag-o-matic - -DESCRIPTION="Official desktop client for Telegram" -HOMEPAGE="https://desktop.telegram.org" - -MY_P="tdesktop-${PV}-full" -SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz" - -LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" -SLOT="0" -KEYWORDS="amd64 ~ppc64" -IUSE="+dbus enchant +gtk +hunspell screencast +spell wayland webkit +X" -REQUIRED_USE=" - spell? ( - ^^ ( enchant hunspell ) - ) - webkit? ( gtk ) - gtk? ( dbus ) -" - -RDEPEND=" - !net-im/telegram-desktop-bin - app-arch/lz4:= - dev-cpp/glibmm:2 - dev-libs/jemalloc:=[-lazy-lock] - dev-libs/xxhash - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?] - >=dev-qt/qtimageformats-5.15:5 - >=dev-qt/qtnetwork-5.15:5[ssl] - >=dev-qt/qtsvg-5.15:5 - >=dev-qt/qtwidgets-5.15:5[png,X?] - media-fonts/open-sans - media-libs/fontconfig:= - ~media-libs/libtgvoip-2.4.4_p20210302 - >=media-libs/libtgvoip-2.4.4_p20210302-r2 - media-libs/openal - media-libs/opus:= - media-libs/rnnoise - ~media-libs/tg_owt-0_pre20210626[screencast=,X=] - media-video/ffmpeg:=[opus] - sys-libs/zlib:=[minizip] - dbus? ( - dev-qt/qtdbus:5 - dev-libs/libdbusmenu-qt[qt5(+)] - ) - enchant? ( app-text/enchant:= ) - gtk? ( x11-libs/gtk+:3[X?,wayland?] ) - hunspell? ( >=app-text/hunspell-1.7:= ) - wayland? ( kde-frameworks/kwayland:= ) - webkit? ( net-libs/webkit-gtk:= ) - X? ( x11-libs/libxcb:= ) -" -DEPEND="${RDEPEND} - dev-cpp/range-v3 - =dev-cpp/ms-gsl-3* -" -BDEPEND=" - ${PYTHON_DEPS} - >=dev-util/cmake-3.16 - virtual/pkgconfig -" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - # https://github.com/desktop-app/cmake_helpers/pull/91 - # https://github.com/desktop-app/lib_webview/pull/2 - "${FILESDIR}/tdesktop-2.8.9-disable-webkit-separately.patch" - # Not a proper fix, not upstreamed - "${FILESDIR}/tdesktop-2.8.9-webview-fix-glib.patch" - "${FILESDIR}/tdesktop-2.8.10-jemalloc-only-telegram.patch" - # Already upstream - "${FILESDIR}/tdesktop-2.8.11-load-gtk-with-qlibrary.patch" - "${FILESDIR}/tdesktop-2.8.11-fix-build-without-pipewire.patch" -) - -pkg_pretend() { - if has ccache ${FEATURES}; then - ewarn - ewarn "ccache does not work with ${PN} out of the box" - ewarn "due to usage of precompiled headers" - ewarn "check bug https://bugs.gentoo.org/715114 for more info" - ewarn - fi -} - -src_prepare() { - # no explicit toggle, doesn't build with the system one #752417 - sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \ - cmake/external/rlottie/CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - # gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595 - local mycmakeargs=( - -DTDESKTOP_LAUNCHER_BASENAME="${PN}" - -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings. - - -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X OFF ON) - -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland OFF ON) - -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus OFF ON) - -DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk OFF ON) - -DDESKTOP_APP_DISABLE_WEBKIT=$(usex webkit OFF ON) - -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell OFF ON) # enables hunspell (recommended) - -DDESKTOP_APP_USE_ENCHANT=$(usex enchant ON OFF) # enables enchant and disables hunspell - ) - - if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then - einfo "Found custom API credentials" - mycmakeargs+=( - -DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}" - -DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}" - ) - else - # https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml - # Building with snapcraft API credentials by default - # Custom API credentials can be obtained here: - # https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md - # After getting credentials you can export variables: - # export MY_TDESKTOP_API_ID="17349"" - # export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb" - # and restart the build" - # you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop - # portage will use custom variable every build automatically - mycmakeargs+=( - -DTDESKTOP_API_ID="611335" - -DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c" - ) - fi - - cmake_src_configure -} - -pkg_postinst() { - xdg_pkg_postinst - use gtk || elog "enable the 'gtk' useflag if you have image copy-paste problems" - if ! use X && ! use screencast; then - elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!" - fi -} diff --git a/net-im/telegram-desktop/telegram-desktop-2.9.3.ebuild b/net-im/telegram-desktop/telegram-desktop-2.9.3.ebuild index aa80c6771855..9e09efaee54e 100644 --- a/net-im/telegram-desktop/telegram-desktop-2.9.3.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-2.9.3.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${ LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+" SLOT="0" -KEYWORDS="~amd64 ~ppc64" +KEYWORDS="amd64 ~ppc64" IUSE="+dbus enchant +gtk +hunspell screencast +spell wayland webkit +X" REQUIRED_USE=" spell? ( @@ -73,6 +73,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/tdesktop-2.9.3-jemalloc-only-telegram.patch" + "${FILESDIR}/tdesktop-2.9.3-add-libdl-dependency.patch" ) pkg_pretend() { |