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-11-16 22:45:05 +10:00
parent b87ad7d9cb
commit 274a4769e4
4 changed files with 420 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net-im/telegram-desktop/patches/libtgvoip-5.5.5.patchset → net-im/telegram-desktop/patches/libtgvoip-5.7.2.patchset
View File

@@ -1,6 +1,6 @@
From 4f0b34d79fc40853e4da280383d1595e132e485e Mon Sep 17 00:00:00 2001
From 773f37ad2603040774cd6016cd79710bd422bbbf Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 1 Aug 2024 22:40:58 +1000
Date: Fri, 15 Nov 2024 22:56:58 +1000
Subject: Add haiku support

610
net-im/telegram-desktop/patches/pch_disable-5.5.5.patchset → net-im/telegram-desktop/patches/pch_disable-5.7.2.patchset
View File

File diff suppressed because it is too large Load Diff

137
net-im/telegram-desktop/patches/telegram_desktop-5.5.5.patchset → net-im/telegram-desktop/patches/telegram_desktop-5.7.2.patchset
View File

@@ -1,6 +1,6 @@
From f7b32da6ae799705c42ee11662ac7a488d8e9c24 Mon Sep 17 00:00:00 2001
From 99e03c823581b4e1e77db26170ddd07a93f8fc2a Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 1 Aug 2024 22:42:14 +1000
Date: Fri, 15 Nov 2024 23:00:32 +1000
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 83aadae..082cca2 100644
index 13af508..7bb7170 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -97,6 +97,15 @@ PRIVATE
@@ -157,7 +157,7 @@ index 83aadae..082cca2 100644
target_precompile_headers(Telegram PRIVATE $<$<COMPILE_LANGUAGE:CXX,OBJCXX>:${src_loc}/stdafx.h>)
nice_target_sources(Telegram ${src_loc}
PRIVATE
@@ -1620,6 +1629,16 @@ if (NOT build_winstore)
@@ -1634,6 +1643,16 @@ if (NOT build_winstore)
)
endif()
@@ -174,7 +174,7 @@ index 83aadae..082cca2 100644
if (DESKTOP_APP_USE_PACKAGED)
remove_target_sources(Telegram ${src_loc}
platform/mac/mac_iconv_helper.c
@@ -1783,7 +1802,7 @@ else()
@@ -1797,7 +1816,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 06f7475..6c1ba99 100644
index 3838463..8721099 100644
--- a/Telegram/SourceFiles/core/core_settings.h
+++ b/Telegram/SourceFiles/core/core_settings.h
@@ -1005,7 +1005,7 @@ private:
@@ -1030,7 +1030,7 @@ private:
rpl::variable<float64> _dialogsNoChatWidthRatio; // per-window
rpl::variable<int> _thirdColumnWidth = kDefaultThirdColumnWidth; // p-w
bool _notifyFromAll = true;
@@ -254,6 +254,20 @@ index 4188882..0e0b448 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/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index bf699ad..c0e6ce9 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -49,7 +49,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtGui/QWindow>
#include <charconv>
-#include <ada.h>
+#include "ada.cpp"
+#include "ada.h"
namespace Iv {
namespace {
diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
index f314fb0..331db8a 100644
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@@ -307,12 +321,12 @@ index f314fb0..331db8a 100644
}
diff --git a/Telegram/SourceFiles/platform/linux/integration_linux.cpp b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
index 147a9f0..111b33f 100644
index e048a2d..508199a 100644
--- a/Telegram/SourceFiles/platform/linux/integration_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/integration_linux.cpp
@@ -18,12 +18,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 <QtGui/QStyleHints>
+#ifndef Q_OS_HAIKU
#include <gio/gio.hpp>
@@ -329,7 +343,7 @@ index 147a9f0..111b33f 100644
using namespace gi::repository;
namespace GObject = gi::repository::GObject;
@@ -286,7 +292,7 @@ void LinuxIntegration::initInhibit() {
@@ -317,7 +323,7 @@ void LinuxIntegration::initInhibit() {
}),
nullptr);
}
@@ -681,7 +695,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 b49cef3..02f9e05 100644
index d4b438a..18eab54 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
@@ -729,7 +743,7 @@ index b49cef3..02f9e05 100644
using namespace gi::repository;
namespace GObject = gi::repository::GObject;
@@ -551,6 +582,10 @@ bool AutostartSupported() {
@@ -545,6 +576,10 @@ bool AutostartSupported() {
}
void AutostartToggle(bool enabled, Fn<void(bool)> done) {
@@ -740,7 +754,7 @@ index b49cef3..02f9e05 100644
if (KSandbox::isFlatpak()) {
PortalAutostart(enabled, done);
return;
@@ -578,6 +613,7 @@ void AutostartToggle(bool enabled, Fn<void(bool)> done) {
@@ -572,6 +607,7 @@ void AutostartToggle(bool enabled, Fn<void(bool)> done) {
if (done) {
done(enabled && success);
}
@@ -748,7 +762,7 @@ index b49cef3..02f9e05 100644
}
bool AutostartSkip() {
@@ -639,7 +675,11 @@ QString psAppDataPath() {
@@ -633,7 +669,11 @@ QString psAppDataPath() {
}
}
@@ -760,7 +774,7 @@ index b49cef3..02f9e05 100644
}
void psDoCleanup() {
@@ -749,6 +789,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
@@ -743,6 +783,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
}
options.push_back(std::move(command));
};
@@ -768,7 +782,7 @@ index b49cef3..02f9e05 100644
add("unity-control-center", "sound");
add("kcmshell6", "kcm_pulseaudio");
add("kcmshell5", "kcm_pulseaudio");
@@ -758,7 +799,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
@@ -752,7 +793,7 @@ bool OpenSystemSettings(SystemSettingsType type) {
add("mate-volume-control");
add("pavucontrol-qt");
add("pavucontrol");
@@ -825,6 +839,18 @@ index 489d8c6..74c82c1 100644
_threads->getWorkerThread()->BlockingCall([&] {
SetAudioInputDeviceById(_audioDeviceModule.get(), id);
});
diff --git a/Telegram/cmake/td_iv.cmake b/Telegram/cmake/td_iv.cmake
index 1d4edf9..602abf4 100644
--- a/Telegram/cmake/td_iv.cmake
+++ b/Telegram/cmake/td_iv.cmake
@@ -38,7 +38,6 @@ PUBLIC
tdesktop::td_scheme
PRIVATE
desktop-app::lib_webview
- desktop-app::external_ada
tdesktop::td_lang
tdesktop::td_ui
)
diff --git a/Telegram/lib_base/base/haiku_types.h b/Telegram/lib_base/base/haiku_types.h
new file mode 100644
index 0000000..3a57ce2
@@ -1059,7 +1085,7 @@ 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 5173f25..83138b7 100644
index 6cb3ff9..62fd650 100644
--- a/Telegram/lib_ui/ui/ui_utility.cpp
+++ b/Telegram/lib_ui/ui/ui_utility.cpp
@@ -10,6 +10,10 @@
@@ -1120,10 +1146,34 @@ index d4c3f30..22fb3d6 100644
#include "webrtc/webrtc_audio_input_tester.h"
#include "webrtc/webrtc_device_common.h"
diff --git a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp
index c85e18c..700751b 100644
--- a/Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp
+++ b/Telegram/lib_webview/webview/platform/linux/webview_linux_webkitgtk_library.cpp
@@ -8,6 +8,10 @@
#include "base/platform/linux/base_linux_library.h"
+#ifdef __HAIKU__
+#define RTLD_NODELETE 0
+#endif
+
namespace Webview::WebKitGTK::Library {
ResolveResult Resolve(bool wayland) {
diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt
index ea4b8bf..2ba72a6 100644
index 58f2503..65dbe67 100644
--- a/cmake/external/CMakeLists.txt
+++ b/cmake/external/CMakeLists.txt
@@ -11,7 +11,7 @@ macro(add_checked_subdirectory name)
endif()
endmacro()
-add_checked_subdirectory(ada)
+#add_checked_subdirectory(ada)
add_checked_subdirectory(angle)
add_checked_subdirectory(auto_updates)
add_checked_subdirectory(boost)
@@ -19,7 +19,7 @@ if (add_cld3_library)
add_checked_subdirectory(cld3)
endif()
@@ -1136,52 +1186,3 @@ index ea4b8bf..2ba72a6 100644
--
2.45.2
From 73d33c885a0d8cc698b6c378a7950399e478975f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 2 Aug 2024 23:06:18 +1000
Subject: Use singleheader ada library
diff --git a/Telegram/SourceFiles/iv/iv_controller.cpp b/Telegram/SourceFiles/iv/iv_controller.cpp
index b864833..88da067 100644
--- a/Telegram/SourceFiles/iv/iv_controller.cpp
+++ b/Telegram/SourceFiles/iv/iv_controller.cpp
@@ -45,7 +45,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <QtGui/QWindow>
#include <charconv>
-#include <ada.h>
+#include "ada.cpp"
+#include "ada.h"
namespace Iv {
namespace {
diff --git a/Telegram/cmake/td_iv.cmake b/Telegram/cmake/td_iv.cmake
index 1d4edf9..602abf4 100644
--- a/Telegram/cmake/td_iv.cmake
+++ b/Telegram/cmake/td_iv.cmake
@@ -38,7 +38,6 @@ PUBLIC
tdesktop::td_scheme
PRIVATE
desktop-app::lib_webview
- desktop-app::external_ada
tdesktop::td_lang
tdesktop::td_ui
)
diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt
index 2ba72a6..9e30578 100644
--- a/cmake/external/CMakeLists.txt
+++ b/cmake/external/CMakeLists.txt
@@ -11,7 +11,7 @@ macro(add_checked_subdirectory name)
endif()
endmacro()
-add_checked_subdirectory(ada)
+#add_checked_subdirectory(ada)
add_checked_subdirectory(angle)
add_checked_subdirectory(auto_updates)
add_checked_subdirectory(boost)
--
2.45.2

5
net-im/telegram-desktop/telegram_desktop-5.5.5.recipe → net-im/telegram-desktop/telegram_desktop-5.7.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="dc620831d16af9ee970325e32d689ff3272a7d2aa1966a3e2a1b87513c6f23eb"
CHECKSUM_SHA256="3442e28e01d937376e687615e3ee13fb580788c4deb7561b410522ce3452fdef"
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"
@@ -143,11 +143,13 @@ BUILD()
export DISABLE_ASLR=1
export GI_GIR_PATH="`finddir B_SYSTEM_DATA_DIRECTORY`"/gir-1.0
local DISABLE_PRECOMPILE_HEADERS="OFF"
local CXX_FLAGS_RELEASE="-O3"
if [ $targetArchitecture == x86_gcc2 ]; then
sed -i -e '/-fstack-protector-all/d' cmake/options_linux.cmake
sed -i -e '/_GLIBCXX_ASSERTIONS/d' cmake/options_linux.cmake
DISABLE_PRECOMPILE_HEADERS="ON"
CXX_FLAGS_RELEASE="-O2"
fi
# copy ada library files
@@ -171,6 +173,7 @@ BUILD()
cmake -S . -B build -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS_RELEASE=$CXX_FLAGS_RELEASE \
-DCMAKE_DISABLE_PRECOMPILE_HEADERS=$DISABLE_PRECOMPILE_HEADERS \
-DBoost_USE_STATIC_LIBS=OFF \
-DBUILD_SHARED_LIBS=ON \