Gentoo Archives: gentoo-commits

From: Georgy Yakovlev <gyakovlev@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/files/, net-im/telegram-desktop/
Date: Thu, 16 Sep 2021 12:07:50
Message-Id: 1631794022.18b6ffbbb0621fb207b34618a41d53e9607b057f.gyakovlev@gentoo
1 commit: 18b6ffbbb0621fb207b34618a41d53e9607b057f
2 Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
3 AuthorDate: Tue Sep 14 20:54:10 2021 +0000
4 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 16 12:07:02 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18b6ffbb
7
8 net-im/telegram-desktop: Drop old
9
10 Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/22300
12 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
13
14 net-im/telegram-desktop/Manifest | 1 -
15 .../tdesktop-2.8.10-jemalloc-only-telegram.patch | 31 -----
16 ...desktop-2.8.11-fix-build-without-pipewire.patch | 26 ----
17 .../tdesktop-2.8.11-load-gtk-with-qlibrary.patch | 112 ---------------
18 .../tdesktop-2.8.9-disable-webkit-separately.patch | 122 -----------------
19 .../files/tdesktop-2.8.9-webview-fix-glib.patch | 31 -----
20 .../telegram-desktop-2.8.11-r2.ebuild | 150 ---------------------
21 7 files changed, 473 deletions(-)
22
23 diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
24 index 1a75fbd0593..f2bd8bdf9dc 100644
25 --- a/net-im/telegram-desktop/Manifest
26 +++ b/net-im/telegram-desktop/Manifest
27 @@ -1,3 +1,2 @@
28 -DIST tdesktop-2.8.11-full.tar.gz 37105468 BLAKE2B 1ec5a0003bd1b948b45213509fa0649dfde5ec8e3dff097bf45aa0951c7963930788b0bee853f286d04b008b78704c464b6614b8391350767affebc2623b25af SHA512 a553313b04fbb562745be2381a84117657172952e46e280980a73c9fcfe2a7cf29c0e012e4b1259816d1e6652418e7a1ddfc4e394544fcc3aeb33704cbe80860
29 DIST tdesktop-2.9.3-full.tar.gz 37335782 BLAKE2B 197583ba6568c455218c51f590c1ba1a3f10c390caa4fd03657098f499ce113a4f5f57ca9dd53bc4baba31992d4229768ed35e68ad6b0685010bc335817edcac SHA512 810cfac5d7e6ce9413b1b2406927e89c1383ea5b725233a68b2cb29dd374b4c3386c22186640afde4492c844516c88889a5db8e5b167a09d6d6c1270ac965ac4
30 DIST tdesktop-3.0.1-full.tar.gz 37531917 BLAKE2B c139501f23c742f76d4acd43def69963413ffafef1be584f13d7359b3c20625def7ec283a981556c795aa4dc5ad2e117e1f8aada28cd4815f66f02510e607435 SHA512 6bff6be5f2c0c7a17df61dccc5a3216dcbb95a1c6d3176442c530e2c1b525e6d15079b230d40751f20684da2a1067d4518a9a1ab90d49d1a7338d3e05239d447
31
32 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
33 deleted file mode 100644
34 index 8604acc6a74..00000000000
35 --- a/net-im/telegram-desktop/files/tdesktop-2.8.10-jemalloc-only-telegram.patch
36 +++ /dev/null
37 @@ -1,31 +0,0 @@
38 -Only link jemalloc for the Telegram binary
39 -
40 -Some combination of factors is making the different codegen tools hang when
41 -jemalloc is linked for those, and they're ran under portage's sandbox. Since
42 -this is only used during build-time, and jemalloc is merely necessary to
43 -improve runtime memory use, it's unnecessary to use it for anything else.
44 -
45 ---- tdesktop-2.8.10-full.orig/Telegram/CMakeLists.txt
46 -+++ tdesktop-2.8.10-full/Telegram/CMakeLists.txt
47 -@@ -87,6 +87,7 @@
48 - PRIVATE
49 - desktop-app::external_glibmm
50 - desktop-app::external_glib
51 -+ desktop-app::external_jemalloc
52 - )
53 -
54 - if (NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
55 ---- tdesktop-2.8.10-full.orig/cmake/options_linux.cmake
56 -+++ tdesktop-2.8.10-full/cmake/options_linux.cmake
57 -@@ -58,11 +58,6 @@
58 - endif()
59 - endif()
60 -
61 --target_link_libraries(common_options
62 --INTERFACE
63 -- desktop-app::external_jemalloc
64 --)
65 --
66 - if (DESKTOP_APP_USE_PACKAGED)
67 - find_library(ATOMIC_LIBRARY atomic)
68 - else()
69
70 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
71 deleted file mode 100644
72 index ecfc63abeb5..00000000000
73 --- a/net-im/telegram-desktop/files/tdesktop-2.8.11-fix-build-without-pipewire.patch
74 +++ /dev/null
75 @@ -1,26 +0,0 @@
76 -Fix build without pipewire
77 -
78 -set_allow_pipewire isn't available if WEBRTC_USE_PIPEWIRE isn't set
79 -
80 ---- tdesktop-2.8.11-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/desktop_capturer/DesktopCaptureSourceHelper.cpp
81 -+++ tdesktop-2.8.11-full/Telegram/ThirdParty/tgcalls/tgcalls/desktop_capturer/DesktopCaptureSourceHelper.cpp
82 -@@ -286,7 +286,7 @@
83 - options.set_allow_use_magnification_api(false);
84 - #elif defined WEBRTC_MAC
85 - options.set_allow_iosurface(true);
86 --#elif defined WEBRTC_LINUX
87 -+#elif defined WEBRTC_USE_PIPEWIRE
88 - options.set_allow_pipewire(true);
89 - #endif // WEBRTC_WIN || WEBRTC_MAC
90 -
91 ---- tdesktop-2.8.11-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/desktop_capturer/DesktopCaptureSourceManager.cpp
92 -+++ tdesktop-2.8.11-full/Telegram/ThirdParty/tgcalls/tgcalls/desktop_capturer/DesktopCaptureSourceManager.cpp
93 -@@ -33,7 +33,7 @@
94 - result.set_allow_use_magnification_api(false);
95 - #elif defined WEBRTC_MAC
96 - result.set_allow_iosurface(type == DesktopCaptureType::Screen);
97 --#elif defined WEBRTC_LINUX
98 -+#elif defined WEBRTC_USE_PIPEWIRE
99 - result.set_allow_pipewire(true);
100 - #endif // WEBRTC_WIN || WEBRTC_MAC
101 - result.set_detect_updated_region(true);
102
103 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
104 deleted file mode 100644
105 index 91e3f859eeb..00000000000
106 --- a/net-im/telegram-desktop/files/tdesktop-2.8.11-load-gtk-with-qlibrary.patch
107 +++ /dev/null
108 @@ -1,112 +0,0 @@
109 -Fix running with QT_QPA_PLATFORMTHEME=gtk2
110 -
111 -From: https://bugs.archlinux.org/task/71541
112 -
113 ---- tdesktop-2.8.11-full.orig/Telegram/CMakeLists.txt
114 -+++ tdesktop-2.8.11-full/Telegram/CMakeLists.txt
115 -@@ -114,25 +114,16 @@
116 - endif()
117 -
118 - if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
119 -- target_link_libraries(Telegram PRIVATE rt)
120 - find_package(PkgConfig REQUIRED)
121 -
122 -- if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
123 -- pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0)
124 -- target_link_libraries(Telegram PRIVATE PkgConfig::GTK3)
125 --
126 -- if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
127 -- pkg_check_modules(X11 REQUIRED IMPORTED_TARGET x11)
128 -- target_link_libraries(Telegram PRIVATE PkgConfig::X11)
129 -- endif()
130 -- else()
131 -- pkg_check_modules(GTK REQUIRED gtk+-3.0)
132 -- target_include_directories(Telegram PRIVATE ${GTK_INCLUDE_DIRS})
133 -+ pkg_check_modules(GTK REQUIRED gtk+-3.0)
134 -+ target_include_directories(Telegram PRIVATE ${GTK_INCLUDE_DIRS})
135 -
136 -- if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
137 -- target_link_libraries(Telegram PRIVATE X11)
138 -- endif()
139 -+ if (NOT DESKTOP_APP_DISABLE_X11_INTEGRATION)
140 -+ target_link_libraries(Telegram PRIVATE X11)
141 - endif()
142 -+
143 -+ target_link_libraries(Telegram PRIVATE rt)
144 - endif()
145 - endif()
146 -
147 ---- tdesktop-2.8.11-full.orig/Telegram/lib_base/CMakeLists.txt
148 -+++ tdesktop-2.8.11-full/Telegram/lib_base/CMakeLists.txt
149 -@@ -254,13 +254,8 @@
150 - if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
151 - find_package(PkgConfig REQUIRED)
152 -
153 -- if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
154 -- pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0)
155 -- target_link_libraries(lib_base PUBLIC PkgConfig::GTK3)
156 -- else()
157 -- pkg_check_modules(GTK REQUIRED gtk+-3.0)
158 -- target_include_directories(lib_base PUBLIC ${GTK_INCLUDE_DIRS})
159 -- endif()
160 -+ pkg_check_modules(GTK REQUIRED gtk+-3.0)
161 -+ target_include_directories(lib_base PUBLIC ${GTK_INCLUDE_DIRS})
162 - endif()
163 - endif()
164 -
165 ---- tdesktop-2.8.11-full.orig/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration_p.h
166 -+++ tdesktop-2.8.11-full/Telegram/lib_base/base/platform/linux/base_linux_gtk_integration_p.h
167 -@@ -13,15 +13,7 @@
168 - #include <gdk/gdk.h>
169 - } // extern "C"
170 -
171 --#if defined DESKTOP_APP_USE_PACKAGED && !defined DESKTOP_APP_USE_PACKAGED_LAZY
172 --#define LINK_TO_GTK
173 --#endif // DESKTOP_APP_USE_PACKAGED && !DESKTOP_APP_USE_PACKAGED_LAZY
174 --
175 --#ifdef LINK_TO_GTK
176 --#define LOAD_GTK_SYMBOL(lib, func) (func = ::func)
177 --#else // LINK_TO_GTK
178 - #define LOAD_GTK_SYMBOL LOAD_LIBRARY_SYMBOL
179 --#endif // !LINK_TO_GTK
180 -
181 - namespace base {
182 - namespace Platform {
183 -@@ -31,11 +23,7 @@
184 - QLibrary &lib,
185 - const char *name,
186 - std::optional<int> version = std::nullopt) {
187 --#ifdef LINK_TO_GTK
188 -- return true;
189 --#else // LINK_TO_GTK
190 - return LoadLibrary(lib, name, version);
191 --#endif // LINK_TO_GTK
192 - }
193 -
194 - inline gboolean (*gtk_init_check)(int *argc, char ***argv) = nullptr;
195 ---- tdesktop-2.8.11-full.orig/Telegram/lib_webview/CMakeLists.txt
196 -+++ tdesktop-2.8.11-full/Telegram/lib_webview/CMakeLists.txt
197 -@@ -51,19 +51,11 @@
198 - if (NOT DESKTOP_APP_DISABLE_WEBKIT)
199 - find_package(PkgConfig REQUIRED)
200 -
201 -- if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
202 -- pkg_check_modules(GTK3 REQUIRED IMPORTED_TARGET gtk+-3.0)
203 -- target_link_libraries(lib_webview PUBLIC PkgConfig::GTK3)
204 -+ pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
205 -+ target_include_directories(lib_webview PUBLIC ${GTK3_INCLUDE_DIRS})
206 -
207 -- pkg_check_modules(WEBKIT REQUIRED IMPORTED_TARGET webkit2gtk-4.0)
208 -- target_link_libraries(lib_webview PUBLIC PkgConfig::WEBKIT)
209 -- else()
210 -- pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
211 -- target_include_directories(lib_webview PUBLIC ${GTK3_INCLUDE_DIRS})
212 --
213 -- pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.0)
214 -- target_include_directories(lib_webview PUBLIC ${WEBKIT_INCLUDE_DIRS})
215 -- endif()
216 -+ pkg_check_modules(WEBKIT REQUIRED webkit2gtk-4.0)
217 -+ target_include_directories(lib_webview PUBLIC ${WEBKIT_INCLUDE_DIRS})
218 - else()
219 - remove_target_sources(lib_webview ${src_loc}
220 - webview/platform/linux/webview_linux_webkit_gtk.cpp
221
222 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
223 deleted file mode 100644
224 index 388e09fa58d..00000000000
225 --- a/net-im/telegram-desktop/files/tdesktop-2.8.9-disable-webkit-separately.patch
226 +++ /dev/null
227 @@ -1,122 +0,0 @@
228 -Allow controlling the use of webkit-gtk
229 -
230 -WebKitGTK is used to display payment pages when buying things in Telegram
231 -shops. This library can be disabled properly alongside the GTK integration with
232 -its flag. However, I reckon *most* users want the GTK integration (fixes
233 -pasting big images, amongst other things), but hardly anyone actually buys
234 -things through Telegram. Controlling these two things separately is trivial, and
235 -the user gets a nice dialog telling them WebKitGTK isn't available in the event
236 -they *do* attempt to use the related features.
237 -
238 -NOTE: GTK integration *must* be enabled for WebKitGTK to work.
239 -
240 ---- tdesktop-2.8.9-full.orig/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp
241 -+++ tdesktop-2.8.9-full/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp
242 -@@ -587,9 +587,11 @@
243 - if (const auto integration = BaseGtkIntegration::Instance()) {
244 - return integration->exec(parentDBusName);
245 - }
246 -+#ifndef DESKTOP_APP_DISABLE_WEBKIT
247 - } else if (type == Type::Webview) {
248 - Webview::WebKit2Gtk::SetServiceName(serviceName.toStdString());
249 - return Webview::WebKit2Gtk::Exec(parentDBusName.toStdString());
250 -+#endif
251 - } else if (type == Type::TDesktop) {
252 - ServiceName = serviceName.toStdString();
253 - if (const auto integration = Instance()) {
254 -@@ -602,7 +604,9 @@
255 -
256 - void GtkIntegration::Start(Type type) {
257 - if (type != Type::Base
258 -+#ifndef DESKTOP_APP_DISABLE_WEBKIT
259 - && type != Type::Webview
260 -+#endif
261 - && type != Type::TDesktop) {
262 - return;
263 - }
264 -@@ -613,11 +617,13 @@
265 -
266 - if (type == Type::Base) {
267 - BaseGtkIntegration::SetServiceName(kBaseService.utf16().arg(h));
268 -+#ifndef DESKTOP_APP_DISABLE_WEBKIT
269 - } else if (type == Type::Webview) {
270 - Webview::WebKit2Gtk::SetServiceName(
271 - kWebviewService.utf16().arg(h).arg("%1").toStdString());
272 -
273 - return;
274 -+#endif
275 - } else {
276 - ServiceName = kService.utf16().arg(h).toStdString();
277 - }
278 ---- tdesktop-2.8.9-full.orig/Telegram/lib_webview/CMakeLists.txt
279 -+++ tdesktop-2.8.9-full/Telegram/lib_webview/CMakeLists.txt
280 -@@ -48,7 +48,7 @@
281 - nuget_add_webview(lib_webview)
282 - nuget_add_winrt(lib_webview)
283 - elseif (LINUX)
284 -- if (NOT DESKTOP_APP_DISABLE_GTK_INTEGRATION)
285 -+ if (NOT DESKTOP_APP_DISABLE_WEBKIT)
286 - find_package(PkgConfig REQUIRED)
287 -
288 - if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
289 ---- tdesktop-2.8.9-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
290 -+++ tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
291 -@@ -11,14 +11,14 @@
292 - namespace Webview {
293 -
294 - Available Availability() {
295 --#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION
296 -+#ifndef DESKTOP_APP_DISABLE_WEBKIT
297 - return WebKit2Gtk::Availability();
298 --#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION
299 -+#else // !DESKTOP_APP_DISABLE_WEBKIT
300 - return Available{
301 - .error = Available::Error::NoGtkOrWebkit2Gtk,
302 - .details = "This feature was disabled at build time.",
303 - };
304 --#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION
305 -+#endif // DESKTOP_APP_DISABLE_WEBKIT
306 - }
307 -
308 - bool SupportsEmbedAfterCreate() {
309 -@@ -26,11 +26,11 @@
310 - }
311 -
312 - std::unique_ptr<Interface> CreateInstance(Config config) {
313 --#ifndef DESKTOP_APP_DISABLE_GTK_INTEGRATION
314 -+#ifndef DESKTOP_APP_DISABLE_WEBKIT
315 - return WebKit2Gtk::CreateInstance(std::move(config));
316 --#else // !DESKTOP_APP_DISABLE_GTK_INTEGRATION
317 -+#else // !DESKTOP_APP_DISABLE_WEBKIT
318 - return nullptr;
319 --#endif // DESKTOP_APP_DISABLE_GTK_INTEGRATION
320 -+#endif // DESKTOP_APP_DISABLE_WEBKIT
321 - }
322 -
323 - } // namespace Webview
324 ---- tdesktop-2.8.9-full.orig/cmake/options.cmake
325 -+++ tdesktop-2.8.9-full/cmake/options.cmake
326 -@@ -49,6 +49,13 @@
327 - )
328 - endif()
329 -
330 -+if (DESKTOP_APP_DISABLE_WEBKIT)
331 -+ target_compile_definitions(common_options
332 -+ INTERFACE
333 -+ DESKTOP_APP_DISABLE_WEBKIT
334 -+ )
335 -+endif()
336 -+
337 - if (DESKTOP_APP_USE_PACKAGED)
338 - target_compile_definitions(common_options
339 - INTERFACE
340 ---- tdesktop-2.8.9-full.orig/cmake/variables.cmake
341 -+++ tdesktop-2.8.9-full/cmake/variables.cmake
342 -@@ -37,6 +37,7 @@
343 - option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages. (Linux only)" OFF)
344 - option(DESKTOP_APP_USE_PACKAGED_FFMPEG_STATIC "Link ffmpeg statically in packaged mode." OFF)
345 - option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." ${osx_special_target})
346 -+option(DESKTOP_APP_DISABLE_WEBKIT "Disable WebkitGTK library (Linux only)." OFF)
347 - option(DESKTOP_APP_DISABLE_CRASH_REPORTS "Disable crash report generation." ${no_special_target})
348 - option(DESKTOP_APP_DISABLE_AUTOUPDATE "Disable autoupdate." ${disable_autoupdate})
349 - option(DESKTOP_APP_USE_HUNSPELL_ONLY "Disable system spellchecker and use bundled Hunspell only. (For debugging purposes)" OFF)
350
351 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
352 deleted file mode 100644
353 index 02c96d28b2c..00000000000
354 --- a/net-im/telegram-desktop/files/tdesktop-2.8.9-webview-fix-glib.patch
355 +++ /dev/null
356 @@ -1,31 +0,0 @@
357 -Fixes an issue with glib headers including a C++ header inside extern "C"
358 -
359 -This patch is a hacky workaround, proper solution doesn't seem trivial.
360 -
361 -In file included from /usr/include/glib-2.0/glib/gatomic.h:31,
362 - from /usr/include/glib-2.0/glib/gthread.h:32,
363 - from /usr/include/glib-2.0/glib/gasyncqueue.h:32,
364 - from /usr/include/glib-2.0/glib.h:32,
365 - from /usr/include/gtk-3.0/gdk/gdkconfig.h:13,
366 - from /usr/include/gtk-3.0/gdk/gdk.h:30,
367 - from /usr/include/gtk-3.0/gtk/gtk.h:30,
368 - 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,
369 - 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:
370 -/usr/lib/gcc/x86_64-pc-linux-gnu/11.1.0/include/g++-v11/type_traits:56:3: error: template with C linkage
371 - 56 | template<typename _Tp, _Tp __v>
372 - | ^~~~~~~~
373 -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:
374 -/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
375 - 9 | extern "C" {
376 - | ^~~~~~~~~~
377 -
378 ---- tdesktop-2.8.9-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
379 -+++ tdesktop-2.8.9-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
380 -@@ -6,6 +6,7 @@
381 - //
382 - #pragma once
383 -
384 -+#include <type_traits> // Required for glib/gatomic.h
385 - extern "C" {
386 - #include <JavaScriptCore/JavaScript.h>
387 - #include <gtk/gtk.h>
388
389 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
390 deleted file mode 100644
391 index 940c5b1aed2..00000000000
392 --- a/net-im/telegram-desktop/telegram-desktop-2.8.11-r2.ebuild
393 +++ /dev/null
394 @@ -1,150 +0,0 @@
395 -# Copyright 2020-2021 Gentoo Authors
396 -# Distributed under the terms of the GNU General Public License v2
397 -
398 -EAPI=7
399 -
400 -PYTHON_COMPAT=( python3_{7..10} )
401 -
402 -inherit xdg cmake python-any-r1 flag-o-matic
403 -
404 -DESCRIPTION="Official desktop client for Telegram"
405 -HOMEPAGE="https://desktop.telegram.org"
406 -
407 -MY_P="tdesktop-${PV}-full"
408 -SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
409 -
410 -LICENSE="BSD GPL-3-with-openssl-exception LGPL-2+"
411 -SLOT="0"
412 -KEYWORDS="amd64 ~ppc64"
413 -IUSE="+dbus enchant +gtk +hunspell screencast +spell wayland webkit +X"
414 -REQUIRED_USE="
415 - spell? (
416 - ^^ ( enchant hunspell )
417 - )
418 - webkit? ( gtk )
419 - gtk? ( dbus )
420 -"
421 -
422 -RDEPEND="
423 - !net-im/telegram-desktop-bin
424 - app-arch/lz4:=
425 - dev-cpp/glibmm:2
426 - dev-libs/jemalloc:=[-lazy-lock]
427 - dev-libs/xxhash
428 - >=dev-qt/qtcore-5.15:5
429 - >=dev-qt/qtgui-5.15:5[dbus?,jpeg,png,wayland?,X?]
430 - >=dev-qt/qtimageformats-5.15:5
431 - >=dev-qt/qtnetwork-5.15:5[ssl]
432 - >=dev-qt/qtsvg-5.15:5
433 - >=dev-qt/qtwidgets-5.15:5[png,X?]
434 - media-fonts/open-sans
435 - media-libs/fontconfig:=
436 - ~media-libs/libtgvoip-2.4.4_p20210302
437 - >=media-libs/libtgvoip-2.4.4_p20210302-r2
438 - media-libs/openal
439 - media-libs/opus:=
440 - media-libs/rnnoise
441 - ~media-libs/tg_owt-0_pre20210626[screencast=,X=]
442 - media-video/ffmpeg:=[opus]
443 - sys-libs/zlib:=[minizip]
444 - dbus? (
445 - dev-qt/qtdbus:5
446 - dev-libs/libdbusmenu-qt[qt5(+)]
447 - )
448 - enchant? ( app-text/enchant:= )
449 - gtk? ( x11-libs/gtk+:3[X?,wayland?] )
450 - hunspell? ( >=app-text/hunspell-1.7:= )
451 - wayland? ( kde-frameworks/kwayland:= )
452 - webkit? ( net-libs/webkit-gtk:= )
453 - X? ( x11-libs/libxcb:= )
454 -"
455 -DEPEND="${RDEPEND}
456 - dev-cpp/range-v3
457 - =dev-cpp/ms-gsl-3*
458 -"
459 -BDEPEND="
460 - ${PYTHON_DEPS}
461 - >=dev-util/cmake-3.16
462 - virtual/pkgconfig
463 -"
464 -
465 -S="${WORKDIR}/${MY_P}"
466 -
467 -PATCHES=(
468 - # https://github.com/desktop-app/cmake_helpers/pull/91
469 - # https://github.com/desktop-app/lib_webview/pull/2
470 - "${FILESDIR}/tdesktop-2.8.9-disable-webkit-separately.patch"
471 - # Not a proper fix, not upstreamed
472 - "${FILESDIR}/tdesktop-2.8.9-webview-fix-glib.patch"
473 - "${FILESDIR}/tdesktop-2.8.10-jemalloc-only-telegram.patch"
474 - # Already upstream
475 - "${FILESDIR}/tdesktop-2.8.11-load-gtk-with-qlibrary.patch"
476 - "${FILESDIR}/tdesktop-2.8.11-fix-build-without-pipewire.patch"
477 -)
478 -
479 -pkg_pretend() {
480 - if has ccache ${FEATURES}; then
481 - ewarn
482 - ewarn "ccache does not work with ${PN} out of the box"
483 - ewarn "due to usage of precompiled headers"
484 - ewarn "check bug https://bugs.gentoo.org/715114 for more info"
485 - ewarn
486 - fi
487 -}
488 -
489 -src_prepare() {
490 - # no explicit toggle, doesn't build with the system one #752417
491 - sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
492 - cmake/external/rlottie/CMakeLists.txt || die
493 -
494 - cmake_src_prepare
495 -}
496 -
497 -src_configure() {
498 - # gtk is really needed for image copy-paste due to https://bugreports.qt.io/browse/QTBUG-56595
499 - local mycmakeargs=(
500 - -DTDESKTOP_LAUNCHER_BASENAME="${PN}"
501 - -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings.
502 -
503 - -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex X OFF ON)
504 - -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex wayland OFF ON)
505 - -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex dbus OFF ON)
506 - -DDESKTOP_APP_DISABLE_GTK_INTEGRATION=$(usex gtk OFF ON)
507 - -DDESKTOP_APP_DISABLE_WEBKIT=$(usex webkit OFF ON)
508 - -DDESKTOP_APP_DISABLE_SPELLCHECK=$(usex spell OFF ON) # enables hunspell (recommended)
509 - -DDESKTOP_APP_USE_ENCHANT=$(usex enchant ON OFF) # enables enchant and disables hunspell
510 - )
511 -
512 - if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
513 - einfo "Found custom API credentials"
514 - mycmakeargs+=(
515 - -DTDESKTOP_API_ID="${MY_TDESKTOP_API_ID}"
516 - -DTDESKTOP_API_HASH="${MY_TDESKTOP_API_HASH}"
517 - )
518 - else
519 - # https://github.com/telegramdesktop/tdesktop/blob/dev/snap/snapcraft.yaml
520 - # Building with snapcraft API credentials by default
521 - # Custom API credentials can be obtained here:
522 - # https://github.com/telegramdesktop/tdesktop/blob/dev/docs/api_credentials.md
523 - # After getting credentials you can export variables:
524 - # export MY_TDESKTOP_API_ID="17349""
525 - # export MY_TDESKTOP_API_HASH="344583e45741c457fe1862106095a5eb"
526 - # and restart the build"
527 - # you can set above variables (without export) in /etc/portage/env/net-im/telegram-desktop
528 - # portage will use custom variable every build automatically
529 - mycmakeargs+=(
530 - -DTDESKTOP_API_ID="611335"
531 - -DTDESKTOP_API_HASH="d524b414d21f4d37f08684c1df41ac9c"
532 - )
533 - fi
534 -
535 - cmake_src_configure
536 -}
537 -
538 -pkg_postinst() {
539 - xdg_pkg_postinst
540 - use gtk || elog "enable the 'gtk' useflag if you have image copy-paste problems"
541 - if ! use X && ! use screencast; then
542 - elog "both the 'X' and 'screencast' useflags are disabled, screen sharing won't work!"
543 - fi
544 -}