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

Telegram: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2020-05-16 12:27:35 +10:00
parent 5664b79158
commit d704fc6caa
2 changed files with 50 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
net-im/telegram-desktop/patches/telegram_desktop-2.1.3.patchset → net-im/telegram-desktop/patches/telegram_desktop-2.1.6.patchset
View File

@@ -1,6 +1,6 @@
From 46889c47cabbce84b9829e261fa303e9469ac4df Mon Sep 17 00:00:00 2001
From 2167402d81242930a264307e531980d502030ffa Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 6 May 2020 09:23:14 +1000
Date: Sat, 16 May 2020 11:47:01 +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 e05853f..7e8843e 100644
index bc4b446..bd85137 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -119,7 +119,7 @@ PRIVATE
@@ -71,7 +71,7 @@ index e05853f..7e8843e 100644
platform/platform_audio.h
platform/platform_file_utilities.h
platform/platform_launcher.h
@@ -1194,7 +1206,7 @@ endif()
@@ -1196,7 +1208,7 @@ endif()
set_target_properties(Telegram PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder})
@@ -107,7 +107,7 @@ index 732c516..822dcaf 100644
#include <VoIPServerConfig.h>
diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp
index 160571e..842ac9b 100644
index 588bf05..3f6a103 100644
--- a/Telegram/SourceFiles/core/update_checker.cpp
+++ b/Telegram/SourceFiles/core/update_checker.cpp
@@ -1512,6 +1512,9 @@ bool checkReadyUpdate() {
@@ -134,7 +134,7 @@ index 1d7d4aa..69612bd 100644
if (wasVersion >= 1007011 && wasVersion < 1007015) {
_bigFileCache->clear();
diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp
index f5192d6..334d9a0 100644
index 5e6c687..f626625 100644
--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@@ -142,7 +142,7 @@ void MainWindow::createTrayIconMenu() {
@@ -1800,10 +1800,10 @@ index 33277c9..2d6ba7d 100644
-#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN
+#endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN || Q_OS_HAIKU
diff --git a/Telegram/SourceFiles/platform/platform_notifications_manager.h b/Telegram/SourceFiles/platform/platform_notifications_manager.h
index 692f4b4..30a9570 100644
index f0cdb15..b66690f 100644
--- a/Telegram/SourceFiles/platform/platform_notifications_manager.h
+++ b/Telegram/SourceFiles/platform/platform_notifications_manager.h
@@ -26,8 +26,10 @@ void FlashBounce();
@@ -27,8 +27,10 @@ namespace Notifications {
#ifdef Q_OS_MAC
#include "platform/mac/notifications_manager_mac.h"
@@ -1881,10 +1881,10 @@ index 56acbb9..ef16c47 100644
#ifdef NEED_TO_RESTORE_SLOTS
diff --git a/Telegram/SourceFiles/settings/settings_notifications.cpp b/Telegram/SourceFiles/settings/settings_notifications.cpp
index 9ec30eb..53152ee 100644
index e4e456e..41f5817 100644
--- a/Telegram/SourceFiles/settings/settings_notifications.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications.cpp
@@ -622,7 +622,7 @@ void SetupNotificationsContent(
@@ -629,7 +629,7 @@ void SetupNotificationsContent(
return QString();
} else if (Platform::IsWindows()) {
return tr::lng_settings_use_windows(tr::now);
@@ -1907,7 +1907,7 @@ index 88ffe6e..7e26c59 100644
#endif
return result;
diff --git a/Telegram/ThirdParty/libtgvoip/VoIPController.cpp b/Telegram/ThirdParty/libtgvoip/VoIPController.cpp
index 08cc73c..1310352 100644
index b1a513f..faebc2f 100644
--- a/Telegram/ThirdParty/libtgvoip/VoIPController.cpp
+++ b/Telegram/ThirdParty/libtgvoip/VoIPController.cpp
@@ -8,6 +8,9 @@
@@ -1920,7 +1920,7 @@ index 08cc73c..1310352 100644
#include <errno.h>
#include <string.h>
#include <wchar.h>
@@ -3005,6 +3008,10 @@ double VoIPController::GetCurrentTime(){
@@ -3009,6 +3012,10 @@ double VoIPController::GetCurrentTime(){
struct timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);
return ts.tv_sec+(double)ts.tv_nsec/1000000000.0;
@@ -2696,7 +2696,7 @@ index 78e0583..81bf9fc 100644
diff --git a/Telegram/ThirdParty/libtgvoip/threading.h b/Telegram/ThirdParty/libtgvoip/threading.h
old mode 100755
new mode 100644
index f6163e9..23e6b48
index 81c577c..1ccf029
--- a/Telegram/ThirdParty/libtgvoip/threading.h
+++ b/Telegram/ThirdParty/libtgvoip/threading.h
@@ -9,7 +9,7 @@
@@ -2785,10 +2785,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 3d13596..fcd485d 100644
index 9ec1048..6d54e67 100644
--- a/Telegram/cmake/lib_tgvoip.cmake
+++ b/Telegram/cmake/lib_tgvoip.cmake
@@ -119,6 +119,14 @@ else()
@@ -120,6 +120,14 @@ else()
os/linux/AudioPulse.cpp
os/linux/AudioPulse.h
@@ -2803,7 +2803,7 @@ index 3d13596..fcd485d 100644
# POSIX
os/posix/NetworkSocketPosix.cpp
os/posix/NetworkSocketPosix.h
@@ -761,6 +769,20 @@ else()
@@ -776,6 +784,20 @@ else()
TGVOIP_NO_OSX_PRIVATE_API
)
endif()
@@ -3464,7 +3464,7 @@ index 0000000..f682740
+
+#endif // CRL_USE_LINUX_TIME
diff --git a/Telegram/lib_ui/CMakeLists.txt b/Telegram/lib_ui/CMakeLists.txt
index 6188df5..b3df3a9 100644
index c117a78..47a291d 100644
--- a/Telegram/lib_ui/CMakeLists.txt
+++ b/Telegram/lib_ui/CMakeLists.txt
@@ -84,6 +84,10 @@ PRIVATE
@@ -3741,7 +3741,7 @@ index 0000000..a6c28f1
+ endif()
+endforeach()
diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt
index d1f7b07..62c42ba 100644
index 9109233..4f56650 100644
--- a/cmake/external/CMakeLists.txt
+++ b/cmake/external/CMakeLists.txt
@@ -12,7 +12,7 @@ macro(add_checked_subdirectory name)
@@ -3753,16 +3753,16 @@ index d1f7b07..62c42ba 100644
if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
add_checked_subdirectory(dbusmenu_qt)
endif()
@@ -20,7 +20,7 @@ add_checked_subdirectory(expected)
if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
add_checked_subdirectory(fcitx_qt5)
@@ -22,7 +22,7 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
add_checked_subdirectory(fcitx5_qt5)
add_checked_subdirectory(fcitx5_qt5_dbusaddons)
endif()
-add_checked_subdirectory(ffmpeg)
+#add_checked_subdirectory(ffmpeg)
add_checked_subdirectory(gsl)
if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
add_checked_subdirectory(hime_im_client)
@@ -33,7 +33,7 @@ add_checked_subdirectory(iconv)
@@ -35,7 +35,7 @@ add_checked_subdirectory(iconv)
if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION)
add_checked_subdirectory(lxqt_qtplugin)
endif()
@@ -3771,7 +3771,7 @@ index d1f7b07..62c42ba 100644
if (LINUX)
add_checked_subdirectory(materialdecoration)
endif()
@@ -41,10 +41,10 @@ add_checked_subdirectory(minizip)
@@ -43,10 +43,10 @@ add_checked_subdirectory(minizip)
if (LINUX)
add_checked_subdirectory(nimf_qt5)
endif()
@@ -3786,7 +3786,7 @@ index d1f7b07..62c42ba 100644
if (LINUX)
add_checked_subdirectory(qt5ct)
add_checked_subdirectory(qt5ct_qtplugin)
@@ -65,4 +65,4 @@ if (LINUX)
@@ -67,4 +67,4 @@ if (LINUX)
add_checked_subdirectory(xdgiconloader)
endif()
add_checked_subdirectory(xxhash)
@@ -3884,7 +3884,7 @@ index 0000000..063f1ce
+ $<IF:$<CONFIG:Debug>,,-Ofast>
+)
diff --git a/cmake/variables.cmake b/cmake/variables.cmake
index c110591..4935bbe 100644
index 8d489a3..4b6d879 100644
--- a/cmake/variables.cmake
+++ b/cmake/variables.cmake
@@ -62,6 +62,7 @@ set(build_osx 0)
@@ -3922,3 +3922,27 @@ index c110591..4935bbe 100644
--
2.26.0
From 0123a59b475c00cfd390aca43f3237bcf9a55783 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 16 May 2020 12:23:54 +1000
Subject: Fix SkipFlashBounce func
diff --git a/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.h b/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.h
index e2218b8..82310f2 100644
--- a/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.h
+++ b/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.h
@@ -38,7 +38,8 @@ inline bool SkipToast() {
return false;
}
-inline void FlashBounce() {
+inline bool SkipFlashBounce() {
+ return false;
}
void Finish();
--
2.26.0

2
net-im/telegram-desktop/telegram_desktop-2.1.3.recipe → net-im/telegram-desktop/telegram_desktop-2.1.6.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="4967929d7ea26d5f18d8e4983a005959dfa9803f4cc5646aaffa7a9445905b45"
CHECKSUM_SHA256="3b0000e763b600a650c62115cd9cc608734c53efd81252f98cc9dfe8ee11cc8c"
SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz"
SOURCE_DIR="tdesktop-$portVersion-full"
srcGitRev_2="0663103551379b958b2e79c51d51d163ec484300"