haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Telegram: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2024-07-02 20:23:25 +10:00
parent d7dfdf2a3c
commit c1aabee08a
4 changed files with 301 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net-im/telegram-desktop/patches/libtgvoip-5.1.0.patchset → net-im/telegram-desktop/patches/libtgvoip-5.2.0.patchset
View File

@@ -1,6 +1,6 @@
From 159bceae7ba0280c821a3b45ceb681959dee51b6 Mon Sep 17 00:00:00 2001
From dbdfcfc68562cb0c260956172d96937f8faec5ad Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 1 Jun 2024 21:57:12 +1000
Date: Mon, 1 Jul 2024 18:02:34 +1000
Subject: Add haiku support
@@ -928,5 +928,5 @@ index 886cd99..705a6a2 100644
add_library(lib_tgvoip_bundled_options INTERFACE)
target_compile_options(lib_tgvoip_bundled_options
--
2.43.2
2.45.2

492
net-im/telegram-desktop/patches/pch_disable-5.1.0.patchset → net-im/telegram-desktop/patches/pch_disable-5.2.0.patchset
View File

File diff suppressed because it is too large Load Diff

127
net-im/telegram-desktop/patches/telegram_desktop-5.1.0.patchset → net-im/telegram-desktop/patches/telegram_desktop-5.2.0.patchset
View File

@@ -1,11 +1,11 @@
From be19f4bc9d55529bd82574b5e241189359e7ae7e Mon Sep 17 00:00:00 2001
From 9d841a2d5ed1a4e1e9579e1c815fb124ddbc9ab8 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 1 Jun 2024 23:27:32 +1000
Date: Mon, 1 Jul 2024 20:26:05 +1000
Subject: Add haiku support
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4e2ac34..648adfd 100644
index 9393d81..a2e3f47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,12 +27,12 @@ elseif (LINUX)
@@ -138,7 +138,7 @@ index 0000000..e5f8b64
+
+resource("BEOS:default_shortcut") "S";
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 1517a95..5dd9902 100644
index e305108..1338dee 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -93,6 +93,15 @@ PRIVATE
@@ -157,7 +157,7 @@ index 1517a95..5dd9902 100644
target_precompile_headers(Telegram PRIVATE $<$<COMPILE_LANGUAGE:CXX,OBJCXX>:${src_loc}/stdafx.h>)
nice_target_sources(Telegram ${src_loc}
PRIVATE
@@ -1585,6 +1594,16 @@ if (NOT build_winstore)
@@ -1594,6 +1603,16 @@ if (NOT build_winstore)
)
endif()
@@ -174,7 +174,7 @@ index 1517a95..5dd9902 100644
if (DESKTOP_APP_USE_PACKAGED)
remove_target_sources(Telegram ${src_loc}
platform/mac/mac_iconv_helper.c
@@ -1747,7 +1766,7 @@ else()
@@ -1756,7 +1775,7 @@ else()
set(bundle_identifier "com.tdesktop.Telegram")
endif()
set(bundle_entitlements "Telegram.entitlements")
@@ -204,10 +204,10 @@ index 51a9068..b5296bc 100644
if (const auto strong = weak.get()) {
showBox(Box(SettingsBox, strong));
diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h
index 2588923..e6d901e 100644
index 3412c45..1ae4bb1 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -979,7 +979,7 @@ private:
@@ -986,7 +986,7 @@ private:
rpl::variable<float64> _dialogsNoChatWidthRatio; // per-window
rpl::variable<int> _thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
bool _notifyFromAll = true;
@@ -217,7 +217,7 @@ index 2588923..e6d901e 100644
rpl::variable<bool> _systemDarkModeEnabled = false;
rpl::variable<WindowTitleContent> _windowTitleContent;
diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index 4110a73..0fd00e2 100644
index 4188882..0e0b448 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -233,7 +233,7 @@ void Sandbox::setupScreenScale() {
@@ -255,7 +255,7 @@ index 4110a73..0fd00e2 100644
const QStringList &lst(cSendPaths());
for (QStringList::const_iterator i = lst.cbegin(), e = lst.cend(); i != e; ++i) {
diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
index d79e477..9d9b67e 100644
index f314fb0..331db8a 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -16,6 +16,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
@@ -297,7 +297,7 @@ index d79e477..9d9b67e 100644
auto proxy = XdpOpenURI::OpenURIProxy::new_for_bus_sync(
Gio::BusType::SESSION_,
Gio::DBusProxyFlags::NONE_,
@@ -119,7 +144,7 @@ bool UnsafeShowOpenWith(const QString &filepath) {
@@ -118,7 +143,7 @@ bool UnsafeShowOpenWith(const QString &filepath) {
window.setWindowModality(Qt::ApplicationModal);
window.show();
loop.run();
@@ -339,7 +339,7 @@ index 147a9f0..111b33f 100644
std::unique_ptr<Integration> CreateIntegration() {
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index ff9fddc..8224f68 100644
index 7b17fcc..8dd2d6f 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -35,6 +35,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
@@ -353,7 +353,7 @@ index ff9fddc..8224f68 100644
#include <QtCore/QSize>
#include <QtCore/QMimeData>
#include <QtGui/QWindow>
@@ -173,6 +177,12 @@ void MainWindow::workmodeUpdated(Core::Settings::WorkMode mode) {
@@ -149,6 +153,12 @@ void MainWindow::workmodeUpdated(Core::Settings::WorkMode mode) {
SkipTaskbar(windowHandle(), mode == WorkMode::TrayOnly);
}
@@ -367,7 +367,7 @@ index ff9fddc..8224f68 100644
updateUnityCounter();
}
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.h b/Telegram/SourceFiles/platform/linux/main_window_linux.h
index 311ed3a..21c1ad3 100644
index 4ef98ba..ee8b3ad 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.h
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.h
@@ -21,6 +21,9 @@ namespace Platform {
@@ -681,7 +681,7 @@ index 0000000..21935f0
+} // namespace Notifications
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index c874ae7..80072c8 100644
index 474f477..33aeb85 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -25,6 +25,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
@@ -778,10 +778,10 @@ index c874ae7..80072c8 100644
return QProcess::startDetached(
command.command,
diff --git a/Telegram/SourceFiles/platform/linux/tray_linux.cpp b/Telegram/SourceFiles/platform/linux/tray_linux.cpp
index ab1e34d..ca68579 100644
index 2d0e23a..b4cb04c 100644
--- a/Telegram/SourceFiles/platform/linux/tray_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/tray_linux.cpp
@@ -294,7 +294,7 @@ void Tray::createIcon() {
@@ -317,7 +317,7 @@ void Tray::createIcon() {
const auto showXEmbed = [=] {
_aboutToShowRequests.fire({});
InvokeQueued(_menuXEmbed.get(), [=] {
@@ -856,7 +856,7 @@ index 0000000..3a57ce2
+
+#endif
diff --git a/Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp b/Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp
index 46365f5..381a977 100644
index ff70a1c..b49c8c0 100644
--- a/Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp
+++ b/Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp
@@ -26,8 +26,58 @@
@@ -918,7 +918,7 @@ index 46365f5..381a977 100644
using namespace gi::repository;
namespace GObject = gi::repository::GObject;
@@ -130,12 +180,19 @@ void DBusShowInFolder(const QString &filepath, Fn<void()> fail) {
@@ -127,12 +177,19 @@ void DBusShowInFolder(const QString &filepath, Fn<void()> fail) {
} // namespace
void ShowInFolder(const QString &filepath) {
@@ -939,10 +939,10 @@ index 46365f5..381a977 100644
QString CurrentExecutablePath(int argc, char *argv[]) {
diff --git a/Telegram/lib_base/base/platform/linux/base_info_linux.cpp b/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
index a40477a..8079f1d 100644
index 9b0674c..f562910 100644
--- a/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
+++ b/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
@@ -307,6 +307,7 @@ bool IsX11() {
@@ -304,6 +304,7 @@ bool IsX11() {
}
bool IsWayland() {
@@ -950,7 +950,7 @@ index a40477a..8079f1d 100644
if (!QGuiApplication::instance()) {
static const auto result = []() -> bool {
struct wl_display *(*wl_display_connect)(const char *name);
@@ -324,6 +325,7 @@ bool IsWayland() {
@@ -321,6 +322,7 @@ bool IsWayland() {
}();
return result;
}
@@ -959,11 +959,11 @@ index a40477a..8079f1d 100644
= QGuiApplication::platformName().startsWith("wayland");
return result;
diff --git a/Telegram/lib_base/base/platform/linux/base_last_input_linux.cpp b/Telegram/lib_base/base/platform/linux/base_last_input_linux.cpp
index b2db356..3e72834 100644
index 7979d7c..1a698cc 100644
--- a/Telegram/lib_base/base/platform/linux/base_last_input_linux.cpp
+++ b/Telegram/lib_base/base/platform/linux/base_last_input_linux.cpp
@@ -18,6 +18,11 @@
#include <xdgscreensaver/xdgscreensaver.hpp>
@@ -17,6 +17,11 @@
#include <mutteridlemonitor/mutteridlemonitor.hpp>
+#ifdef Q_OS_HAIKU
@@ -974,7 +974,7 @@ index b2db356..3e72834 100644
namespace base::Platform {
namespace {
@@ -99,9 +104,23 @@ std::optional<crl::time> MutterDBusLastUserInputTime() {
@@ -84,9 +89,23 @@ std::optional<crl::time> MutterDBusLastUserInputTime() {
return (crl::now() - static_cast<crl::time>(std::get<1>(*result)));
}
@@ -998,19 +998,6 @@ index b2db356..3e72834 100644
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
if (::Platform::IsX11()) {
const auto xcbResult = XCBLastUserInputTime();
diff --git a/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp b/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp
index 1898f9d..a91a51a 100644
--- a/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp
+++ b/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp
@@ -15,7 +15,7 @@
namespace base::Platform {
void RunWithXdgActivationToken(Fn<void(QString)> callback) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && !defined(Q_OS_HAIKU)
const auto window = QGuiApplication::focusWindow();
if (!window) {
callback({});
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 af97691..1a0f256 100644
--- a/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp
@@ -1027,7 +1014,7 @@ index af97691..1a0f256 100644
#include <QtGui/QWindow>
diff --git a/Telegram/lib_base/base/platform/linux/base_power_save_blocker_linux.cpp b/Telegram/lib_base/base/platform/linux/base_power_save_blocker_linux.cpp
index cb992b0..3015247 100644
index 8991260..5d4a40b 100644
--- a/Telegram/lib_base/base/platform/linux/base_power_save_blocker_linux.cpp
+++ b/Telegram/lib_base/base/platform/linux/base_power_save_blocker_linux.cpp
@@ -16,6 +16,10 @@
@@ -1071,62 +1058,6 @@ index efbfb72..9c82321 100644
#include "spellcheck/third_party/language_cld3.h"
#include "nnet_language_identifier.h"
diff --git a/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp b/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp
index eda2916..85b8ced 100644
--- a/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp
+++ b/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp
@@ -413,6 +413,7 @@ void ShowXCBWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
}
#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
+#ifndef __HAIKU__
#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
void ShowWaylandWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
static const auto wl_proxy_marshal_array = [] {
@@ -460,6 +461,7 @@ void ShowWaylandWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
}.data());
}
#endif // Qt >= 6.5.0
+#endif
} // namespace
@@ -533,7 +535,7 @@ std::optional<bool> IsOverlapped(
}
bool WindowMarginsSupported() {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && !defined(__HAIKU__)
static const auto WaylandResult = [] {
using namespace QNativeInterface::Private;
QWindow window;
@@ -560,7 +562,7 @@ bool WindowMarginsSupported() {
}
void SetWindowMargins(not_null<QWidget*> widget, const QMargins &margins) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && !defined(__HAIKU__)
using namespace QNativeInterface::Private;
const auto window = not_null(widget->windowHandle());
const auto platformWindow = not_null(window->handle());
@@ -582,7 +584,7 @@ void SetWindowMargins(not_null<QWidget*> widget, const QMargins &margins) {
}
void UnsetWindowMargins(not_null<QWidget*> widget) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && !defined(__HAIKU__)
using namespace QNativeInterface::Private;
if (const auto native = not_null(widget->windowHandle())
->nativeInterface<QWaylandWindow>()) {
@@ -600,7 +602,7 @@ void UnsetWindowMargins(not_null<QWidget*> widget) {
}
void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && !defined(__HAIKU__)
if (::Platform::IsWayland()) {
ShowWaylandWindowMenu(widget, point);
return;
diff --git a/Telegram/lib_ui/ui/ui_utility.cpp b/Telegram/lib_ui/ui/ui_utility.cpp
index 26b284f..5aa150c 100644
--- a/Telegram/lib_ui/ui/ui_utility.cpp
@@ -1143,7 +1074,7 @@ index 26b284f..5aa150c 100644
#include <QtGui/QWindow>
#include <QtGui/QtEvents>
diff --git a/Telegram/lib_ui/ui/widgets/popup_menu.cpp b/Telegram/lib_ui/ui/widgets/popup_menu.cpp
index 62531a7..df0ff06 100644
index c7a89d6..6221153 100644
--- a/Telegram/lib_ui/ui/widgets/popup_menu.cpp
+++ b/Telegram/lib_ui/ui/widgets/popup_menu.cpp
@@ -18,6 +18,10 @@
@@ -1203,5 +1134,5 @@ index a8406e1..3eb0414 100644
endif()
add_checked_subdirectory(expected)
--
2.43.2
2.45.2

2
net-im/telegram-desktop/telegram_desktop-5.1.0.recipe → net-im/telegram-desktop/telegram_desktop-5.2.0.recipe
View File

@@ -5,7 +5,7 @@ COPYRIGHT="2013-2024 Telegram"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v$portVersion/tdesktop-$portVersion-full.tar.gz"
CHECKSUM_SHA256="eca999379acfd7d4cbf57621bd39c668b6669778b278948006e5a1edefeec125"
CHECKSUM_SHA256="13500b4373920aebac907c7f67059a0754b0f0c1ea72490cec14df3cabd11995"
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
SOURCE_DIR="tdesktop-$portVersion-full"
srcGitRev_2="2b383fe05f8ae78ac99470b9a2b9ea22b3ee5a92"