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

Telegram: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2024-04-05 21:24:28 +10:00
parent c0a8fac457
commit ce678d2895
4 changed files with 714 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net-im/telegram-desktop/patches/libtgvoip-4.15.0.patchset → net-im/telegram-desktop/patches/libtgvoip-4.16.2.patchset
View File

@@ -1,6 +1,6 @@
From c583f830253c5bf59891ab812d4ba1bbbce757f5 Mon Sep 17 00:00:00 2001
From 49ad69849182eb4f306b84b02a3bc046db14737e Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 25 Feb 2024 08:13:26 +0000
Date: Tue, 2 Apr 2024 20:35:31 +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.42.1
2.43.2

997
net-im/telegram-desktop/patches/pch_disable-4.15.0.patchset → net-im/telegram-desktop/patches/pch_disable-4.16.2.patchset
View File

File diff suppressed because it is too large Load Diff

130
net-im/telegram-desktop/patches/telegram_desktop-4.15.0.patchset → net-im/telegram-desktop/patches/telegram_desktop-4.16.2.patchset
View File

@@ -1,11 +1,11 @@
From 35197d2cbea6178c5e188df237184db0b0b2947d Mon Sep 17 00:00:00 2001
From 816e8dbea99809ae0b0de1b2c7359173838b51e7 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 25 Feb 2024 08:15:25 +0000
Date: Wed, 3 Apr 2024 20:32:57 +1000
Subject: Add haiku support
diff --git a/CMakeLists.txt b/CMakeLists.txt
index abea2aa..91970bd 100644
index 3bf1369..2f75e69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,12 +27,12 @@ elseif (LINUX)
@@ -138,10 +138,10 @@ index 0000000..e5f8b64
+
+resource("BEOS:default_shortcut") "S";
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index e1766f5..7ecb4e8 100644
index 4988f34..85bc804 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -91,6 +91,15 @@ PRIVATE
@@ -93,6 +93,15 @@ PRIVATE
desktop-app::external_xxhash
)
@@ -157,7 +157,7 @@ index e1766f5..7ecb4e8 100644
target_precompile_headers(Telegram PRIVATE $<$<COMPILE_LANGUAGE:CXX,OBJCXX>:${src_loc}/stdafx.h>)
nice_target_sources(Telegram ${src_loc}
PRIVATE
@@ -1510,6 +1519,17 @@ if (NOT build_winstore)
@@ -1554,6 +1563,17 @@ if (NOT build_winstore)
)
endif()
@@ -175,7 +175,7 @@ index e1766f5..7ecb4e8 100644
if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
remove_target_sources(Telegram ${src_loc}
platform/linux/linux_wayland_integration.cpp
@@ -1698,7 +1718,7 @@ else()
@@ -1739,7 +1759,7 @@ else()
set(bundle_identifier "com.tdesktop.Telegram")
endif()
set(bundle_entitlements "Telegram.entitlements")
@@ -205,10 +205,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 82aa7c4..b566a45 100644
index 93e0727..33aa2ca 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -957,7 +957,7 @@ private:
@@ -964,7 +964,7 @@ private:
rpl::variable<float64> _dialogsWidthRatio; // per-window
rpl::variable<int> _thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
bool _notifyFromAll = true;
@@ -256,30 +256,29 @@ index fb145f7..819b335 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/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index 1087e09..42d1427 100644
index b2a8cf6..71882ef 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -19,13 +19,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
@@ -19,12 +19,18 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtCore/QAbstractEventDispatcher>
#include <qpa/qwindowsysteminterface.h>
+#ifndef Q_OS_HAIKU
#include <glibmm.h>
#include <gio/gio.hpp>
#include <xdpinhibit/xdpinhibit.hpp>
+#endif
namespace Platform {
namespace {
-
+#ifdef Q_OS_HAIKU
+class LinuxIntegration final : public Integration {
+};
+#else
using namespace gi::repository;
namespace GObject = gi::repository::GObject;
class Application : public Gio::impl::ApplicationImpl {
@@ -286,7 +291,7 @@ void LinuxIntegration::initInhibit() {
@@ -286,7 +292,7 @@ void LinuxIntegration::initInhibit() {
}),
nullptr);
}
@@ -289,12 +288,12 @@ index 1087e09..42d1427 100644
std::unique_ptr<Integration> CreateIntegration() {
diff --git a/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp b/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp
index e75bcb4..1a78dc6 100644
index 9e409b9..26a0700 100644
--- a/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp
+++ b/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp
@@ -16,6 +16,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <glibmm.h>
#include <giomm.h>
#include <xdpopenuri/xdpopenuri.hpp>
#include <xdprequest/xdprequest.hpp>
+#ifdef Q_OS_HAIKU
+#include <base/haiku_types.h>
@@ -308,7 +307,7 @@ index e75bcb4..1a78dc6 100644
namespace Platform {
namespace File {
namespace internal {
@@ -28,6 +37,22 @@ using base::Platform::XdgActivationToken;
@@ -27,6 +36,22 @@ using base::Platform::XdgActivationToken;
} // namespace
bool ShowXDPOpenWithDialog(const QString &filepath) {
@@ -328,20 +327,20 @@ index e75bcb4..1a78dc6 100644
+ }
+ }
+#else
try {
const auto connection = Gio::DBus::Connection::get_sync(
Gio::DBus::BusType::SESSION);
@@ -135,7 +160,7 @@ bool ShowXDPOpenWithDialog(const QString &filepath) {
return true;
} catch (...) {
}
auto proxy = XdpOpenURI::OpenURIProxy::new_for_bus_sync(
Gio::BusType::SESSION_,
Gio::DBusProxyFlags::NONE_,
@@ -120,7 +145,7 @@ bool ShowXDPOpenWithDialog(const QString &filepath) {
window.setWindowModality(Qt::ApplicationModal);
window.show();
loop.run();
-
+#endif
return false;
return true;
}
diff --git a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
index f4c400f..cad2787 100644
index e6a3b68..d4f771f 100644
--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@@ -36,6 +36,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
@@ -355,7 +354,7 @@ index f4c400f..cad2787 100644
#include <QtCore/QSize>
#include <QtCore/QMimeData>
#include <QtGui/QWindow>
@@ -221,6 +225,12 @@ void MainWindow::workmodeUpdated(Core::Settings::WorkMode mode) {
@@ -220,6 +224,12 @@ void MainWindow::workmodeUpdated(Core::Settings::WorkMode mode) {
SkipTaskbar(windowHandle(), mode == WorkMode::TrayOnly);
}
@@ -683,10 +682,10 @@ 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 a63c54b..cb5aa32 100644
index 7b390c2..95f68a8 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -27,6 +27,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
@@ -26,6 +26,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "base/platform/linux/base_linux_xcb_utilities.h"
#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
@@ -697,9 +696,9 @@ index a63c54b..cb5aa32 100644
#include <QtWidgets/QApplication>
#include <QtWidgets/QSystemTrayIcon>
#include <QtCore/QStandardPaths>
@@ -53,6 +57,33 @@ using Platform::internal::WaylandIntegration;
@@ -49,6 +53,33 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <iostream>
namespace Platform {
namespace {
+
+#ifdef Q_OS_HAIKU
@@ -729,9 +728,9 @@ index a63c54b..cb5aa32 100644
+}
+#endif // Q_OS_HAIKU
void PortalAutostart(bool enabled, Fn<void(bool)> done) {
if (cExeName().isEmpty()) {
@@ -486,6 +517,10 @@ bool AutostartSupported() {
using namespace gi::repository;
namespace GObject = gi::repository::GObject;
@@ -525,6 +556,10 @@ bool AutostartSupported() {
}
void AutostartToggle(bool enabled, Fn<void(bool)> done) {
@@ -742,7 +741,7 @@ index a63c54b..cb5aa32 100644
if (KSandbox::isFlatpak()) {
PortalAutostart(enabled, done);
return;
@@ -513,6 +548,7 @@ void AutostartToggle(bool enabled, Fn<void(bool)> done) {
@@ -552,6 +587,7 @@ void AutostartToggle(bool enabled, Fn<void(bool)> done) {
if (done) {
done(enabled && success);
}
@@ -750,7 +749,7 @@ index a63c54b..cb5aa32 100644
}
bool AutostartSkip() {
@@ -578,7 +614,11 @@ QString psAppDataPath() {
@@ -617,7 +653,11 @@ QString psAppDataPath() {
}
}
@@ -762,19 +761,28 @@ index a63c54b..cb5aa32 100644
}
void psDoCleanup() {
@@ -706,6 +746,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
add("mate-volume-control");
@@ -727,6 +767,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
}
}
options.push_back(std::move(command));
};
+ add("Media");
add("unity-control-center", "sound");
add("kcmshell6", "kcm_pulseaudio");
add("kcmshell5", "kcm_pulseaudio");
@@ -736,7 +777,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
add("mate-volume-control");
add("pavucontrol-qt");
add("pavucontrol");
add("alsamixergui");
- add("alsamixergui");
+ add("alsamixergui");
return ranges::any_of(options, [](const Command &command) {
return QProcess::startDetached(
command.command,
diff --git a/Telegram/SourceFiles/platform/linux/tray_linux.cpp b/Telegram/SourceFiles/platform/linux/tray_linux.cpp
index a9e1de3..291eaa7 100644
index ab1e34d..ca68579 100644
--- a/Telegram/SourceFiles/platform/linux/tray_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/tray_linux.cpp
@@ -285,7 +285,7 @@ void Tray::createIcon() {
@@ -294,7 +294,7 @@ void Tray::createIcon() {
const auto showXEmbed = [=] {
_aboutToShowRequests.fire({});
InvokeQueued(_menuXEmbed.get(), [=] {
@@ -849,10 +857,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 00cae96..8fc5f52 100644
index 46365f5..381a977 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
@@ -25,8 +25,58 @@
@@ -26,8 +26,58 @@
#include <stdio.h>
#include <fcntl.h>
@@ -909,9 +917,9 @@ index 00cae96..8fc5f52 100644
+}
+#endif
void PortalShowInFolder(const QString &filepath, Fn<void()> fail) {
const auto connection = [] {
@@ -121,12 +171,19 @@ void DBusShowInFolder(const QString &filepath, Fn<void()> fail) {
using namespace gi::repository;
namespace GObject = gi::repository::GObject;
@@ -130,12 +180,19 @@ void DBusShowInFolder(const QString &filepath, Fn<void()> fail) {
} // namespace
void ShowInFolder(const QString &filepath) {
@@ -952,12 +960,12 @@ 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 b7f1225..7fc8df3 100644
index b2db356..3e72834 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 <glibmm.h>
#include <giomm.h>
#include <xdgscreensaver/xdgscreensaver.hpp>
#include <mutteridlemonitor/mutteridlemonitor.hpp>
+#ifdef Q_OS_HAIKU
+#include <base/haiku_types.h>
@@ -967,8 +975,8 @@ index b7f1225..7fc8df3 100644
namespace base::Platform {
namespace {
@@ -180,9 +185,23 @@ std::optional<crl::time> MutterDBusLastUserInputTime() {
return std::nullopt;
@@ -99,9 +104,23 @@ std::optional<crl::time> MutterDBusLastUserInputTime() {
return (crl::now() - static_cast<crl::time>(std::get<1>(*result)));
}
+#ifdef Q_OS_HAIKU
@@ -992,12 +1000,12 @@ index b7f1225..7fc8df3 100644
if (::Platform::IsX11()) {
const auto xcbResult = XCBLastUserInputTime();
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 fcf1179..37c857e 100644
index 27fc98e..18a8fbd 100644
--- a/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp
+++ b/Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.cpp
@@ -10,6 +10,10 @@
#include <giomm.h>
#include <xdpsettings/xdpsettings.hpp>
+#ifdef Q_OS_HAIKU
+#include <base/haiku_types.h>
@@ -1007,7 +1015,7 @@ index fcf1179..37c857e 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 8026c64..0fdec60 100644
index 3d851b8..dce45d2 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
@@ -17,6 +17,10 @@
@@ -1020,9 +1028,9 @@ index 8026c64..0fdec60 100644
+
#include <QtGui/QWindow>
#include <giomm.h>
#include <xdpinhibit/xdpinhibit.hpp>
diff --git a/Telegram/lib_base/base/platform/linux/base_url_scheme_linux.cpp b/Telegram/lib_base/base/platform/linux/base_url_scheme_linux.cpp
index 19da0e8..0873fcb 100644
index 4197367..438c375 100644
--- a/Telegram/lib_base/base/platform/linux/base_url_scheme_linux.cpp
+++ b/Telegram/lib_base/base/platform/linux/base_url_scheme_linux.cpp
@@ -9,6 +9,10 @@
@@ -1089,7 +1097,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 3a79351..3c58540 100644
index 1c9c7f9..dbce473 100644
--- a/Telegram/lib_ui/ui/widgets/popup_menu.cpp
+++ b/Telegram/lib_ui/ui/widgets/popup_menu.cpp
@@ -18,6 +18,10 @@
@@ -1149,5 +1157,5 @@ index 34181cc..85ee489 100644
endif()
add_checked_subdirectory(expected)
--
2.42.1
2.43.2

4
net-im/telegram-desktop/telegram_desktop-4.15.0.recipe → net-im/telegram-desktop/telegram_desktop-4.16.2.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="8b0caed85f4876a83c6ece2e4c956589a9548fbca6b951fb99b8d55985fd6112"
CHECKSUM_SHA256="9013f4176903e2d542fa84bda0db3584b92b600fb780d43040939968bb3ae65b"
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
SOURCE_DIR="tdesktop-$portVersion-full"
srcGitRev_2="2b383fe05f8ae78ac99470b9a2b9ea22b3ee5a92"
@@ -186,7 +186,7 @@ BUILD()
-DTDESKTOP_API_HASH=$TELEGRAM_API_HASH \
-DLZ4_INCLUDE_DIRS=/system/$relativeIncludeDir
ninja -C build $jobArgs
ninja -C build -v $jobArgs
cd SendToAddon
make $jobArgs