public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/files/
@ 2020-07-01 17:02 Georgy Yakovlev
  0 siblings, 0 replies; 7+ messages in thread
From: Georgy Yakovlev @ 2020-07-01 17:02 UTC (permalink / raw
  To: gentoo-commits

commit:     9ccaf3ec7936baea27692990a809da1187aa1031
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  1 16:51:03 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Jul  1 17:02:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ccaf3ec

net-im/telegram-desktop: drop unused patch

merged upstream

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 net-im/telegram-desktop/files/2.1.14-no-gtk.patch | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/net-im/telegram-desktop/files/2.1.14-no-gtk.patch b/net-im/telegram-desktop/files/2.1.14-no-gtk.patch
deleted file mode 100644
index 365b7f2967e..00000000000
--- a/net-im/telegram-desktop/files/2.1.14-no-gtk.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
-index eb23796..3424bab 100644
---- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
-+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
-@@ -521,6 +521,7 @@ QString GetIconName() {
- }
- 
- bool GtkClipboardSupported() {
-+#ifndef TDESKTOP_DISABLE_GTK_INTEGRATION
- 	return (Libs::gtk_clipboard_get != nullptr)
- 		&& (Libs::gtk_clipboard_wait_for_contents != nullptr)
- 		&& (Libs::gtk_clipboard_wait_for_image != nullptr)
-@@ -532,6 +533,8 @@ bool GtkClipboardSupported() {
- 		&& (Libs::gdk_pixbuf_get_rowstride != nullptr)
- 		&& (Libs::gdk_pixbuf_get_has_alpha != nullptr)
- 		&& (Libs::gdk_atom_intern != nullptr);
-+#endif // !TDESKTOP_DISABLE_GTK_INTEGRATION
-+	return false;
- }
- 
- QImage GetImageFromClipboard() {


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/files/
@ 2020-07-31 18:33 Aaron Bauman
  0 siblings, 0 replies; 7+ messages in thread
From: Aaron Bauman @ 2020-07-31 18:33 UTC (permalink / raw
  To: gentoo-commits

commit:     61fa2ab0eb83cb55d7f425802ff83019aa87b0ec
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Jul 31 17:32:52 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Jul 31 18:33:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61fa2ab0

net-im/telegram-desktop: remove unused patch(es)

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16920
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../files/2.1.20-qt-includes.patch                 | 72 ----------------------
 1 file changed, 72 deletions(-)

diff --git a/net-im/telegram-desktop/files/2.1.20-qt-includes.patch b/net-im/telegram-desktop/files/2.1.20-qt-includes.patch
deleted file mode 100644
index a2f02aea3b0..00000000000
--- a/net-im/telegram-desktop/files/2.1.20-qt-includes.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 9eb24ca5c194482faf86e68d93527707fa01a78e Mon Sep 17 00:00:00 2001
-From: Ilya Fedin <fedin-ilja2010@ya.ru>
-Date: Thu, 16 Jul 2020 18:54:29 +0400
-Subject: [PATCH] QtWaylandClient contains QtXkbCommonSupport includes
-
----
- external/qt/CMakeLists.txt | 25 +++++++++++++++++++++++++
- external/qt/package.cmake  |  1 +
- 2 files changed, 26 insertions(+)
-
-diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt
-index 25b662a..490d13b 100644
---- a/cmake/external/qt/CMakeLists.txt
-+++ b/cmake/external/qt/CMakeLists.txt
-@@ -57,6 +57,15 @@ if (DESKTOP_APP_USE_PACKAGED)
-         )
-     endif()
- 
-+    if (Qt5XkbCommonSupport_FOUND)
-+        target_link_libraries(external_qt INTERFACE Qt5::XkbCommonSupport)
-+
-+        target_include_directories(external_qt
-+        INTERFACE
-+            ${Qt5XkbCommonSupport_PRIVATE_INCLUDE_DIRS}
-+        )
-+    endif()
-+
-     if (Qt5WaylandClient_FOUND)
-         target_link_libraries(external_qt INTERFACE Qt5::WaylandClient)
- 
-@@ -97,6 +106,15 @@ else()
-         )
-     endif()
- 
-+    if (Qt5XkbCommonSupport_FOUND)
-+        target_include_directories(external_qt SYSTEM
-+        INTERFACE
-+            ${qt_loc}/include/QtXkbCommonSupport
-+            ${qt_loc}/include/QtXkbCommonSupport/${qt_version}
-+            ${qt_loc}/include/QtXkbCommonSupport/${qt_version}/QtXkbCommonSupport
-+        )
-+    endif()
-+
-     if (LINUX)
-         target_include_directories(external_qt SYSTEM
-         INTERFACE
-@@ -129,6 +147,13 @@ else()
-         )
-     endif()
- 
-+    if (Qt5XkbCommonSupport_FOUND)
-+        target_compile_definitions(external_qt
-+        INTERFACE
-+            QT_XKBCOMMON_SUPPORT_LIB
-+        )
-+    endif()
-+
-     if (LINUX)
-         target_compile_definitions(external_qt
-         INTERFACE
-diff --git a/external/qt/package.cmake b/external/qt/package.cmake
-index 4e97717..ac40f05 100644
---- a/cmake/external/qt/package.cmake
-+++ b/cmake/external/qt/package.cmake
-@@ -25,6 +25,7 @@ find_package(Qt5Gui COMPONENTS QWebpPlugin REQUIRED)
- 
- if (LINUX)
-     find_package(Qt5 COMPONENTS WaylandClient REQUIRED)
-+    find_package(Qt5 COMPONENTS XkbCommonSupport)
- 
-     if (NOT DESKTOP_APP_USE_PACKAGED)
-         find_package(Qt5 COMPONENTS Svg X11Extras REQUIRED)


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/files/
@ 2021-06-04 18:45 Georgy Yakovlev
  0 siblings, 0 replies; 7+ messages in thread
From: Georgy Yakovlev @ 2021-06-04 18:45 UTC (permalink / raw
  To: gentoo-commits

commit:     ab6cb6dd989cc5fc3929c7eec17beec3b52708e0
Author:     Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Fri Jun  4 12:48:07 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Jun  4 18:44:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab6cb6dd

net-im/telegram-desktop: Cleanup patches

Dear diary, today I discovered the power
of QUILT_REFRESH_ARGS="--no-timestamps --no-index".

Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 .../files/tdesktop-2.7.1-fix-disable-dbus-integration.patch       | 2 --
 .../files/tdesktop-2.7.3-disable-webkit-separately.patch          | 8 --------
 .../files/tdesktop-2.7.3-webview-include-gdkx.patch               | 2 --
 .../telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch | 4 ----
 4 files changed, 16 deletions(-)

diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch b/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch
index 5351a808ec4..8563ee5fdca 100644
--- a/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.1-fix-disable-dbus-integration.patch
@@ -1,5 +1,3 @@
-Index: tdesktop-2.7.1-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp
-===================================================================
 --- tdesktop-2.7.1-full.orig/Telegram/SourceFiles/platform/linux/specific_linux.cpp
 +++ tdesktop-2.7.1-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp
 @@ -754,10 +754,12 @@ void InstallLauncher(bool force) {

diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch b/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch
index a143071401a..8e56d10f0de 100644
--- a/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.3-disable-webkit-separately.patch
@@ -1,5 +1,3 @@
-Index: tdesktop-2.7.3-full/Telegram/lib_webview/CMakeLists.txt
-===================================================================
 --- tdesktop-2.7.3-full.orig/Telegram/lib_webview/CMakeLists.txt
 +++ tdesktop-2.7.3-full/Telegram/lib_webview/CMakeLists.txt
 @@ -116,7 +116,7 @@ if (WIN32)
@@ -11,8 +9,6 @@ Index: tdesktop-2.7.3-full/Telegram/lib_webview/CMakeLists.txt
          find_package(PkgConfig REQUIRED)
  
          if (DESKTOP_APP_USE_PACKAGED AND NOT DESKTOP_APP_USE_PACKAGED_LAZY)
-Index: tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
-===================================================================
 --- tdesktop-2.7.3-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
 +++ tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux.cpp
 @@ -11,14 +11,14 @@
@@ -48,8 +44,6 @@ Index: tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_l
  }
  
  } // namespace Webview
-Index: tdesktop-2.7.3-full/cmake/options.cmake
-===================================================================
 --- tdesktop-2.7.3-full.orig/cmake/options.cmake
 +++ tdesktop-2.7.3-full/cmake/options.cmake
 @@ -49,6 +49,13 @@ if (DESKTOP_APP_DISABLE_GTK_INTEGRATION)
@@ -66,8 +60,6 @@ Index: tdesktop-2.7.3-full/cmake/options.cmake
  if (DESKTOP_APP_USE_PACKAGED)
      target_compile_definitions(common_options
      INTERFACE
-Index: tdesktop-2.7.3-full/cmake/variables.cmake
-===================================================================
 --- tdesktop-2.7.3-full.orig/cmake/variables.cmake
 +++ tdesktop-2.7.3-full/cmake/variables.cmake
 @@ -32,6 +32,7 @@ option(DESKTOP_APP_DISABLE_DBUS_INTEGRAT

diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch b/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch
index 2f06bda3272..491a8cd3e1d 100644
--- a/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.3-webview-include-gdkx.patch
@@ -1,5 +1,3 @@
-Index: tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
-===================================================================
 --- tdesktop-2.7.3-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
 +++ tdesktop-2.7.3-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.h
 @@ -12,6 +12,7 @@ extern "C" {

diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
index 0188eaf76f8..3fa782814ba 100644
--- a/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
@@ -1,5 +1,3 @@
-Index: tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.cpp
-===================================================================
 --- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/webview_embed.cpp
 +++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.cpp
 @@ -14,7 +14,6 @@
@@ -10,8 +8,6 @@ Index: tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.cpp
  
  namespace Webview {
  namespace {
-Index: tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.h
-===================================================================
 --- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/webview_embed.h
 +++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.h
 @@ -9,6 +9,8 @@


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/files/
@ 2021-06-12 22:49 Georgy Yakovlev
  0 siblings, 0 replies; 7+ messages in thread
From: Georgy Yakovlev @ 2021-06-12 22:49 UTC (permalink / raw
  To: gentoo-commits

commit:     afb53f971e30a3205aa6135ff113984982380e43
Author:     Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Sat Jun 12 22:06:13 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Jun 12 22:48:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afb53f97

net-im/telegram-desktop: Fix USE=webkit on GCC 11

No runtime effect, no revbump.

Closes: https://bugs.gentoo.org/795567
Thanks-to: reckor <AT> gmail.com <reckor@gmail.com>
Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21216
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 .../files/tdesktop-2.7.4-webview-fix-gcc11.patch               | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch b/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
index 3fa782814ba..7f4b3f2601f 100644
--- a/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
+++ b/net-im/telegram-desktop/files/tdesktop-2.7.4-webview-fix-gcc11.patch
@@ -1,3 +1,13 @@
+--- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp
++++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/platform/linux/webview_linux_webkit_gtk.cpp
+@@ -6,6 +6,7 @@
+ //
+ #include "webview/platform/linux/webview_linux_webkit_gtk.h"
+ 
++#include "base/optional.h"
+ #include "base/platform/linux/base_linux_gtk_integration.h"
+ #include "base/platform/linux/base_linux_gtk_integration_p.h"
+ 
 --- tdesktop-2.7.4-full.orig/Telegram/lib_webview/webview/webview_embed.cpp
 +++ tdesktop-2.7.4-full/Telegram/lib_webview/webview/webview_embed.cpp
 @@ -14,7 +14,6 @@


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/files/
@ 2021-11-06  9:30 Jakov Smolić
  0 siblings, 0 replies; 7+ messages in thread
From: Jakov Smolić @ 2021-11-06  9:30 UTC (permalink / raw
  To: gentoo-commits

commit:     530c6ba6f1b64bcf45c2066a75542140008d66a1
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Nov  5 15:29:58 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Sat Nov  6 09:30:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=530c6ba6

net-im/telegram-desktop: remove unused patch

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/22830
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 .../files/tdesktop-2.9.3-add-libdl-dependency.patch       | 15 ---------------
 1 file changed, 15 deletions(-)

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 3df0601b454..00000000000
--- 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


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/files/
@ 2022-08-28  8:24 Joonas Niilola
  0 siblings, 0 replies; 7+ messages in thread
From: Joonas Niilola @ 2022-08-28  8:24 UTC (permalink / raw
  To: gentoo-commits

commit:     08c76f64132292daca756f8a08d824e16c65ddb3
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Aug  3 17:46:14 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Aug 28 08:24:06 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08c76f64

net-im/telegram-desktop: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.11
Closes: https://github.com/gentoo/gentoo/pull/26728
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../tdesktop-3.5.2-jemalloc-only-telegram.patch    | 33 ----------
 .../files/tdesktop-3.5.2-jemalloc-optional.patch   | 71 ----------------------
 2 files changed, 104 deletions(-)

diff --git a/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch
deleted file mode 100644
index 4f5c7017e6ac..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-only-telegram.patch
+++ /dev/null
@@ -1,33 +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-3.5.2-full.orig/Telegram/CMakeLists.txt
-+++ tdesktop-3.5.2-full/Telegram/CMakeLists.txt
-@@ -1357,6 +1357,12 @@
-             desktop-app::external_kwayland
-         )
-     endif()
-+
-+    target_link_libraries(Telegram
-+    PRIVATE
-+        desktop-app::linux_jemalloc_helper
-+        $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
-+    )
- endif()
- 
- if (build_macstore)
---- tdesktop-3.5.2-full.orig/cmake/options_linux.cmake
-+++ tdesktop-3.5.2-full/cmake/options_linux.cmake
-@@ -64,8 +64,6 @@
- 
- target_link_libraries(common_options
- INTERFACE
--    desktop-app::linux_jemalloc_helper
--    $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
-     ${CMAKE_DL_LIBS}
- )
- 

diff --git a/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch b/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch
deleted file mode 100644
index bd3595858c20..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.5.2-jemalloc-optional.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Optionally disable jemalloc
-
-Telegram upstream heavily insists you use the jemalloc allocator. This is due
-to the high memory usage resulting from the glibc allocator. It is unknown why
-this affects telegram the way it does, but upstream solved the issue by using a
-different allocator. Initially they used mallocng, now jemalloc.
-
-However, other libcs don't necessarily need this, and as such this should be
-optional. As mallocng is a fork of musl's allocator, and this was used before
-the switch to jemalloc, the musl allocator should still be OK.
-
-Please warn glibc users about disabling jemalloc, don't report bugs about
-memory usage upstream unless you're using jemalloc.
-
-Related info:
-https://github.com/telegramdesktop/tdesktop/issues/16084
-https://github.com/desktop-app/cmake_helpers/pull/91#issuecomment-881788003
-
---- tdesktop-3.5.2-full.orig/Telegram/CMakeLists.txt
-+++ tdesktop-3.5.2-full/Telegram/CMakeLists.txt
-@@ -1358,11 +1358,13 @@
-         )
-     endif()
- 
--    target_link_libraries(Telegram
--    PRIVATE
--        desktop-app::linux_jemalloc_helper
--        $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
--    )
-+    if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
-+        target_link_libraries(Telegram
-+        PRIVATE
-+            desktop-app::linux_jemalloc_helper
-+            $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
-+        )
-+    endif()
- endif()
- 
- if (build_macstore)
---- tdesktop-3.5.2-full.orig/cmake/CMakeLists.txt
-+++ tdesktop-3.5.2-full/cmake/CMakeLists.txt
-@@ -5,7 +5,7 @@
- # https://github.com/desktop-app/legal/blob/master/LEGAL
- 
- add_subdirectory(external)
--if (LINUX)
-+if (LINUX AND NOT DESKTOP_APP_DISABLE_JEMALLOC)
-     add_subdirectory(linux_jemalloc_helper)
- endif()
- if (LINUX AND NOT DESKTOP_APP_USE_PACKAGED)
---- tdesktop-3.5.2-full.orig/cmake/external/CMakeLists.txt
-+++ tdesktop-3.5.2-full/cmake/external/CMakeLists.txt
-@@ -37,7 +37,7 @@
- 	add_checked_subdirectory(hunspell)
- endif()
- add_checked_subdirectory(iconv)
--if (LINUX)
-+if (LINUX AND NOT DESKTOP_APP_DISABLE_JEMALLOC)
-     add_checked_subdirectory(jemalloc)
- endif()
- add_checked_subdirectory(jpeg)
---- tdesktop-3.5.2-full.orig/cmake/variables.cmake
-+++ tdesktop-3.5.2-full/cmake/variables.cmake
-@@ -26,6 +26,7 @@
- option(DESKTOP_APP_USE_PACKAGED_FONTS "Use preinstalled fonts instead of bundled patched ones." OFF)
- option(DESKTOP_APP_USE_PACKAGED_RLOTTIE "Find rlottie using CMake instead of bundled patched one." OFF)
- option(DESKTOP_APP_DISABLE_SPELLCHECK "Disable spellcheck library." OFF)
-+option(DESKTOP_APP_DISABLE_JEMALLOC "Disable use of the jemalloc allocator (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)


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/files/
@ 2023-02-07  0:31 Georgy Yakovlev
  0 siblings, 0 replies; 7+ messages in thread
From: Georgy Yakovlev @ 2023-02-07  0:31 UTC (permalink / raw
  To: gentoo-commits

commit:     c1b9e4b245500c965623e90187230a3cac0a62f5
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Feb  4 22:42:57 2023 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Feb  7 00:30:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1b9e4b2

net-im/telegram-desktop: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29432
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 .../files/tdesktop-3.3.0-fix-enchant.patch         | 22 -------
 .../files/tdesktop-3.5.2-musl.patch                | 33 ----------
 .../tdesktop-3.6.0-jemalloc-only-telegram.patch    | 43 -------------
 .../files/tdesktop-3.6.0-support-ffmpeg5.patch     | 75 ----------------------
 .../files/tdesktop-3.6.1-fix-kwayland-5.93.patch   | 55 ----------------
 .../files/tdesktop-3.6.1-fix-use-after-free.patch  | 44 -------------
 6 files changed, 272 deletions(-)

diff --git a/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch b/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch
deleted file mode 100644
index 7550828ef59e..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.3.0-fix-enchant.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://bugs.gentoo.org/830180
-
---- tdesktop-3.3.0-full.orig/Telegram/lib_spellcheck/spellcheck/platform/linux/spellcheck_linux.cpp
-+++ tdesktop-3.3.0-full/Telegram/lib_spellcheck/spellcheck/platform/linux/spellcheck_linux.cpp
-@@ -34,7 +34,7 @@
- auto IsHebrew(const QString &word) {
- 	// Words with mixed scripts will be automatically ignored,
- 	// so this check should be fine.
--	return ::Spellchecker::WordScript(&word) == QChar::Script_Hebrew;
-+	return ::Spellchecker::WordScript(word) == QChar::Script_Hebrew;
- }
- 
- class EnchantSpellChecker {
-@@ -154,7 +154,7 @@
- }
- 
- auto EnchantSpellChecker::findSuggestions(const QString &word) {
--	const auto wordScript = ::Spellchecker::WordScript(&word);
-+	const auto wordScript = ::Spellchecker::WordScript(word);
- 	auto w = word.toStdString();
- 	std::vector<QString> result;
- 	if (!_validators.size()) {

diff --git a/net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch b/net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch
deleted file mode 100644
index 4c34d107913e..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.5.2-musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Stub out some glibc-specific functions
-
-This allows support for alternative libcs like musl
-
---- tdesktop-3.5.2-full.orig/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
-+++ tdesktop-3.5.2-full/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
-@@ -22,7 +22,7 @@
- 
- #include <sys/utsname.h>
- 
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
- #include <gnu/libc-version.h>
- #endif // Q_OS_LINUX
- 
-@@ -200,7 +200,7 @@
- }
- 
- QString GetLibcName() {
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
- 	return "glibc";
- #endif // Q_OS_LINUX
- 
-@@ -208,7 +208,7 @@
- }
- 
- QString GetLibcVersion() {
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
- 	static const auto result = [&] {
- 		const auto version = QString::fromLatin1(gnu_get_libc_version());
- 		return QVersionNumber::fromString(version).isNull() ? QString() : version;

diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch b/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch
deleted file mode 100644
index 18240ce522e2..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.6.0-jemalloc-only-telegram.patch
+++ /dev/null
@@ -1,43 +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.
-
-https://bugs.gentoo.org/802624
-
---- tdesktop-3.6.0-full.orig/Telegram/CMakeLists.txt
-+++ tdesktop-3.6.0-full/Telegram/CMakeLists.txt
-@@ -1376,6 +1376,14 @@
-             desktop-app::external_kwayland
-         )
-     endif()
-+
-+    if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
-+        target_link_libraries(Telegram
-+        INTERFACE
-+            $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
-+            $<LINK_ONLY:desktop-app::external_jemalloc>
-+        )
-+    endif()
- endif()
- 
- if (build_macstore)
---- tdesktop-3.6.0-full.orig/cmake/options_linux.cmake
-+++ tdesktop-3.6.0-full/cmake/options_linux.cmake
-@@ -62,14 +62,6 @@
-     target_link_options(common_options INTERFACE $<IF:$<CONFIG:Debug>,,-g -flto -fuse-linker-plugin>)
- endif()
- 
--if (NOT DESKTOP_APP_DISABLE_JEMALLOC)
--	target_link_libraries(common_options
--	INTERFACE
--	    $<TARGET_OBJECTS:desktop-app::linux_jemalloc_helper>
--	    $<LINK_ONLY:desktop-app::external_jemalloc>
--	)
--endif()
--
- target_link_libraries(common_options
- INTERFACE
-     ${CMAKE_DL_LIBS}

diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch b/net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch
deleted file mode 100644
index 32959acd5482..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.6.0-support-ffmpeg5.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Support FFmpeg 5
-
-I'm not comfortable changing the _durationInMilliseconds formula on older
-versions of ffmpeg. Doing that only for newer versions also reduces the amount
-of testing this patch needs (of which it'll get very minimal amounts, this is a
-job better left for upstream when they get to it).
-
-Also it doesn't compile under ffmpeg 4 if the variables are constants :/
-
---- tdesktop-3.6.0-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartInternal.cpp
-+++ tdesktop-3.6.0-full/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartInternal.cpp
-@@ -104,7 +104,11 @@
- 
-     _frame = av_frame_alloc();
- 
-+#if LIBAVFORMAT_VERSION_MAJOR >= 59
-+    const AVInputFormat *inputFormat = av_find_input_format(container.c_str());
-+#else
-     AVInputFormat *inputFormat = av_find_input_format(container.c_str());
-+#endif
-     if (!inputFormat) {
-         _didReadToEnd = true;
-         return;
-@@ -144,7 +148,11 @@
-         
-         _streamId = i;
- 
-+#if LIBAVFORMAT_VERSION_MAJOR >= 59
-+        _durationInMilliseconds = inStream->duration * 1000 / 48000;
-+#else
-         _durationInMilliseconds = (int)((inStream->duration + inStream->first_dts) * 1000 / 48000);
-+#endif
- 
-         if (inStream->metadata) {
-             AVDictionaryEntry *entry = av_dict_get(inStream->metadata, "TG_META", nullptr, 0);
---- tdesktop-3.6.0-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartPersistentDecoder.cpp
-+++ tdesktop-3.6.0-full/Telegram/ThirdParty/tgcalls/tgcalls/group/AudioStreamingPartPersistentDecoder.cpp
-@@ -32,7 +32,11 @@
-     AudioStreamingPartPersistentDecoderState(AVCodecParameters const *codecParameters, AVRational timeBase) :
-     _codecParameters(codecParameters),
-     _timeBase(timeBase) {
-+#ifdef LIBAVCODEC_VERSION_MAJOR >= 59
-+        const AVCodec *codec = avcodec_find_decoder(codecParameters->codec_id);
-+#else
-         AVCodec *codec = avcodec_find_decoder(codecParameters->codec_id);
-+#endif
-         if (codec) {
-             _codecContext = avcodec_alloc_context3(codec);
-             int ret = avcodec_parameters_to_context(_codecContext, codecParameters);
---- tdesktop-3.6.0-full.orig/Telegram/ThirdParty/tgcalls/tgcalls/group/VideoStreamingPart.cpp
-+++ tdesktop-3.6.0-full/Telegram/ThirdParty/tgcalls/tgcalls/group/VideoStreamingPart.cpp
-@@ -280,7 +280,11 @@
- 
-         int ret = 0;
- 
-+#if LIBAVFORMAT_VERSION_MAJOR >= 59
-+        const AVInputFormat *inputFormat = av_find_input_format(container.c_str());
-+#else
-         AVInputFormat *inputFormat = av_find_input_format(container.c_str());
-+#endif
-         if (!inputFormat) {
-             _didReadToEnd = true;
-             return;
-@@ -323,7 +327,11 @@
-         }
- 
-         if (videoCodecParameters && videoStream) {
-+#if LIBAVCODEC_VERSION_MAJOR >= 59
-+            const AVCodec *codec = avcodec_find_decoder(videoCodecParameters->codec_id);
-+#else
-             AVCodec *codec = avcodec_find_decoder(videoCodecParameters->codec_id);
-+#endif
-             if (codec) {
-                 _codecContext = avcodec_alloc_context3(codec);
-                 ret = avcodec_parameters_to_context(_codecContext, videoCodecParameters);

diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch b/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch
deleted file mode 100644
index e818ffe46456..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-kwayland-5.93.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Fix compatibility with kwayland-5.93.0
-
-The header files were moved, the include directory wasn't being added correctly.
-
-https://bugs.gentoo.org/837569
-
---- tdesktop-3.6.1-full.orig/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
-+++ tdesktop-3.6.1-full/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp
-@@ -9,10 +9,10 @@
- 
- #include "base/platform/base_platform_info.h"
- 
--#include <connection_thread.h>
--#include <registry.h>
--#include <surface.h>
--#include <plasmashell.h>
-+#include <KWayland/Client/connection_thread.h>
-+#include <KWayland/Client/registry.h>
-+#include <KWayland/Client/surface.h>
-+#include <KWayland/Client/plasmashell.h>
- 
- using namespace KWayland::Client;
- 
---- tdesktop-3.6.1-full.orig/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
-+++ tdesktop-3.6.1-full/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp
-@@ -13,11 +13,11 @@
- #include <QtCore/QPointer>
- #include <QtGui/QWindow>
- 
--#include <connection_thread.h>
--#include <registry.h>
--#include <surface.h>
--#include <xdgforeign.h>
--#include <idleinhibit.h>
-+#include <KWayland/Client/connection_thread.h>
-+#include <KWayland/Client/registry.h>
-+#include <KWayland/Client/surface.h>
-+#include <KWayland/Client/xdgforeign.h>
-+#include <KWayland/Client/idleinhibit.h>
- 
- using namespace KWayland::Client;
- 
---- tdesktop-3.6.1-full.orig/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
-+++ tdesktop-3.6.1-full/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp
-@@ -24,8 +24,8 @@
- #include <private/qwaylandwindow_p.h>
- #include <private/qwaylandshellsurface_p.h>
- 
--#include <connection_thread.h>
--#include <registry.h>
-+#include <KWayland/Client/connection_thread.h>
-+#include <KWayland/Client/registry.h>
- 
- Q_DECLARE_METATYPE(QMargins);
- 

diff --git a/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-use-after-free.patch b/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-use-after-free.patch
deleted file mode 100644
index 5a8e6ceedd66..000000000000
--- a/net-im/telegram-desktop/files/tdesktop-3.6.1-fix-use-after-free.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Do not capture buttons in AccountsList that belong to inner VerticalLayout widget
- This fixes a use-after-free error (double destruction) in the main menu right after account switching.
-Bug-Debian: https://bugs.debian.org/1008156
-Bug-Ubuntu: https://launchpad.net/bugs/1967673
-Forwarded: https://github.com/telegramdesktop/tdesktop/pull/24301
-Author: Nicholas Guriev <guriev-ns@ya.ru>
-Last-Update: Sat, 09 Apr 2022 13:47:55 +0300
-
---- tdesktop-3.6.1-full.orig/Telegram/SourceFiles/settings/settings_information.cpp
-+++ tdesktop-3.6.1-full/Telegram/SourceFiles/settings/settings_information.cpp
-@@ -78,9 +78,7 @@
- 	int _outerIndex = 0;
- 
- 	Ui::SlideWrap<Ui::SettingsButton> *_addAccount = nullptr;
--	base::flat_map<
--		not_null<Main::Account*>,
--		base::unique_qptr<Ui::SettingsButton>> _watched;
-+	base::flat_map<not_null<Main::Account*>, Ui::SettingsButton*> _watched;
- 
- 	base::unique_qptr<Ui::PopupMenu> _contextMenu;
- 	std::unique_ptr<Ui::VerticalLayoutReorder> _reorder;
-@@ -730,7 +728,7 @@
- 				order.reserve(inner->count());
- 				for (auto i = 0; i < inner->count(); i++) {
- 					for (const auto &[account, button] : _watched) {
--						if (button.get() == inner->widgetAt(i)) {
-+						if (button == inner->widgetAt(i)) {
- 							order.push_back(account->session().uniqueId());
- 						}
- 					}
-@@ -769,11 +767,11 @@
- 					account,
- 					std::move(activate));
- 			};
--			button.reset(inner->add(MakeAccountButton(
-+			button = inner->add(MakeAccountButton(
- 				inner,
- 				_controller,
- 				account,
--				std::move(callback))));
-+				std::move(callback)));
- 		}
- 	}
- 	inner->resizeToWidth(_outer->width());


^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-02-07  0:31 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-28  8:24 [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/files/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2023-02-07  0:31 Georgy Yakovlev
2021-11-06  9:30 Jakov Smolić
2021-06-12 22:49 Georgy Yakovlev
2021-06-04 18:45 Georgy Yakovlev
2020-07-31 18:33 Aaron Bauman
2020-07-01 17:02 Georgy Yakovlev

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox