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

Telegram: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2023-12-15 13:16:18 +00:00
parent 3d43741194
commit 718728c48c
4 changed files with 5440 additions and 8978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
net-im/telegram-desktop/patches/libtgvoip-4.11.7.patchset → net-im/telegram-desktop/patches/libtgvoip-4.12.2.patchset
View File

@@ -1,7 +1,7 @@
From 1e2bebad798b1ee8b9dac52b60785b8f622ab30e Mon Sep 17 00:00:00 2001
From b38a65154ca2bb5703e3ac6bbeb737d88f96772d Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 7 Nov 2023 21:10:21 +1000
Subject: Add Haiku support
Date: Fri, 15 Dec 2023 09:47:38 +0000
Subject: Add haiku support
diff --git a/Telegram/ThirdParty/libtgvoip/VoIPController.cpp b/Telegram/ThirdParty/libtgvoip/VoIPController.cpp
@@ -928,5 +928,5 @@ index 886cd99..705a6a2 100644
add_library(lib_tgvoip_bundled_options INTERFACE)
target_compile_options(lib_tgvoip_bundled_options
--
2.42.0
2.42.1

14309
net-im/telegram-desktop/patches/pch_disable-4.11.7.patchset → net-im/telegram-desktop/patches/pch_disable-4.12.2.patchset
View File

File diff suppressed because it is too large Load Diff

94
net-im/telegram-desktop/patches/telegram_desktop-4.11.7.patchset → net-im/telegram-desktop/patches/telegram_desktop-4.12.2.patchset
View File

@@ -1,9 +1,32 @@
From b03656330c1117db00852a46f1cd1d87c00fa511 Mon Sep 17 00:00:00 2001
From d21e5ab0699ecfe7c75951bd8e363799d333af22 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 7 Nov 2023 21:11:07 +1000
Subject: Add Haiku support
Date: Fri, 15 Dec 2023 09:48:43 +0000
Subject: Add haiku support
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c822565..8b9cbb0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,12 +27,12 @@ elseif (LINUX)
list(APPEND project_langs ASM)
endif()
-project(Telegram
- LANGUAGES ${project_langs}
- VERSION ${desktop_app_version_cmake}
- DESCRIPTION "Official Telegram Desktop messenger"
- HOMEPAGE_URL "https://desktop.telegram.org"
-)
+#project(Telegram
+# LANGUAGES ${project_langs}
+# VERSION ${desktop_app_version_cmake}
+# DESCRIPTION "Official Telegram Desktop messenger"
+# HOMEPAGE_URL "https://desktop.telegram.org"
+#)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Telegram)
get_filename_component(third_party_loc "Telegram/ThirdParty" REALPATH)
diff --git a/SendToAddon/Makefile b/SendToAddon/Makefile
new file mode 100644
index 0000000..5098366
@@ -115,7 +138,7 @@ index 0000000..e5f8b64
+
+resource("BEOS:default_shortcut") "S";
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 3ad5943..da7e4f2 100644
index acf322f..3920431 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -91,6 +91,15 @@ PRIVATE
@@ -134,7 +157,7 @@ index 3ad5943..da7e4f2 100644
target_precompile_headers(Telegram PRIVATE $<$<COMPILE_LANGUAGE:CXX,OBJCXX>:${src_loc}/stdafx.h>)
nice_target_sources(Telegram ${src_loc}
PRIVATE
@@ -1482,6 +1491,17 @@ if (NOT build_winstore)
@@ -1497,6 +1506,17 @@ if (NOT build_winstore)
)
endif()
@@ -152,7 +175,7 @@ index 3ad5943..da7e4f2 100644
if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
remove_target_sources(Telegram ${src_loc}
platform/linux/linux_wayland_integration.cpp
@@ -1670,7 +1690,7 @@ else()
@@ -1685,7 +1705,7 @@ else()
set(bundle_identifier "com.tdesktop.Telegram")
endif()
set(bundle_entitlements "Telegram.entitlements")
@@ -182,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 31b0880..15966c0 100644
index 0f70822..7d2fbbb 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -918,7 +918,7 @@ private:
@@ -913,7 +913,7 @@ private:
rpl::variable<float64> _dialogsWidthRatio; // per-window
rpl::variable<int> _thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
bool _notifyFromAll = true;
@@ -195,10 +218,10 @@ index 31b0880..15966c0 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 beb06a6..38a4538 100644
index fc4d619..62d8e49 100644
--- a/Telegram/SourceFiles/core/sandbox.cpp
+++ b/Telegram/SourceFiles/core/sandbox.cpp
@@ -246,7 +246,7 @@ void Sandbox::setupScreenScale() {
@@ -261,7 +261,7 @@ void Sandbox::setupScreenScale() {
const auto screen = Sandbox::primaryScreen();
const auto dpi = screen->logicalDotsPerInch();
@@ -207,7 +230,7 @@ index beb06a6..38a4538 100644
const auto base = (basePair.first + basePair.second) * 0.5;
const auto screenScaleExact = dpi / base;
const auto screenScale = int(base::SafeRound(screenScaleExact * 20)) * 5;
@@ -269,9 +269,12 @@ Sandbox::~Sandbox() = default;
@@ -284,9 +284,12 @@ Sandbox::~Sandbox() = default;
bool Sandbox::event(QEvent *e) {
if (e->type() == QEvent::Quit && !Quitting()) {
@@ -223,7 +246,7 @@ index beb06a6..38a4538 100644
} else if (e->type() == QEvent::Close) {
Quit();
} else if (e->type() == DeadlockDetector::PingPongEvent::Type()) {
@@ -285,7 +288,7 @@ bool Sandbox::event(QEvent *e) {
@@ -300,7 +303,7 @@ bool Sandbox::event(QEvent *e) {
void Sandbox::socketConnected() {
LOG(("Socket connected, this is not the first application instance, sending show command..."));
_secondInstance = true;
@@ -232,6 +255,39 @@ index beb06a6..38a4538 100644
QString commands;
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 6c461ec..020f6b6 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
#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;
class Application : public Gio::impl::ApplicationImpl {
@@ -293,7 +298,7 @@ void LinuxIntegration::initInhibit() {
GLib::Variant::new_array(options.data(), options.size()),
nullptr);
}
-
+#endif
} // namespace
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
--- a/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp
@@ -976,10 +1032,10 @@ index efbfb72..9c82321 100644
#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 933902f..2b1bf09 100644
index 45b0791..e1c1851 100644
--- a/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp
+++ b/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp
@@ -412,7 +412,7 @@ void ShowXCBWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
@@ -413,7 +413,7 @@ void ShowXCBWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
}
#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
@@ -988,7 +1044,7 @@ index 933902f..2b1bf09 100644
void ShowWaylandWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
static const auto wl_proxy_marshal_array = [] {
void (*result)(
@@ -591,7 +591,7 @@ void UnsetWindowMargins(not_null<QWidget*> widget) {
@@ -600,7 +600,7 @@ void UnsetWindowMargins(not_null<QWidget*> widget) {
}
void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
@@ -998,7 +1054,7 @@ index 933902f..2b1bf09 100644
ShowWaylandWindowMenu(widget, point);
return;
diff --git a/Telegram/lib_ui/ui/ui_utility.cpp b/Telegram/lib_ui/ui/ui_utility.cpp
index 2a5de32..692f8a8 100644
index ded550d..95fb8bb 100644
--- a/Telegram/lib_ui/ui/ui_utility.cpp
+++ b/Telegram/lib_ui/ui/ui_utility.cpp
@@ -9,6 +9,10 @@
@@ -1013,7 +1069,7 @@ index 2a5de32..692f8a8 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 fba91a9..42a8ee3 100644
index 0bd4e4d..b10e038 100644
--- a/Telegram/lib_ui/ui/widgets/popup_menu.cpp
+++ b/Telegram/lib_ui/ui/widgets/popup_menu.cpp
@@ -18,6 +18,10 @@
@@ -1060,7 +1116,7 @@ index bb6d91a..3c4a188 100644
#include "webrtc/webrtc_create_adm.h"
diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt
index d9af92a..cd4ba1d 100644
index 34181cc..85ee489 100644
--- a/cmake/external/CMakeLists.txt
+++ b/cmake/external/CMakeLists.txt
@@ -18,7 +18,7 @@ if (add_cld3_library)
@@ -1073,5 +1129,5 @@ index d9af92a..cd4ba1d 100644
endif()
add_checked_subdirectory(expected)
--
2.42.0
2.42.1

7
net-im/telegram-desktop/telegram_desktop-4.11.7.recipe → net-im/telegram-desktop/telegram_desktop-4.12.2.recipe
View File

@@ -5,7 +5,7 @@ COPYRIGHT="2013-2023 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="fd161c15ea38285df04749f09bded80dde5f4732da0c1daa2bdc4788c4ecef5e"
CHECKSUM_SHA256="7e9e51ae9c40d5b8c964bcfe0e252e35980c6668327934d2270144405c519914"
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
SOURCE_DIR="tdesktop-$portVersion-full"
srcGitRev_2="2b383fe05f8ae78ac99470b9a2b9ea22b3ee5a92"
@@ -55,7 +55,6 @@ REQUIRES="
lib:libprotobuf$secondaryArchSuffix
lib:libqrcodegen$secondaryArchSuffix
lib:libQt6Core$secondaryArchSuffix
lib:libQt6Core5Compat$secondaryArchSuffix
lib:libQt6Gui$secondaryArchSuffix
lib:libQt6Network$secondaryArchSuffix
lib:libQt6Svg$secondaryArchSuffix
@@ -68,6 +67,7 @@ REQUIRES="
lib:libvpx$secondaryArchSuffix
lib:libxxhash$secondaryArchSuffix
lib:libz$secondaryArchSuffix
qt6_imageformats$secondaryArchSuffix
open_sans
"
@@ -96,7 +96,6 @@ BUILD_REQUIRES="
devel:libprotobuf$secondaryArchSuffix
devel:libqrcodegen$secondaryArchSuffix
devel:libQt6Core$secondaryArchSuffix
devel:libQt6Core5Compat$secondaryArchSuffix
devel:libQt6Gui$secondaryArchSuffix
devel:libQt6Network$secondaryArchSuffix
devel:libQt6Svg$secondaryArchSuffix
@@ -178,7 +177,7 @@ BUILD()
-DDESKTOP_APP_DISABLE_WEBKITGTK=ON \
-DDESKTOP_APP_USE_PACKAGED_FONTS=ON \
-DDESKTOP_APP_USE_HUNSPELL_ONLY=ON \
-DDESKTOP_APP_DISABLE_JEMALLOC=ON \
-DDESKTOP_APP_DISABLE_SCUDO=ON \
-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \
-DLIBTGVOIP_DISABLE_ALSA=ON \
-DLIBTGVOIP_DISABLE_PULSEAUDIO=ON \