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

Telegram: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-04-24 23:13:46 +10:00
parent 2b250e5fcd
commit 8e653fdcb0
2 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
net-im/telegram-desktop/patches/telegram_desktop-2.0.1.patchset → net-im/telegram-desktop/patches/telegram_desktop-2.1.0.patchset
View File

@@ -1,6 +1,6 @@
From c82adbfa1c3296cfedfde1c78dca1ad4aa831040 Mon Sep 17 00:00:00 2001
From c8d30b6c1adc2f2c01662363ff0fbe7d7d850511 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 17 Apr 2020 12:23:15 +1000
Date: Fri, 24 Apr 2020 23:12:18 +1000
Subject: Add Haiku support
@@ -40,7 +40,7 @@ index 645d886..3a0a0e9 100644
add_subdirectory(cmake)
add_subdirectory(Telegram)
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 5c50088..367a607 100644
index a564600..c80b7f4 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -98,7 +98,7 @@ PRIVATE
@@ -75,8 +75,8 @@ index 5c50088..367a607 100644
set_target_properties(Telegram PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder})
-if ((NOT disable_autoupdate OR NOT LINUX) AND NOT build_macstore AND NOT build_winstore)
+if ((NOT disable_autoupdate OR NOT LINUX OR NOT HAIKU) AND NOT build_macstore AND NOT build_winstore)
-if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR NOT LINUX) AND NOT build_macstore AND NOT build_winstore)
+if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR NOT LINUX OR NOT HAIKU) AND NOT build_macstore AND NOT build_winstore)
add_executable(Updater WIN32)
init_target(Updater)
@@ -121,10 +121,10 @@ index 160571e..842ac9b 100644
if (!updater.exists()) {
QFileInfo current(curUpdater);
diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp
index b3cf552..96eda72 100644
index 43e5298..151ef90 100644
--- a/Telegram/SourceFiles/data/data_session.cpp
+++ b/Telegram/SourceFiles/data/data_session.cpp
@@ -202,7 +202,7 @@ Session::Session(not_null<Main::Session*> session)
@@ -203,7 +203,7 @@ Session::Session(not_null<Main::Session*> session)
_cache->open(Local::cacheKey());
_bigFileCache->open(Local::cacheBigFileKey());
@@ -134,7 +134,7 @@ index b3cf552..96eda72 100644
if (wasVersion >= 1007011 && wasVersion < 1007015) {
_bigFileCache->clear();
diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
index 592d4db..83b71d9 100644
index f5192d6..334d9a0 100644
--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@@ -142,7 +142,7 @@ void MainWindow::createTrayIconMenu() {
@@ -165,7 +165,7 @@ index 592d4db..83b71d9 100644
? tr::lng_disable_notifications_from_tray(tr::now)
: tr::lng_enable_notifications_from_tray(tr::now);
diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
index 89a0df8..508952d 100644
index b44f0e5..28c8d47 100644
--- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
+++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
@@ -363,7 +363,7 @@ OverlayWidget::OverlayWidget()
@@ -2779,10 +2779,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 215ac73..c247275 100644
index cd78cd0..6db9b54 100644
--- a/Telegram/cmake/lib_tgvoip.cmake
+++ b/Telegram/cmake/lib_tgvoip.cmake
@@ -120,6 +120,14 @@ else()
@@ -119,6 +119,14 @@ else()
os/linux/AudioPulse.cpp
os/linux/AudioPulse.h
@@ -2797,7 +2797,7 @@ index 215ac73..c247275 100644
# POSIX
os/posix/NetworkSocketPosix.cpp
os/posix/NetworkSocketPosix.h
@@ -762,6 +770,20 @@ else()
@@ -761,6 +769,20 @@ else()
TGVOIP_NO_OSX_PRIVATE_API
)
endif()
@@ -2873,10 +2873,10 @@ index 963a720..d67d6c3 100644
#ifdef USE_BREAKPAD
diff --git a/Telegram/lib_base/base/platform/base_platform_file_utilities.h b/Telegram/lib_base/base/platform/base_platform_file_utilities.h
index c30eba8..ad7fc36 100644
index 83841a0..4a300b1 100644
--- a/Telegram/lib_base/base/platform/base_platform_file_utilities.h
+++ b/Telegram/lib_base/base/platform/base_platform_file_utilities.h
@@ -24,8 +24,10 @@ bool RenameWithOverwrite(const QString &from, const QString &to);
@@ -26,8 +26,10 @@ void FlushFileData(QFile &file);
#ifdef Q_OS_MAC
#include "base/platform/mac/base_file_utilities_mac.h"
@@ -2919,10 +2919,10 @@ index 37b0b76..d7a5a2c 100644
+#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN || Q_OS_HAIKU
diff --git a/Telegram/lib_base/base/platform/haiku/base_file_utilities_haiku.cpp b/Telegram/lib_base/base/platform/haiku/base_file_utilities_haiku.cpp
new file mode 100644
index 0000000..2e18272
index 0000000..0facb49
--- /dev/null
+++ b/Telegram/lib_base/base/platform/haiku/base_file_utilities_haiku.cpp
@@ -0,0 +1,77 @@
@@ -0,0 +1,84 @@
+/*
+This file is part of Telegram Desktop for Haiku,
+
@@ -2999,6 +2999,13 @@ index 0000000..2e18272
+ return !rmdir(pathRaw.constData());
+}
+
+void FlushFileData(QFile &file) {
+ file.flush();
+ if (const auto descriptor = file.handle()) {
+ fsync(descriptor);
+ }
+}
+
+} // namespace base::Platform
diff --git a/Telegram/lib_base/base/platform/haiku/base_file_utilities_haiku.h b/Telegram/lib_base/base/platform/haiku/base_file_utilities_haiku.h
new file mode 100644
@@ -3860,10 +3867,10 @@ index 0000000..063f1ce
+ $<IF:$<CONFIG:Debug>,,-Ofast>
+)
diff --git a/cmake/variables.cmake b/cmake/variables.cmake
index cb3303a..1dc7d45 100644
index a45a6b6..10c9cc1 100644
--- a/cmake/variables.cmake
+++ b/cmake/variables.cmake
@@ -57,6 +57,7 @@ set(build_osx 0)
@@ -60,6 +60,7 @@ set(build_osx 0)
set(build_macstore 0)
set(build_winstore 0)
set(build_linux32 0)
@@ -3871,7 +3878,7 @@ index cb3303a..1dc7d45 100644
if (WIN32)
if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "uwp")
@@ -68,6 +69,12 @@ elseif (APPLE)
@@ -71,6 +72,12 @@ elseif (APPLE)
elseif (DESKTOP_APP_SPECIAL_TARGET STREQUAL "macstore")
set(build_macstore 1)
endif()
@@ -3884,7 +3891,7 @@ index cb3303a..1dc7d45 100644
else()
if (CMAKE_SIZEOF_VOID_P EQUAL 4)
set(build_linux32 1)
@@ -88,8 +95,8 @@ else()
@@ -91,8 +98,8 @@ else()
endif()
endif()

2
net-im/telegram-desktop/telegram_desktop-2.0.1.recipe → net-im/telegram-desktop/telegram_desktop-2.1.0.recipe
View File

@@ -6,7 +6,7 @@ LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v$portVersion/tdesktop-$portVersion-full.tar.gz"
CHECKSUM_SHA256="ced19f5bc15e26d7bf76e47841422425f664110f1aada111b9f525ab18e1723c"
CHECKSUM_SHA256="86d2acc2dfd426ea222ae94984d81e60774f16f3ecc3405578377d90f809a950"
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
SOURCE_DIR="tdesktop-$portVersion-full"
srcGitRev_2="0663103551379b958b2e79c51d51d163ec484300"