mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
Telegram: bump version
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
From af5d52d4abd12204b02bc5badecd5e971d8235f1 Mon Sep 17 00:00:00 2001
|
||||
From 3ef02ad652b4201a8bafe066e569489a57eaf6e1 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Thu, 5 Dec 2024 09:31:54 +1000
|
||||
Date: Wed, 8 Jan 2025 23:15:30 +0000
|
||||
Subject: Add haiku support
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
From 6b9ebe7a241bf1ebe05a1742005a4c385c7d5e7c Mon Sep 17 00:00:00 2001
|
||||
From 71bd607911101792f5d4abbf521ac3c872e65edd Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Thu, 5 Dec 2024 13:47:11 +1000
|
||||
Date: Wed, 8 Jan 2025 23:15:56 +0000
|
||||
Subject: Add haiku support
|
||||
|
||||
|
||||
@@ -138,7 +138,7 @@ index 0000000..e5f8b64
|
||||
+
|
||||
+resource("BEOS:default_shortcut") "S";
|
||||
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
|
||||
index af21be8..7383d04 100644
|
||||
index 1071fbe..da2e45c 100644
|
||||
--- a/Telegram/CMakeLists.txt
|
||||
+++ b/Telegram/CMakeLists.txt
|
||||
@@ -97,6 +97,15 @@ PRIVATE
|
||||
@@ -157,7 +157,7 @@ index af21be8..7383d04 100644
|
||||
target_precompile_headers(Telegram PRIVATE $<$<COMPILE_LANGUAGE:CXX,OBJCXX>:${src_loc}/stdafx.h>)
|
||||
nice_target_sources(Telegram ${src_loc}
|
||||
PRIVATE
|
||||
@@ -1657,6 +1666,16 @@ if (NOT build_winstore)
|
||||
@@ -1670,6 +1679,16 @@ if (NOT build_winstore)
|
||||
)
|
||||
endif()
|
||||
|
||||
@@ -174,7 +174,7 @@ index af21be8..7383d04 100644
|
||||
if (DESKTOP_APP_USE_PACKAGED)
|
||||
remove_target_sources(Telegram ${src_loc}
|
||||
platform/mac/mac_iconv_helper.c
|
||||
@@ -1820,7 +1839,7 @@ else()
|
||||
@@ -1833,7 +1852,7 @@ else()
|
||||
set(bundle_identifier "com.tdesktop.Telegram")
|
||||
endif()
|
||||
set(bundle_entitlements "Telegram.entitlements")
|
||||
@@ -695,10 +695,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 d4b438a..18eab54 100644
|
||||
index ad80627..49902a7 100644
|
||||
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
|
||||
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
|
||||
@@ -28,6 +28,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
@@ -27,6 +27,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
#include "base/platform/linux/base_linux_xcb_utilities.h"
|
||||
#endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
|
||||
|
||||
@@ -709,7 +709,7 @@ index d4b438a..18eab54 100644
|
||||
#include <QtWidgets/QApplication>
|
||||
#include <QtWidgets/QSystemTrayIcon>
|
||||
#include <QtCore/QStandardPaths>
|
||||
@@ -51,6 +55,33 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
@@ -50,6 +54,33 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
|
||||
#include <iostream>
|
||||
|
||||
namespace {
|
||||
@@ -743,7 +743,7 @@ index d4b438a..18eab54 100644
|
||||
|
||||
using namespace gi::repository;
|
||||
namespace GObject = gi::repository::GObject;
|
||||
@@ -545,6 +576,10 @@ bool AutostartSupported() {
|
||||
@@ -544,6 +575,10 @@ bool AutostartSupported() {
|
||||
}
|
||||
|
||||
void AutostartToggle(bool enabled, Fn<void(bool)> done) {
|
||||
@@ -754,7 +754,7 @@ index d4b438a..18eab54 100644
|
||||
if (KSandbox::isFlatpak()) {
|
||||
PortalAutostart(enabled, done);
|
||||
return;
|
||||
@@ -572,6 +607,7 @@ void AutostartToggle(bool enabled, Fn<void(bool)> done) {
|
||||
@@ -571,6 +606,7 @@ void AutostartToggle(bool enabled, Fn<void(bool)> done) {
|
||||
if (done) {
|
||||
done(enabled && success);
|
||||
}
|
||||
@@ -762,7 +762,7 @@ index d4b438a..18eab54 100644
|
||||
}
|
||||
|
||||
bool AutostartSkip() {
|
||||
@@ -633,7 +669,11 @@ QString psAppDataPath() {
|
||||
@@ -627,7 +663,11 @@ QString psAppDataPath() {
|
||||
}
|
||||
}
|
||||
|
||||
@@ -774,7 +774,7 @@ index d4b438a..18eab54 100644
|
||||
}
|
||||
|
||||
void psDoCleanup() {
|
||||
@@ -743,6 +783,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
|
||||
@@ -737,6 +777,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
|
||||
}
|
||||
options.push_back(std::move(command));
|
||||
};
|
||||
@@ -782,7 +782,7 @@ index d4b438a..18eab54 100644
|
||||
add("unity-control-center", "sound");
|
||||
add("kcmshell6", "kcm_pulseaudio");
|
||||
add("kcmshell5", "kcm_pulseaudio");
|
||||
@@ -752,7 +793,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
|
||||
@@ -746,7 +787,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
|
||||
add("mate-volume-control");
|
||||
add("pavucontrol-qt");
|
||||
add("pavucontrol");
|
||||
@@ -965,30 +965,30 @@ index ff70a1c..b49c8c0 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 ebf5317..28cd5f9 100644
|
||||
index d368c5e..4fb2eb1 100644
|
||||
--- a/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
|
||||
+++ b/Telegram/lib_base/base/platform/linux/base_info_linux.cpp
|
||||
@@ -304,6 +304,7 @@ bool IsX11() {
|
||||
@@ -314,6 +314,7 @@ bool IsX11() {
|
||||
}
|
||||
|
||||
bool IsWayland() {
|
||||
+#ifndef Q_OS_HAIKU
|
||||
if (!QGuiApplication::instance()) {
|
||||
if (!qApp) {
|
||||
static const auto result = []() -> bool {
|
||||
struct wl_display *(*wl_display_connect)(const char *name);
|
||||
@@ -323,6 +324,7 @@ bool IsWayland() {
|
||||
@@ -333,6 +334,7 @@ bool IsWayland() {
|
||||
}();
|
||||
return result;
|
||||
}
|
||||
+#endif
|
||||
static const auto result
|
||||
= QGuiApplication::platformName().startsWith("wayland");
|
||||
return result;
|
||||
static const bool result =
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
|
||||
#if defined QT_FEATURE_wayland && QT_CONFIG(wayland)
|
||||
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 7979d7c..1a698cc 100644
|
||||
index 9a52714..9bd332a 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
|
||||
@@ -17,6 +17,11 @@
|
||||
@@ -16,6 +16,11 @@
|
||||
|
||||
#include <mutteridlemonitor/mutteridlemonitor.hpp>
|
||||
|
||||
@@ -1000,7 +1000,7 @@ index 7979d7c..1a698cc 100644
|
||||
namespace base::Platform {
|
||||
namespace {
|
||||
|
||||
@@ -84,9 +89,23 @@ std::optional<crl::time> MutterDBusLastUserInputTime() {
|
||||
@@ -83,9 +88,23 @@ std::optional<crl::time> MutterDBusLastUserInputTime() {
|
||||
return (crl::now() - static_cast<crl::time>(std::get<1>(*result)));
|
||||
}
|
||||
|
||||
@@ -1022,8 +1022,8 @@ index 7979d7c..1a698cc 100644
|
||||
+#endif
|
||||
+
|
||||
#ifndef DESKTOP_APP_DISABLE_X11_INTEGRATION
|
||||
if (::Platform::IsX11()) {
|
||||
const auto xcbResult = XCBLastUserInputTime();
|
||||
const auto xcbResult = XCBLastUserInputTime();
|
||||
if (xcbResult.has_value()) {
|
||||
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
|
||||
@@ -1085,10 +1085,10 @@ index efbfb72..9c82321 100644
|
||||
|
||||
#include "nnet_language_identifier.h"
|
||||
diff --git a/Telegram/lib_ui/ui/ui_utility.cpp b/Telegram/lib_ui/ui/ui_utility.cpp
|
||||
index 6cb3ff9..62fd650 100644
|
||||
index 3e15737..ea43678 100644
|
||||
--- a/Telegram/lib_ui/ui/ui_utility.cpp
|
||||
+++ b/Telegram/lib_ui/ui/ui_utility.cpp
|
||||
@@ -10,6 +10,10 @@
|
||||
@@ -11,6 +11,10 @@
|
||||
#include "ui/platform/ui_platform_utility.h"
|
||||
#include "ui/style/style_core.h"
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
SUMMARY="Telegram Desktop Messenger"
|
||||
DESCRIPTION="Unofficial build of the original Telegram client for Haiku."
|
||||
HOMEPAGE="https://www.telegram.org/"
|
||||
COPYRIGHT="2013-2024 Telegram"
|
||||
COPYRIGHT="2013-2025 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="c9e74a9b49284c0d4197f0be7e02415e14c4f8bf46403d0663d39f44d7ac2fbc"
|
||||
CHECKSUM_SHA256="3f5100fcb9984546f23f13da18e57fd690d2f48a407d4e9a1d0f4963718ab99f"
|
||||
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
|
||||
SOURCE_DIR="tdesktop-$portVersion-full"
|
||||
SOURCE_URI_2="https://github.com/ada-url/ada/releases/download/v2.9.0/singleheader.zip"
|
||||
Reference in New Issue
Block a user