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
2022-09-17 23:42:46 +10:00
parent 01cb5600a1
commit 4f5de3f83a
3 changed files with 80 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net-im/telegram-desktop/patches/libtgvoip-4.1.1.patchset → net-im/telegram-desktop/patches/libtgvoip-4.2.0.patchset
View File

@@ -1,6 +1,6 @@
From 03e34ef2a47bf2b6f7afa6aee86ca919c2d5eff1 Mon Sep 17 00:00:00 2001
From a0b954a81b226a0c3984c0d48e602007a28a273a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 23 Jun 2022 21:37:04 +1000
Date: Sat, 17 Sep 2022 22:10:38 +1000
Subject: Add Haiku support
@@ -883,10 +883,10 @@ index 0bc42eb..c87cde9 100644
typedef pid_t PlatformThreadId;
typedef pthread_t PlatformThreadRef;
diff --git a/Telegram/cmake/lib_tgvoip.cmake b/Telegram/cmake/lib_tgvoip.cmake
index 9b8ec54..7ffb710 100644
index fab5e1a..f516210 100644
--- a/Telegram/cmake/lib_tgvoip.cmake
+++ b/Telegram/cmake/lib_tgvoip.cmake
@@ -116,6 +116,14 @@ PRIVATE
@@ -118,6 +118,14 @@ PRIVATE
os/linux/AudioPulse.cpp
os/linux/AudioPulse.h
@@ -901,7 +901,7 @@ index 9b8ec54..7ffb710 100644
# POSIX
os/posix/NetworkSocketPosix.cpp
os/posix/NetworkSocketPosix.h
@@ -153,6 +161,25 @@ elseif (APPLE)
@@ -155,6 +163,25 @@ elseif (APPLE)
TGVOIP_NO_OSX_PRIVATE_API
)
endif()

109
net-im/telegram-desktop/patches/telegram_desktop-4.1.1.patchset → net-im/telegram-desktop/patches/telegram_desktop-4.2.0.patchset
View File

@@ -1,14 +1,14 @@
From a44a606c6e72bb1b0e3b9b066e7d4a7614c3265a Mon Sep 17 00:00:00 2001
From 12c13fb435a88da846ae0acb10aafffa0f9b3ef8 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 23 Jun 2022 21:38:54 +1000
Date: Sat, 17 Sep 2022 22:16:29 +1000
Subject: Add Haiku support
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index f97c09b..558423a 100644
index fb2bf37..779ac20 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -95,6 +95,15 @@ PRIVATE
@@ -92,6 +92,15 @@ PRIVATE
desktop-app::external_xxhash
)
@@ -24,7 +24,7 @@ index f97c09b..558423a 100644
target_precompile_headers(Telegram PRIVATE $<$<COMPILE_LANGUAGE:CXX,OBJCXX>:${src_loc}/stdafx.h>)
nice_target_sources(Telegram ${src_loc}
PRIVATE
@@ -1324,6 +1333,16 @@ else()
@@ -1350,6 +1359,16 @@ else()
)
endif()
@@ -41,7 +41,7 @@ index f97c09b..558423a 100644
if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
remove_target_sources(Telegram ${src_loc}
platform/linux/linux_wayland_integration.cpp
@@ -1478,7 +1497,7 @@ if (build_macstore)
@@ -1499,7 +1518,7 @@ if (build_macstore)
else()
set(bundle_identifier "com.tdesktop.Telegram$<$<CONFIG:Debug>:Debug>")
set(bundle_entitlements "Telegram.entitlements")
@@ -51,7 +51,7 @@ index f97c09b..558423a 100644
else()
set(output_name "Telegram")
diff --git a/Telegram/SourceFiles/calls/group/calls_group_menu.cpp b/Telegram/SourceFiles/calls/group/calls_group_menu.cpp
index 875845f..c301075 100644
index 4fe0137..88829bf 100644
--- a/Telegram/SourceFiles/calls/group/calls_group_menu.cpp
+++ b/Telegram/SourceFiles/calls/group/calls_group_menu.cpp
@@ -571,6 +571,7 @@ void FillMenu(
@@ -71,10 +71,10 @@ index 875845f..c301075 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 e866838..092c1c0 100644
index a6502c1..82e2708 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -777,7 +777,7 @@ private:
@@ -816,7 +816,7 @@ private:
rpl::variable<float64> _dialogsWidthRatio; // per-window
rpl::variable<int> _thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
bool _notifyFromAll = true;
@@ -84,7 +84,7 @@ index e866838..092c1c0 100644
rpl::variable<bool> _systemDarkModeEnabled = false;
WindowPosition _windowPosition; // per-window
diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp
index 9e9b5a4..546dfa9 100644
index cc3f1ad..f96cf3a 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -256,9 +256,12 @@ Sandbox::~Sandbox() = default;
@@ -113,10 +113,10 @@ index 9e9b5a4..546dfa9 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 2307aff..d458544 100644
index 1c68614..d599534 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -18,6 +18,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
@@ -19,6 +19,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <giomm.h>
#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
@@ -132,7 +132,7 @@ index 2307aff..d458544 100644
namespace Platform {
namespace File {
@@ -40,6 +49,23 @@ void UnsafeOpenEmailLink(const QString &email) {
@@ -43,6 +52,23 @@ void UnsafeOpenEmailLink(const QString &email) {
}
bool UnsafeShowOpenWith(const QString &filepath) {
@@ -157,7 +157,7 @@ index 2307aff..d458544 100644
if (internal::ShowXDPOpenWithDialog(filepath)) {
return true;
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index 246dcff..6fcafa6 100644
index a5cecbf..eb0170e 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -40,6 +40,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
@@ -171,18 +171,34 @@ index 246dcff..6fcafa6 100644
#include <QtCore/QSize>
#include <QtCore/QMimeData>
#include <QtGui/QWindow>
@@ -244,7 +248,11 @@ void MainWindow::initHook() {
bool MainWindow::isActiveForTrayMenu() {
updateIsActive();
+#ifdef Q_OS_HAIKU
+ return isVisible();
+#else
return Platform::IsWayland() ? isVisible() : isActive();
+#endif
@@ -250,6 +254,12 @@ void MainWindow::workmodeUpdated(Core::Settings::WorkMode mode) {
SkipTaskbar(windowHandle(), mode == WorkMode::TrayOnly);
}
void MainWindow::workmodeUpdated(Core::Settings::WorkMode mode) {
+#ifdef Q_OS_HAIKU
+bool MainWindow::isActiveForTrayMenu() {
+ return isVisible();
+}
+#endif
+
void MainWindow::unreadCounterChangedHook() {
updateIconCounters();
}
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.h b/Telegram/SourceFiles/platform/linux/main_window_linux.h
index aa563d4..f7aa7d9 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.h
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.h
@@ -21,7 +21,9 @@ namespace Platform {
class MainWindow : public Window::MainWindow {
public:
explicit MainWindow(not_null<Window::Controller*> controller);
-
+#ifdef Q_OS_HAIKU
+ bool isActiveForTrayMenu() override;
+#endif
~MainWindow();
protected:
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_haiku.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_haiku.cpp
new file mode 100644
index 0000000..8605b28
@@ -458,7 +474,7 @@ index 0000000..8605b28
+} // namespace Notifications
+} // namespace Platform
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 0115f61..27eda5a 100644
index fd9118b..3088311 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -31,6 +31,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
@@ -509,7 +525,7 @@ index 0115f61..27eda5a 100644
constexpr auto kDesktopFile = ":/misc/telegramdesktop.desktop"_cs;
constexpr auto kIconName = "telegram"_cs;
@@ -391,7 +423,11 @@ bool AutostartSupported() {
@@ -389,7 +421,11 @@ bool AutostartSupported() {
// in folders with names started with a dot
// and doesn't provide any api to add an app to autostart
// thus, autostart isn't supported in snap
@@ -521,7 +537,7 @@ index 0115f61..27eda5a 100644
}
void AutostartToggle(bool enabled, Fn<void(bool)> done) {
@@ -400,7 +436,10 @@ void AutostartToggle(bool enabled, Fn<void(bool)> done) {
@@ -398,7 +434,10 @@ void AutostartToggle(bool enabled, Fn<void(bool)> done) {
done(enabled);
}
});
@@ -533,7 +549,7 @@ index 0115f61..27eda5a 100644
const auto silent = !done;
if (InFlatpak()) {
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
@@ -417,6 +456,7 @@ void AutostartToggle(bool enabled, Fn<void(bool)> done) {
@@ -415,6 +454,7 @@ void AutostartToggle(bool enabled, Fn<void(bool)> done) {
QFile::remove(autostart + QGuiApplication::desktopFileName());
}
}
@@ -541,7 +557,7 @@ index 0115f61..27eda5a 100644
}
bool AutostartSkip() {
@@ -462,8 +502,11 @@ QString psAppDataPath() {
@@ -460,8 +500,11 @@ QString psAppDataPath() {
return oldPath;
}
}
@@ -554,7 +570,7 @@ index 0115f61..27eda5a 100644
}
void psDoCleanup() {
@@ -612,6 +655,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
@@ -626,6 +669,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
add("mate-volume-control");
}
}
@@ -563,7 +579,7 @@ index 0115f61..27eda5a 100644
add("pavucontrol");
add("alsamixergui");
diff --git a/Telegram/SourceFiles/platform/linux/tray_linux.cpp b/Telegram/SourceFiles/platform/linux/tray_linux.cpp
index 050c872..8c74df4 100644
index 80108b1..f4fa0f8 100644
--- a/Telegram/SourceFiles/platform/linux/tray_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/tray_linux.cpp
@@ -300,7 +300,7 @@ void Tray::createIcon() {
@@ -641,10 +657,10 @@ 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 883754c..87b5f34 100644
index 6a47233..ca45708 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 @@
@@ -31,8 +31,58 @@
#include <stdio.h>
#include <fcntl.h>
@@ -703,7 +719,7 @@ index 883754c..87b5f34 100644
#ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION
bool PortalShowInFolder(const QString &filepath) {
@@ -98,6 +148,11 @@ bool DBusShowInFolder(const QString &filepath) {
@@ -127,6 +177,11 @@ bool DBusShowInFolder(const QString &filepath) {
} // namespace
bool ShowInFolder(const QString &filepath) {
@@ -786,7 +802,7 @@ index 2d11264..0c322f2 100644
#include <QtCore/QProcess>
#include <QtWidgets/QWidget>
diff --git a/Telegram/lib_ui/ui/ui_utility.cpp b/Telegram/lib_ui/ui/ui_utility.cpp
index ee6173d..b9c0837 100644
index 283b340..fd01c34 100644
--- a/Telegram/lib_ui/ui/ui_utility.cpp
+++ b/Telegram/lib_ui/ui/ui_utility.cpp
@@ -9,6 +9,10 @@
@@ -835,3 +851,26 @@ index bb6d91a..3c4a188 100644
--
2.36.1
From e957bb8dcf3f345c357ed999dc7cfa65e7c04cf6 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 17 Sep 2022 23:01:23 +1000
Subject: Disable kcoreaddons
diff --git a/cmake/external/kcoreaddons/CMakeLists.txt b/cmake/external/kcoreaddons/CMakeLists.txt
index 528a487..7061e07 100644
--- a/cmake/external/kcoreaddons/CMakeLists.txt
+++ b/cmake/external/kcoreaddons/CMakeLists.txt
@@ -4,7 +4,7 @@
# For license and copyright information please follow this link:
# https://github.com/desktop-app/legal/blob/master/LEGAL
-if (NOT LINUX)
+if (NOT LINUX OR HAIKU)
add_library(external_kcoreaddons INTERFACE IMPORTED GLOBAL)
add_library(desktop-app::external_kcoreaddons ALIAS external_kcoreaddons)
--
2.36.1

2
net-im/telegram-desktop/telegram_desktop-4.1.1.recipe → net-im/telegram-desktop/telegram_desktop-4.2.0.recipe
View File

@@ -5,7 +5,7 @@ COPYRIGHT="2013-2022 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="5574cb8ebfa4983157d347883e7ef3bd85a8d71f972b8458d41fab0d7f733f56"
CHECKSUM_SHA256="d3c78c6daa5b4e336d55dd1dd2dc0003e34dad501e6d212719b51ea8cad71dde"
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
SOURCE_DIR="tdesktop-$portVersion-full"
srcGitRev_2="2b383fe05f8ae78ac99470b9a2b9ea22b3ee5a92"